S905X3: modify GPIO and bus pin number

diff --git a/src/adafruit_blinka/microcontroller/amlogic/s905x3/pin.py b/src/adafruit_blinka/microcontroller/amlogic/s905x3/pin.py
index d224aa1ee10b396bdf5beb87b153304e27decb08..712d704adf3f8992fe96576b0a8cd226323b80a8 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/s905x3/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/s905x3/pin.py
@@ -1,85 +1,90 @@
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 

-GPIO496 = Pin((0, 0))
-GPIO497 = Pin((0, 1))
-GPIO498 = Pin((0, 2))
-GPIO499 = Pin((0, 3))
-GPIO500 = Pin((0, 4))
-GPIO501 = Pin((0, 5))
-GPIO502 = Pin((0, 6))
-GPIO503 = Pin((0, 7))
-GPIO504 = Pin((0, 8))
-GPIO505 = Pin((0, 9))
-GPIO506 = Pin((0, 10))
-GPIO507 = Pin((0, 11))
-GPIO508 = Pin((0, 12))
-GPIO509 = Pin((0, 13))
-GPIO510 = Pin((0, 14))
-GPIO511 = Pin((0, 15))
+# Ref:
+# Linux kernel 4.9.y (hardkernel)
+#     linux/include/dt-bindings/gpio/meson-g12a-gpio.h
+#     linux/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts

 
 

-GPIO17 = Pin((1, 17))
-GPIO18 = Pin((1, 18))
-GPIO19 = Pin((1, 19))
-GPIO20 = Pin((1, 20))
-GPIO21 = Pin((1, 21))
-GPIO22 = Pin((1, 22))
-GPIO23 = Pin((1, 23))
-GPIO24 = Pin((1, 24))
-GPIO25 = Pin((1, 25))
+GPIOAO_0 = GPIO496 = Pin((0, 0))
+GPIOAO_1 = GPIO497 = Pin((0, 1))
+GPIOAO_2 = GPIO498 = Pin((0, 2))
+GPIOAO_3 = GPIO499 = Pin((0, 3))
+GPIOAO_4 = GPIO500 = Pin((0, 4))
+GPIOAO_5 = GPIO501 = Pin((0, 5))
+GPIOAO_6 = GPIO502 = Pin((0, 6))
+GPIOAO_7 = GPIO503 = Pin((0, 7))
+GPIOAO_8 = GPIO504 = Pin((0, 8))
+GPIOAO_9 = GPIO505 = Pin((0, 9))
+GPIOAO_10 = GPIO506 = Pin((0, 10))
+GPIOAO_11 = GPIO507 = Pin((0, 11))
+GPIOE_0 = GPIO508 = Pin((0, 12))
+GPIOE_1 = GPIO509 = Pin((0, 13))
+GPIOE_2 = GPIO510 = Pin((0, 14))
+GPIO_TEST_N = GPIO511 = Pin((0, 15))

 
 

-GPIO460 = Pin((1, 50))
-GPIO461 = Pin((1, 51))
-GPIO462 = Pin((1, 52))
-GPIO463 = Pin((1, 53))
-GPIO464 = Pin((1, 54))
-GPIO465 = Pin((1, 55))
-GPIO466 = Pin((1, 56))
-GPIO467 = Pin((1, 57))
-GPIO468 = Pin((1, 58))
-GPIO469 = Pin((1, 59))
-GPIO470 = Pin((1, 60))
-GPIO472 = Pin((1, 62))
-GPIO471 = Pin((1, 61))
-GPIO472 = Pin((1, 62))
-GPIO473 = Pin((1, 63))
-GPIO474 = Pin((1, 64))
-GPIO475 = Pin((1, 65))
-GPIO476 = Pin((1, 66))
-GPIO477 = Pin((1, 67))
-GPIO478 = Pin((1, 68))
-GPIO479 = Pin((1, 69))
-GPIO480 = Pin((1, 70))
-GPIO481 = Pin((1, 71))
-GPIO482 = Pin((1, 72))
-GPIO483 = Pin((1, 73))
-GPIO484 = Pin((1, 74))
-GPIO485 = Pin((1, 75))
-GPIO486 = Pin((1, 76))
-GPIO487 = Pin((1, 77))
-GPIO488 = Pin((1, 78))
-GPIO489 = Pin((1, 79))
-GPIO490 = Pin((1, 80))
-GPIO491 = Pin((1, 81))
-GPIO492 = Pin((1, 82))
-GPIO493 = Pin((1, 83))
-GPIO494 = Pin((1, 84))
-GPIO495 = Pin((1, 85))
+GPIOH_0 = GPIO427 = Pin((1, 17))
+GPIOH_1 = GPIO428 = Pin((1, 18))
+GPIOH_2 = GPIO429 = Pin((1, 19))
+GPIOH_3 = GPIO430 = Pin((1, 20))
+GPIOH_4 = GPIO431 = Pin((1, 21))
+GPIOH_5 = GPIO432 = Pin((1, 22))
+GPIOH_6 = GPIO433 = Pin((1, 23))
+GPIOH_7 = GPIO434 = Pin((1, 24))
+GPIOH_8 = GPIO435 = Pin((1, 25))

 
 

-I2C2_SDA = GPIO493
-I2C2_SCL = GPIO494
-I2C3_SDA = GPIO474
-I2C3_SCL = GPIO475
+GPIOA_0 = GPIO460 = Pin((1, 50))
+GPIOA_1 = GPIO461 = Pin((1, 51))
+GPIOA_2 = GPIO462 = Pin((1, 52))
+GPIOA_3 = GPIO463 = Pin((1, 53))
+GPIOA_4 = GPIO464 = Pin((1, 54))
+GPIOA_5 = GPIO465 = Pin((1, 55))
+GPIOA_6 = GPIO466 = Pin((1, 56))
+GPIOA_7 = GPIO467 = Pin((1, 57))
+GPIOA_8 = GPIO468 = Pin((1, 58))
+GPIOA_9 = GPIO469 = Pin((1, 59))
+GPIOA_10 = GPIO470 = Pin((1, 60))
+GPIOA_11 = GPIO471 = Pin((1, 61))
+GPIOA_12 = GPIO472 = Pin((1, 62))
+GPIOA_13 = GPIO473 = Pin((1, 63))
+GPIOA_14 = GPIO474 = Pin((1, 64))
+GPIOA_15 = GPIO475 = Pin((1, 65))

 
 

-UART1_TX = GPIO488
-UART1_RX = GPIO489
+GPIOX_0 = GPIO476 = Pin((1, 66))
+GPIOX_1 = GPIO477 = Pin((1, 67))
+GPIOX_2 = GPIO478 = Pin((1, 68))
+GPIOX_3 = GPIO479 = Pin((1, 69))
+GPIOX_4 = GPIO480 = Pin((1, 70))
+GPIOX_5 = GPIO481 = Pin((1, 71))
+GPIOX_6 = GPIO482 = Pin((1, 72))
+GPIOX_7 = GPIO483 = Pin((1, 73))
+GPIOX_8 = GPIO484 = Pin((1, 74))
+GPIOX_9 = GPIO485 = Pin((1, 75))
+GPIOX_10 = GPIO486 = Pin((1, 76))
+GPIOX_11 = GPIO487 = Pin((1, 77))
+GPIOX_12 = GPIO488 = Pin((1, 78))
+GPIOX_13 = GPIO489 = Pin((1, 79))
+GPIOX_14 = GPIO490 = Pin((1, 80))
+GPIOX_15 = GPIO491 = Pin((1, 81))
+GPIOX_16 = GPIO492 = Pin((1, 82))
+GPIOX_17 = GPIO493 = Pin((1, 83))
+GPIOX_18 = GPIO494 = Pin((1, 84))
+GPIOX_19 = GPIO495 = Pin((1, 85))

 
 

-SPI0_SCLK = GPIO487
-SPI0_MISO = GPIO485
-SPI0_MOSI = GPIO484
-SPI0_CS0 = GPIO488
+I2C1_SDA = GPIOX_17
+I2C1_SCL = GPIOX_18
+I2C2_SDA = GPIOA_14
+I2C2_SCL = GPIOA_15

 
 

-i2cPorts = ( (2, I2C2_SCL, I2C2_SDA), (3, I2C3_SCL, I2C3_SDA), )
+UART1_TX = GPIOX_12
+UART1_RX = GPIOX_13
+
+SPI0_SCLK = GPIOX_11
+SPI0_MISO = GPIOX_9
+SPI0_MOSI = GPIOX_8
+SPI0_CS0 = GPIOX_10
+
+i2cPorts = ((1, I2C1_SCL, I2C1_SDA), (2, I2C2_SCL, I2C2_SDA), )

 # ordered as spiId, sckId, mosiId, misoId
 # ordered as spiId, sckId, mosiId, misoId

-spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), )
+spiPorts = ((0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), )

 # ordered as uartId, txId, rxId
 # ordered as uartId, txId, rxId

-uartPorts = ( (1, UART1_TX, UART1_RX), )
+uartPorts = ((1, UART1_TX, UART1_RX), )