Udoo x86 Ultra II board GPIO defs

tested using blink and button and pylint

diff --git a/src/adafruit_blinka/board/udoo_x86ultra.py b/src/adafruit_blinka/board/udoo_x86ultra.py
index 078a0d1c33c6277a44b52be446c4295fa3c2763a..d0cb8f06b8413982301942265d240ad030a3060c 100644 (file)
--- a/src/adafruit_blinka/board/udoo_x86ultra.py
+++ b/src/adafruit_blinka/board/udoo_x86ultra.py
@@ -1,16 +1,18 @@
 """Pin definitions for Udoo x86 Ultra
-(should work for Ultra and Ultra II)"""
+(should work for Ultra and Ultra II)
 
-from adafruit_blinka.microcontroller.pentium.n3710 import pin
-
-""" There are 2 naming systems.  A Digital Pin system which includes
+There are 2 naming systems.  A Digital Pin system which includes
 the arduino chip (Leonardo or 101).  The Braswell #s start at 16 and
-is documented in the diagram in https://www.udoo.org/docs-x86II/Introduction/Introduction.html
-The other is based on the hardware manual https://udoo.org/download/files/UDOO_X86/Doc/UDOO_X86II_MANUAL.pdf
+is documented in the diagram and text for linux version later than 4.15 in:
+https://www.udoo.org/docs-x86II/Introduction/Introduction.html
+The other is based on the hardware manual:
+https://udoo.org/download/files/UDOO_X86/Doc/UDOO_X86II_MANUAL.pdf
 
 This will use the D system based on the diagram in the user guide
 """
 
+from adafruit_blinka.microcontroller.pentium.n3710 import pin
+
 # Connector CN15
 D16 = pin.UART1_RTS
 D17 = pin.UART1_CTS
@@ -35,19 +37,19 @@ D34 = pin.I2C0_SCL
 D35 = pin.I2C0_SDA
 
 D36 = pin.GPIO_492
-D27 = pin.GPIO_490
+D37 = pin.GPIO_490
 
-D38 = pin.I2C5_SCL
-D39 = pin.I2C5_SDA
+D38 = pin.I2C1_SCL
+D39 = pin.I2C1_SDA
 
 # Connector CN12 SDIO SD/MMC interfaces
-D40 = GPIO_358
-D41 = GPIO_243
-D42 = GPIO_249
-D43 = GPIO_246
-D44 = GPIO_253
-D45 = GPIO_250
-D46 = GPIO_247
+D40 = pin.GPIO_358
+D41 = pin.GPIO_243
+D42 = pin.GPIO_249
+D43 = pin.GPIO_246
+D44 = pin.GPIO_253
+D45 = pin.GPIO_250
+D46 = pin.GPIO_247
 
 # aliases
 UART1_RX = D19
@@ -56,9 +58,8 @@ UART1_TX = D18
 UART2_RX = D23
 UART2_TX = D22
 
-I2C0_SCL = D34 # labeled on diagram as I2C1
-I2C0_SDA = D35 # actually port 0
-
-I2C1_SCL = D38 # Labeled on diagram as I2C2 hardware manual port 5
-I2C1_SCL = D39 # i2c detect lists it as i2c1
+I2C0_SCL = D34 # labeled on diagram as I2C1, hardware manual port 0
+I2C0_SDA = D35 # i2cdetect-l lists it as i2c-0
 
+I2C1_SCL = D38 # Labeled on diagram as I2C2, hardware manual port 5
+I2C1_SCL = D39 # i2cdetect lists it as i2c-1

diff --git a/src/adafruit_blinka/microcontroller/pentium/n3710/pin.py b/src/adafruit_blinka/microcontroller/pentium/n3710/pin.py
index e01e4d4a0c24d969b6f519b646681cfec78fbe76..0be635a9613ac427460395dea7dc6b7b9ab81a7f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/pentium/n3710/pin.py
+++ b/src/adafruit_blinka/microcontroller/pentium/n3710/pin.py
@@ -2,26 +2,26 @@
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
 # gpiochip3
-GPIO_243 = Pin((3,15))
-GPIO_246 = Pin((3,18))
-GPIO_247 = Pin((3,19))
-GPIO_249 = Pin((3,21))
-GPIO_250 = Pin((3,22))
-GPIO_253 = Pin((3,25))
-GPIO_273 = Pin((3,45))
-GPIO_275 = Pin((3,47))
-GPIO_276 = Pin((3,48))
-GPIO_278 = Pin((3,50))
-GPIO_279 = Pin((3,51))
-GPIO_280 = Pin((3,52))
-GPIO_307 = Pin((3,79))
-
-sdmmc2_D3 = GPIO_243 # SDIO_D3 on diagram
-sdmmc2_D1 = GPIO_246
-sdmmc2_CLK = GPIO_247
-sdmmc2_D2 = GPIO_249
-sdmmc2_CMD = GPIO_250
-sdmmc2_D0 = GPIO_253
+GPIO_243 = Pin((3, 15))
+GPIO_246 = Pin((3, 18))
+GPIO_247 = Pin((3, 19))
+GPIO_249 = Pin((3, 21))
+GPIO_250 = Pin((3, 22))
+GPIO_253 = Pin((3, 25))
+GPIO_273 = Pin((3, 45))
+GPIO_275 = Pin((3, 47))
+GPIO_276 = Pin((3, 48))
+GPIO_278 = Pin((3, 50))
+GPIO_279 = Pin((3, 51))
+GPIO_280 = Pin((3, 52))
+GPIO_307 = Pin((3, 79))
+
+SDIO_D3 = SDMMC2_D3 = GPIO_243
+SDIO_DI = SDMMC2_D1 = GPIO_246
+SDIO_CLK = SDMMC2_CLK = GPIO_247
+SDIO_D2 = SDMMC2_D2 = GPIO_249
+SDIO_CMD = SDMMC2_CMD = GPIO_250
+SDIO_D0 = SDMMC2_D0 = GPIO_253
 
 MF_LPC_AD2 = GPIO_273
 MF_LPC_AD0 = GPIO_275
@@ -32,30 +32,30 @@ MF_LPC_AD1 = GPIO_280
 ILB_SERIRQ = GPIO_307
 
 # ggpiochip1
-GPIO_358 = Pin((1,17))
+GPIO_358 = Pin((1, 17))
 GPIO_SUS3 = SDIO_WAKE = GPIO_358
 
 
 # gpiochip0
-GPIO_490 = Pin((0,76))
-GPIO_492 = Pin((0,78))
+GPIO_490 = Pin((0, 76))
+GPIO_492 = Pin((0, 78))
 
 SATA_GP1 = TS_INT = GPIO_490
-SATA_GP@ = TS_RST = GPIO_492
+SATA_GP2 = TS_RST = GPIO_492
 
 
 # not general gpio on chip 0
 # uarts
 
-UART1_RXD = Pin((0,16))
-UART1_TXD = Pin((0,20))
-UART1_RTS = Pin((0,15))
-UART1_CTS = Pin((0,18))
+UART1_RXD = Pin((0, 16))
+UART1_TXD = Pin((0, 20))
+UART1_RTS = Pin((0, 15))
+UART1_CTS = Pin((0, 18))
 
-UART2_RXD = Pin((0,17))
-UART2_TXD = Pin((0,21))
-UART2_RTS = Pin((0,19))
-UART2_CTS = Pin((0,22))
+UART2_RXD = Pin((0, 17))
+UART2_TXD = Pin((0, 21))
+UART2_RTS = Pin((0, 19))
+UART2_CTS = Pin((0, 22))
 
 GPIO_429 = UART1_RTS
 GPIO_430 = UART1_RXD
@@ -63,27 +63,22 @@ GPIO_431 = UART2_RXD
 GPIO_432 = UART1_CTS
 GPIO_434 = UART1_TXD
 GPIO_435 = UART2_TXD
-GPIO_436 = UART2_CTS 
+GPIO_436 = UART2_CTS
 
-#i2c 
-I2C0_SDA = Pin((0,61))
-I2C0_SCL = Pin((0,65))
+# i2c
+I2C0_SDA = Pin((0, 61))
+I2C0_SCL = Pin((0, 65))
 
-I2C1_SDA = TS_I2C_SDA = Pin((0,45)) # listed as port 5 on hardware manual
-I2C1_SCL = TS_I2C_SCL = Pin((0,48))
+I2C1_SDA = TS_I2C_SDA = Pin((0, 45))  # listed as port 5 on hardware manual
+I2C1_SCL = TS_I2C_SCL = Pin((0, 48))  # i2c2 on diagram
 
 
-GPIO_469 = I2C5_SDA #I2C2 on diagram
-GPIO_472 = I2C5_SCL 
-GPIO_475 = I2C0_SDA #I2C1 on diagram
+GPIO_469 = I2C1_SDA  # I2C2 on diagram
+GPIO_472 = I2C1_SCL
+GPIO_475 = I2C0_SDA  # I2C1 on diagram
 GPIO_479 = I2C0_SCL
 
-i2cPorts = (
-    (0, I2C0_SCL, I2C0_SDA),
-    (1, I2C1_SCL, I2C1_SDA),
-)
+i2cPorts = ((0, I2C0_SCL, I2C0_SDA), (1, I2C1_SCL, I2C1_SDA))
 
 # ordered as uartId, txId, rxId
-uartPorts = (
-    (1, UART1_TXD, UART1_RXD),
-    (2, UART2_TXD, UART2_RXD),
+uartPorts = ((1, UART1_TXD, UART1_RXD), (2, UART2_TXD, UART2_RXD))

diff --git a/src/board.py b/src/board.py
index 9aa520edc31c62af53e0650aeee69aef942f664a..e1ddaf47b600bce53af07a6d6e414bea453a7d91 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -158,9 +158,9 @@ elif board_id == ap_board.ONION_OMEGA2:
 
 elif board_id == ap_board.ROCK_PI_S:
     from adafruit_blinka.board.radxa.rockpis import *
-    
+
 elif board_id == ap_board.UDOO_X86:
-    from adafruit_blinka.board.udoo_x86ultra import *    
+    from adafruit_blinka.board.udoo_x86ultra import *
 
 elif "sphinx" in sys.modules:
     pass

diff --git a/src/digitalio.py b/src/digitalio.py
index 9ed8ac37bdf8074853a74f296c26628a0cee1ce3..b1f1cc792bea3ee5a0e83c7de684866dfb95c729 100755 (executable)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -58,7 +58,7 @@ elif detector.chip.STM32:
 elif detector.board.microchip_mcp2221:
     from adafruit_blinka.microcontroller.mcp2221.pin import Pin
 elif detector.chip.PENTIUM_N3710:
-    from adafruit_blinka.microcontroller.pentium.n3710.pin import Pin  
+    from adafruit_blinka.microcontroller.pentium.n3710.pin import Pin
 
 from adafruit_blinka import Enum, ContextManaged
 

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 3c0b37aa100719f617d061f2e10095317fbba1c6..9f7d8f22a639ceab2d650a1c2e9ce6aa8636f550 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -78,7 +78,7 @@ elif chip_id == ap_chip.MIPS24KC:
     from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
 elif chip_id == ap_chip.MIPS24KEC:
     from adafruit_blinka.microcontroller.mips24kec.pin import *
-elif chip_id == ap_chip.PENTIUM_n3710:
+elif chip_id == ap_chip.PENTIUM_N3710:
     from adafruit_blinka.microcontroller.pentium.n3710.pin import *
 else:
     raise NotImplementedError("Microcontroller not supported:", chip_id)

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 4494de5a78b49271640c4b438b14c2b289708b10..7c2d746b5fb46356eed6d12eff16339646efca22 100755 (executable)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -56,7 +56,7 @@ elif chip_id == ap_chip.MIPS24KC:
     from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
 elif chip_id == ap_chip.MIPS24KEC:
     from adafruit_blinka.microcontroller.mips24kec.pin import *
-elif chip_id == ap_chip.PENTIUM_N3710
+elif chip_id == ap_chip.PENTIUM_N3710:
     from adafruit_blinka.microcontroller.pentium.n3710.pin import *
 else:
     raise NotImplementedError("Microcontroller not supported: ", chip_id)