Merge branch 'main' into main

Author: makermelissa

src/adafruit_blinka/board/hardkernel/odroidc4.py

@@ -16,7 +16,9 @@
 SCLK = pin.SPI0_SCLK
 MOSI = pin.SPI0_MOSI
 MISO = pin.SPI0_MISO
-SPI_CS0 = pin.SPI0_CS0
+CS0 = pin.SPI0_CS0
+CS1 = pin.GPIOH_6
+SPI_CS0 = CS0  # aliased for backward compatibility
 
 """J2: physical pin number"""
 
@@ -57,3 +59,10 @@
 """ ADC """
 A0 = 40
 A1 = 37
+
+""" PWM """
+PWM = D15
+
+""" UART """
+UART0_TX = D8
+UART0_RX = D10

src/adafruit_blinka/board/hardkernel/odroidm1.py

@@ -31,18 +31,20 @@
 D33 = pin.GPIO0B_5
 D35 = pin.GPIO3D_5
 
-SDA = D27
-SCL = D28
+SDA = D3
+SCL = D5
 
 SCLK = D23
 MOSI = D19
 MISO = D21
-CS = D24
+CS0 = D24
+CS1 = D26
+CS = CS0  # aliased for backward compatibility
 
-UART0_TX = D13
-UART0_RX = D11
-UART1_TX = D8
-UART1_RX = D10
+UART0_TX = D8
+UART0_RX = D10
+UART1_TX = D13
+UART1_RX = D11
 
 UART1_CTS = D29
 UART1_RTS = D31
@@ -55,3 +57,6 @@
 """ ADC """
 A0 = 40
 A1 = 37
+
+""" PWM """
+PWM = D15

src/adafruit_blinka/board/hardkernel/odroidm1s.py

@@ -37,18 +37,20 @@
 EXT_D13 = pin.GPIO3_B3
 EXT_D14 = pin.GPIO3_B4
 
-SDA = D27
-SCL = D28
+SDA = D3
+SCL = D5
 
 SCLK = D23
 MOSI = D19
 MISO = D21
-CS = D24
+CS0 = D24
+CS1 = D26
+CS = CS0  # aliased for backward compatibility
 
-UART0_TX = D13
-UART0_RX = D11
-UART1_TX = D8
-UART1_RX = D10
+UART0_TX = D8
+UART0_RX = D10
+UART1_TX = D13
+UART1_RX = D11
 
 UART1_CTS = D29
 UART1_RTS = D31
@@ -61,3 +63,6 @@
 """ ADC """
 A0 = 40
 A1 = 37
+
+""" PWM """
+PWM = D15

src/adafruit_blinka/board/hardkernel/odroidn2.py

@@ -58,47 +58,50 @@
     globals()["SCL" + str(it[0])] = it[1]
     globals()["SDA" + str(it[0])] = it[2]
 
-SCL = None
-SDA = None
-# Set second i2c bus as default for backward compatibility.
-if len(pin.i2cPorts) > 1:
-    SCL = pin.i2cPorts[1][1]
-    SDA = pin.i2cPorts[1][2]
-elif len(pin.i2cPorts) > 0:
+if pin.i2cPorts:
     SCL = pin.i2cPorts[0][1]
     SDA = pin.i2cPorts[0][2]
 
 SCLK = pin.SPI0_SCLK
 MOSI = pin.SPI0_MOSI
 MISO = pin.SPI0_MISO
-SPI_CS0 = pin.GPIO486
+CS0 = pin.GPIO486
+CS1 = pin.GPIO464
+SPI_CS0 = CS0  # aliased for backward compatibility
 
-D0 = GPIOX_3  # PIN_11
-D1 = GPIOX_16  # PIN_12
-D2 = GPIOX_4  # PIN_13
-D3 = GPIOX_7  # PIN_15
-D4 = GPIOX_0  # PIN_16
-D5 = GPIOX_1  # PIN_18
-D6 = GPIOX_2  # PIN_22
-D7 = GPIOA_13  # PIN_7
-D8 = GPIOX_17  # PIN_3
-D9 = GPIOX_18  # PIN_5
-D10 = GPIOX_10  # PIN_24
-D11 = GPIOA_4  # PIN_26
-D12 = GPIOX_8  # PIN_19
-D13 = GPIOX_9  # PIN_21
-D14 = GPIOX_11  # PIN_23
-D15 = GPIOX_12  # PIN_8
-D16 = GPIOX_13  # PIN_10
-D21 = GPIOX_14  # PIN_29
-D22 = GPIOX_15  # PIN_31
-D23 = GPIOX_5  # PIN_33
-D24 = GPIOX_6  # PIN_35
-D26 = GPIOA_12  # PIN_32
-D27 = GPIOX_19  # PIN_36
-D30 = GPIOA_14  # PIN_27
-D31 = GPIOA_15  # PIN_28
+D3 = GPIOX_17
+D5 = GPIOX_18
+D7 = GPIOA_13
+D8 = GPIOX_12
+D10 = GPIOX_13
+D11 = GPIOX_3
+D12 = GPIOX_16
+D13 = GPIOX_4
+D15 = GPIOX_7
+D16 = GPIOX_0
+D18 = GPIOX_1
+D19 = GPIOX_8
+D21 = GPIOX_9
+D22 = GPIOX_2
+D23 = GPIOX_11
+D24 = GPIOX_10
+D26 = GPIOA_4
+D27 = GPIOA_14
+D28 = GPIOA_15
+D29 = GPIOX_14
+D31 = GPIOX_15
+D32 = GPIOA_12
+D33 = GPIOX_5
+D35 = GPIOX_6
+D36 = GPIOX_19
 
 """ ADC """
 A0 = 40
 A1 = 37
+
+""" PWM """
+PWM = D15
+
+""" UART """
+UART0_TX = D8
+UART0_RX = D10

src/adafruit_blinka/board/licheepi_4a.py

@@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: 2024 Chris Brown
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Lichee Pi 4A."""
+
+from adafruit_blinka.microcontroller.thead.th1520 import pin
+
+IO1_6 = pin.GPIO1_6
+IO1_5 = pin.GPIO1_5
+IO1_4 = pin.GPIO1_4
+IO1_3 = pin.GPIO1_3
+I2C2_SCL = pin.TWI2_SCL
+U2_TX = pin.UART2_TX
+I2C2_SDA = pin.TWI2_SDA
+U2_RX = pin.UART2_RX
+U3_TX = pin.UART3_TX
+U3_RX = pin.UART3_RX
+U1_TX = pin.UART1_TX
+U1_RX = pin.UART1_RX
+U0_TX = pin.UART0_TX
+U0_RX = pin.UART0_RX
+QSPI1_SO = pin.SPI1_MISO
+QSPI1_CS = pin.SPI1_CS
+QSPI1_SI = pin.SPI1_MOSI
+QSPI1_CLK = pin.SPI1_SCLK
+
+# Default UART
+TX = U0_TX
+RX = U0_RX
+
+# Default I2C
+SCL = I2C2_SCL
+SDA = I2C2_SDA
+
+# Default SPI
+SCLK = QSPI1_CLK
+MOSI = QSPI1_SI
+MISO = QSPI1_SO
+CS = QSPI1_CS

src/adafruit_blinka/board/repkapi/__init__.py

@@ -0,0 +1,79 @@
+# SPDX-FileCopyrightText: 2024 Suren Khorenyan
+#
+# SPDX-License-Identifier: MIT
+"""Repka Pi 3 (Allwinner H5) pin names"""
+from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+
+PA0 = Pin((1, 0))
+UART2_TX = PA0
+PA1 = Pin((1, 1))
+UART2_RX = PA1
+PA2 = Pin((1, 2))
+PA3 = Pin((1, 3))
+SPI0_CS1 = PA3
+PA4 = Pin((1, 4))
+UART0_TX = PA4
+PA5 = Pin((1, 5))
+UART0_RX = PA5
+PA6 = Pin((1, 6))
+PA7 = Pin((1, 7))
+PA8 = Pin((1, 8))
+PA9 = Pin((1, 9))
+PA10 = Pin((1, 10))
+PA11 = Pin((1, 11))
+TWI1_SCL = PA11
+PA12 = Pin((1, 12))
+TWI1_SDA = PA12
+PA13 = Pin((1, 13))
+SPI1_CS0 = PA13
+PA14 = Pin((1, 14))
+SPI1_CLK = PA14
+PA15 = Pin((1, 15))
+SPI1_MOSI = PA15
+PA16 = Pin((1, 16))
+SPI1_MISO = PA16
+PA18 = Pin((1, 18))
+TWI2_SCL = PA18
+PA19 = Pin((1, 19))
+TWI2_SDA = PA19
+PA21 = Pin((1, 21))
+
+PC0 = Pin((1, 64))
+SPI0_MOSI = PC0
+PC1 = Pin((1, 65))
+SPI0_MISO = PC1
+PC2 = Pin((1, 66))
+SPI0_CLK = PC2
+PC3 = Pin((1, 67))
+SPI0_CS0 = PC3
+
+
+PL2 = Pin((1, 354))
+S_UART_TX = PL2
+PL3 = Pin((1, 355))
+S_UART_RX = PL3
+PL11 = Pin((1, 363))
+
+
+i2cPorts = (
+    (1, TWI1_SCL, TWI1_SDA),
+    # todo: check pinout in `/proc/device-tree/repka-pinout`?
+    (2, TWI2_SCL, TWI2_SDA),
+)
+# ordered as spiId, sckId, mosiId, misoId
+spiPorts = (
+    (0, SPI0_CLK, SPI0_MOSI, SPI0_MISO),
+    (1, SPI1_CLK, SPI1_MOSI, SPI1_MISO),
+)
+# ordered as uartId, txId, rxId
+uartPorts = (
+    # todo: check uart ids
+    (0, UART0_TX, UART0_RX),
+    (2, UART2_TX, UART2_RX),
+    (1, S_UART_TX, S_UART_RX),
+)
+
+
+# default I2C
+SCL = i2cPorts[0][1]
+SDA = i2cPorts[0][2]

src/adafruit_blinka/board/repkapi/repka_pi_3.py

@@ -0,0 +1,56 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+# copied from Allwinner H6 to be updated later
+
+"""Repka Pi 4 (Allwinner H6) Pin Names"""
+from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+
+# TODO: check and update all pins after board release
+PC16 = Pin((1, 79))
+
+PD14 = Pin((1, 110))
+PD15 = Pin((1, 111))
+PD16 = Pin((1, 112))
+PD17 = Pin((1, 113))
+PD18 = Pin((1, 114))
+PD19 = Pin((1, 115))
+UART2_TX = PD19
+PD20 = Pin((1, 116))
+UART2_RX = PD20
+PD21 = Pin((1, 117))
+PD22 = Pin((1, 118))
+PD23 = Pin((1, 119))
+PD24 = Pin((1, 120))
+PD25 = Pin((1, 121))
+TWI0_SCL = PD25
+PD26 = Pin((1, 122))
+TWI0_SDA = PD26
+
+PG10 = Pin((1, 202))
+PG11 = Pin((1, 203))
+PG12 = Pin((1, 204))
+PG13 = Pin((1, 205))
+PG14 = Pin((1, 206))
+
+PH2 = Pin((1, 226))
+PH3 = Pin((1, 227))
+SPI1_CS = PH3
+PH4 = Pin((1, 228))
+SPI1_SCLK = PH4
+PH5 = Pin((1, 229))
+SPI1_MOSI = PH5
+PH6 = Pin((1, 230))
+SPI1_MISO = PH6
+PH8 = Pin((1, 230))
+PH9 = Pin((1, 231))
+
+PL2 = Pin((0, 2))
+PL3 = Pin((0, 3))
+PL8 = Pin((0, 8))
+PL9 = Pin((0, 9))
+PL10 = Pin((0, 10))
+
+i2cPorts = ((0, TWI0_SCL, TWI0_SDA),)
+spiPorts = ((1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),)
+uartPorts = ((2, UART2_TX, UART2_RX),)