New Support for ODROID-M1S

i2c0, spi and uart are not available as default values
because they are provided as aliases.

Signed-off-by: Steve Jeong <steve@how2flow.net>

diff --git a/src/adafruit_blinka/board/hardkernel/odroidm1s.py b/src/adafruit_blinka/board/hardkernel/odroidm1s.py
new file mode 100644 (file)
index 0000000..24a32f4
--- /dev/null
+++ b/src/adafruit_blinka/board/hardkernel/odroidm1s.py
@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: 2023 Steve Jeong for Hardkernel
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Odroid M1S."""
+
+from adafruit_blinka.microcontroller.rockchip.rk3566 import pin
+
+D8 = pin.GPIO2_A4
+D10 = pin.GPIO2_A3
+D12 = pin.GPIO2_A7
+D16 = pin.GPIO2_B5
+D18 = pin.GPIO2_B6
+D22 = pin.GPIO2_B0
+D24 = pin.GPIO3_A1
+D26 = pin.GPIO2_B1
+D28 = pin.GPIO0_B3
+D32 = pin.GPIO2_B2
+D36 = pin.GPIO2_A6
+D3 = pin.GPIO3_B6
+D5 = pin.GPIO3_B5
+D7 = pin.GPIO0_B6
+D11 = pin.GPIO0_C0
+D13 = pin.GPIO0_C1
+D15 = pin.GPIO0_C2
+D19 = pin.GPIO3_C1
+D21 = pin.GPIO3_C2
+D23 = pin.GPIO3_C3
+D27 = pin.GPIO0_B4
+D29 = pin.GPIO2_C0
+D31 = pin.GPIO2_B7
+D33 = pin.GPIO0_B5
+D35 = pin.GPIO2_A5
+
+# external pins
+EXT_D11 = pin.GPIO3_C4
+EXT_D12 = pin.GPIO3_C5
+EXT_D13 = pin.GPIO3_B3
+EXT_D14 = pin.GPIO3_B4
+
+SDA = D27
+SCL = D28
+
+SCLK = D23
+MOSI = D19
+MISO = D21
+CS = D24
+
+UART0_TX = D13
+UART0_RX = D11
+UART1_TX = D8
+UART1_RX = D10
+
+UART1_CTS = D29
+UART1_RTS = D31
+
+I2C0_SDA = D3
+I2C0_SCL = D5
+I2C1_SDA = D27
+I2C1_SCL = D28

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index d367e27fcc62b0d31ac8ad790c56304414953aee..dcf3c2b847eec4fc93236265975c1ab2c7d5a6b8 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2022 Kenneth Ryerson
 # SPDX-FileCopyrightText: 2022 Kenneth Ryerson

+# SPDX-FileCopyrightText: 2023 Steve Jeong for Hardkernel

 #
 # SPDX-License-Identifier: MIT
 
 #
 # SPDX-License-Identifier: MIT
 


@@ -11,9 +12,13 @@ GPIO0_A4 = Pin((0, 4))
 GPIO0_A5 = Pin((0, 5))
 GPIO0_B1 = Pin((0, 9))
 GPIO0_B2 = Pin((0, 10))
 GPIO0_A5 = Pin((0, 5))
 GPIO0_B1 = Pin((0, 9))
 GPIO0_B2 = Pin((0, 10))

+GPIO0_B3 = Pin((0, 11))
+GPIO0_B4 = Pin((0, 12))

 GPIO0_B5 = Pin((0, 13))
 GPIO0_B6 = Pin((0, 14))
 GPIO0_B7 = Pin((0, 15))
 GPIO0_B5 = Pin((0, 13))
 GPIO0_B6 = Pin((0, 14))
 GPIO0_B7 = Pin((0, 15))

+GPIO0_C0 = Pin((0, 16))
+GPIO0_C1 = Pin((0, 17))

 GPIO0_C2 = Pin((0, 18))
 GPIO0_C3 = Pin((0, 19))
 GPIO0_C5 = Pin((0, 21))
 GPIO0_C2 = Pin((0, 18))
 GPIO0_C3 = Pin((0, 19))
 GPIO0_C5 = Pin((0, 21))


@@ -38,10 +43,25 @@ GPIO1_D7 = Pin((1, 31))
 GPIO2_A0 = Pin((2, 0))
 GPIO2_A1 = Pin((2, 1))
 GPIO2_A2 = Pin((2, 2))
 GPIO2_A0 = Pin((2, 0))
 GPIO2_A1 = Pin((2, 1))
 GPIO2_A2 = Pin((2, 2))

+GPIO2_A3 = Pin((2, 3))
+GPIO2_A4 = Pin((2, 4))
+GPIO2_A5 = Pin((2, 5))
+GPIO2_A6 = Pin((2, 6))
+GPIO2_A7 = Pin((2, 7))
+GPIO2_B0 = Pin((2, 8))
+GPIO2_B1 = Pin((2, 9))
+GPIO2_B2 = Pin((2, 10))
+GPIO2_B3 = Pin((2, 11))
+GPIO2_B4 = Pin((2, 12))
+GPIO2_B5 = Pin((2, 13))
+GPIO2_B6 = Pin((2, 14))
+GPIO2_B7 = Pin((2, 15))
+GPIO2_C0 = Pin((3, 16))

 GPIO2_C3 = Pin((2, 19))
 GPIO2_C4 = Pin((2, 20))
 GPIO2_C5 = Pin((2, 21))
 GPIO2_C6 = Pin((2, 22))
 GPIO2_C3 = Pin((2, 19))
 GPIO2_C4 = Pin((2, 20))
 GPIO2_C5 = Pin((2, 21))
 GPIO2_C6 = Pin((2, 22))

+GPIO3_A1 = Pin((3, 1))

 GPIO3_A5 = Pin((3, 5))
 GPIO3_A6 = Pin((3, 6))
 GPIO3_A7 = Pin((3, 7))
 GPIO3_A5 = Pin((3, 5))
 GPIO3_A6 = Pin((3, 6))
 GPIO3_A7 = Pin((3, 7))


@@ -91,6 +111,8 @@ ADC_AIN3 = 37
 # I2C
 I2C0_SCL = GPIO0_B1
 I2C0_SDA = GPIO0_B2
 # I2C
 I2C0_SCL = GPIO0_B1
 I2C0_SDA = GPIO0_B2

+I2C1_SCL = GPIO0_B3
+I2C1_SDA = GPIO0_B4

 I2C2_SCL_M0 = GPIO0_B5
 I2C2_SDA_M0 = GPIO0_B6
 I2C2_SCL_M1 = GPIO4_B5
 I2C2_SCL_M0 = GPIO0_B5
 I2C2_SDA_M0 = GPIO0_B6
 I2C2_SCL_M1 = GPIO4_B5


@@ -130,6 +152,7 @@ PWM1 = GPIO0_C7
 
 # ordered as i2cId, SCL, SDA
 i2cPorts = (
 
 # ordered as i2cId, SCL, SDA
 i2cPorts = (

+    (1, I2C1_SCL, I2C1_SDA),

     (2, I2C2_SCL_M0, I2C2_SDA_M0),
     (3, I2C3_SCL_M0, I2C3_SDA_M0),
     (5, I2C5_SCL_M0, I2C5_SDA_M0),
     (2, I2C2_SCL_M0, I2C2_SDA_M0),
     (3, I2C3_SCL_M0, I2C3_SDA_M0),
     (5, I2C5_SCL_M0, I2C5_SDA_M0),

diff --git a/src/board.py b/src/board.py
index ef9deb6a423e4fe5182dc6fc61399dddfd744b2a..55a651f16f5c300f03df51b150f694f1b1917cd0 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -196,6 +196,9 @@ elif board_id == ap_board.ODROID_N2:
 elif board_id == ap_board.ODROID_M1:
     from adafruit_blinka.board.hardkernel.odroidm1 import *
 
 elif board_id == ap_board.ODROID_M1:
     from adafruit_blinka.board.hardkernel.odroidm1 import *
 

+elif board_id == ap_board.ODROID_M1S:
+    from adafruit_blinka.board.hardkernel.odroidm1s import *
+

 elif board_id == ap_board.KHADAS_VIM3:
     from adafruit_blinka.board.khadas.khadasvim3 import *
 
 elif board_id == ap_board.KHADAS_VIM3:
     from adafruit_blinka.board.khadas.khadasvim3 import *