Support pin names in RPI style for Coral boards

This should allow code compatibility across boards when using the
"D#" names, as per the Raspberry Pi header.

This also renames several pin names for the Mini so they actually match
the datasheet pin names. (Previously, I mistakenly used pin names
from the original Dev Board.) These renames are safe at this point
because the Dev Board Mini has not shipped yet.

diff --git a/src/adafruit_blinka/board/coral_dev_board.py b/src/adafruit_blinka/board/coral_dev_board.py
index 69cd3db25da7d9a0067932470c4035bcd5aee0fd..808ffd5a87c947e5dd651a63c997d7ce0f1f2fe6 100644 (file)
--- a/src/adafruit_blinka/board/coral_dev_board.py
+++ b/src/adafruit_blinka/board/coral_dev_board.py
@@ -2,23 +2,23 @@
 
 from adafruit_blinka.microcontroller.nxp_imx8m import pin
 
 
 from adafruit_blinka.microcontroller.nxp_imx8m import pin
 

-SDA = pin.I2C2_SDA
-SCL = pin.I2C2_SCL
+# Board name = RPI name [= alias] = pin name
+I2C2_SDA = D2 = SDA = pin.I2C2_SDA
+I2C2_SCL = D3 = SCL = pin.I2C2_SCL

 
 

-PWM1 = pin.PWM1
-PWM2 = pin.PWM2
-PWM3 = pin.PWM3
+PWM1 = D12 = pin.PWM1
+PWM2 = D13 = pin.PWM2
+PWM3 = D22 = pin.PWM3

 
 

-GPIO_P13 = pin.GPIO6
-GPIO_P16 = pin.GPIO73
-GPIO_P18 = pin.GPIO138
-GPIO_P29 = pin.GPIO7
-GPIO_P31 = pin.GPIO8
-GPIO_P36 = pin.GPIO141
-GPIO_P37 = pin.GPIO77
+GPIO_P13 = D27 = pin.GPIO6
+GPIO_P16 = D23 = pin.GPIO73
+GPIO_P18 = D24 = pin.GPIO138
+GPIO_P29 = D5 = pin.GPIO7
+GPIO_P31 = D6 = pin.GPIO8
+GPIO_P36 = D16 = pin.GPIO141
+GPIO_P37 = D26 = pin.GPIO77

 
 

-MISO = pin.ECSPI1_MISO
-MOSI = pin.ECSPI1_MOSI
-SCLK = pin.ECSPI1_SCLK
-SCK = pin.ECSPI1_SCLK
-SS0 = pin.ECSPI1_SS0
+ECSPI1_MISO = D9 = MISO = pin.ECSPI1_MISO
+ECSPI1_MOSI = D10 = MOSI = pin.ECSPI1_MOSI
+ECSPI1_SCLK = D11 = SCLK = SCK = pin.ECSPI1_SCLK
+ECSPI1_SS0 = D8 = SS0 = pin.ECSPI1_SS0
\ No newline at end of file

diff --git a/src/adafruit_blinka/board/coral_dev_board_mini.py b/src/adafruit_blinka/board/coral_dev_board_mini.py
index 35354d4f1035cd91957ba02f16289b0f279e86f5..caf896e1c6bb6ca08f4bef13691d52320b248264 100644 (file)
--- a/src/adafruit_blinka/board/coral_dev_board_mini.py
+++ b/src/adafruit_blinka/board/coral_dev_board_mini.py
@@ -2,33 +2,37 @@
 
 from adafruit_blinka.microcontroller.mt8167 import pin
 
 
 from adafruit_blinka.microcontroller.mt8167 import pin
 

-GPIO_P7 = pin.GPIO22
-GPIO_P11 = pin.GPIO9
-GPIO_P12 = pin.GPIO36
-GPIO_P13 = pin.GPIO10
-GPIO_P16 = pin.GPIO0
-GPIO_P18 = pin.GPIO1
-GPIO_P22 = pin.GPIO7
-GPIO_P26 = pin.GPIO8
-GPIO_P35 = pin.GPIO37
-GPIO_P36 = pin.GPIO13
-GPIO_P37 = pin.GPIO45
-GPIO_P38 = pin.GPIO38
-GPIO_P40 = pin.GPIO39
+# Board name = RPI name [= alias] = pin name
+GPIO22 = D4 = pin.GPIO22  # Pin 7
+GPIO9 = D17 = pin.GPIO9  # Pin 11
+GPIO36 = D18 = pin.GPIO36  # Pin 12
+GPIO10 = D27 = pin.GPIO10  # Pin 13
+GPIO0 = D23 = pin.GPIO0  # Pin 16
+GPIO1 = D24 = pin.GPIO1  # Pin 18
+GPIO7 = D25 = pin.GPIO7  # Pin 22
+GPIO8 = D7 = pin.GPIO8  # Pin 26
+GPIO37 = D19 = pin.GPIO37  # Pin 35
+GPIO13 = D16 = pin.GPIO13  # Pin 36
+GPIO45 = D26 = pin.GPIO45  # Pin 37
+GPIO38 = D20 = pin.GPIO38  # Pin 38
+GPIO39 = D21 = pin.GPIO39  # Pin 40

 
 

-SDA1 = pin.I2C1_SDA
-SCL1 = pin.I2C1_SCL
+I2C1_SDA = D2 = SDA1 = pin.I2C1_SDA  # Pin 3
+I2C1_SCL = D3 = SCL1 = pin.I2C1_SCL  # Pin 5
+I2C2_SDA = D0 = SDA2 = pin.I2C2_SDA  # Pin 27
+I2C2_SCL = D1 = SCL2 = pin.I2C2_SCL  # Pin 28

 
 

-SDA2 = pin.I2C2_SDA
-SCL2 = pin.I2C2_SCL
+PWM_A = D12 = pin.PWM_A  # Pin 32
+PWM_B = D13 = pin.PWM_B  # Pin 33
+PWM_C = D22 = pin.PWM_C  # Pin 15

 
 

-PWM0 = pin.PWM0
-PWM1 = pin.PWM1
-PWM2 = pin.PWM2
+SPI_MO = D10 = MOSI = pin.SPI_MO  # Pin 19
+SPI_MI = D9 = MISO = pin.SPI_MI  # Pin 21
+SPI_CLK = D11 = SCLK = pin.SPI_CLK  # Pin 23
+SPI_CSB = D8 = CS0 = pin.SPI_CSB  # Pin 24

 
 

-MOSI = pin.SPI_MO
-MISO = pin.SPI_MI
-SCLK = pin.SPI_CLK
-SCK = SCLK
-CS0 = pin.SPI_CSB
-CS = CS0
+# UART currently not supported
+GPIO63 = D14 = pin.GPIO63  # UART0_TX, Pin 8
+GPIO62 = D15 = pin.GPIO62  # UART0_RX, Pin 10
+GPIO65 = D5 = pin.GPIO65  # UART1_TX, Pin 29
+GPIO64 = D6 = pin.GPIO64  # UART1_RX, Pin 31
\ No newline at end of file

diff --git a/src/adafruit_blinka/microcontroller/mt8167/pin.py b/src/adafruit_blinka/microcontroller/mt8167/pin.py
index 2d158778e9c424ebd454c2bb4567a3c90c080b1a..ff5e0e579cfbc29ea33fd1b2ec079f9ba27d7ecb 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mt8167/pin.py
+++ b/src/adafruit_blinka/microcontroller/mt8167/pin.py
@@ -32,9 +32,9 @@ GPIO38 = Pin(38)  # MRG_DI    (pin 38)
 GPIO39 = Pin(39)  # MRG_DO    (pin 40)
 
 # Aliases
 GPIO39 = Pin(39)  # MRG_DO    (pin 40)
 
 # Aliases

-PWM0 = GPIO25  # EINT12  (pin 32)
-PWM1 = GPIO11  # EINT25  (pin 33)
-PWM2 = GPIO12  # EINT11  (pin 15)
+PWM_A = GPIO25  # EINT12  (pin 32)
+PWM_B = GPIO11  # EINT25  (pin 33)
+PWM_C = GPIO12  # EINT11  (pin 15)

 
 I2C1_SDA = GPIO52  # SDA1  (pin 3)
 I2C1_SCL = GPIO53  # SCL1  (pin 5)
 
 I2C1_SDA = GPIO52  # SDA1  (pin 3)
 I2C1_SCL = GPIO53  # SCL1  (pin 5)


@@ -49,9 +49,9 @@ SPI_CSB = GPIO5  # EINT5  (pin 24)
 
 # SysFS pwm outputs, pwm channel and pin in first tuple
 pwmOuts = (
 
 # SysFS pwm outputs, pwm channel and pin in first tuple
 pwmOuts = (

-    ((0, 0), PWM0),
-    ((0, 1), PWM1),
-    ((0, 2), PWM2),
+    ((0, 0), PWM_A),
+    ((0, 1), PWM_B),
+    ((0, 2), PWM_C),

 )
 
 # ordered as i2cId, sclId, sdaId
 )
 
 # ordered as i2cId, sclId, sdaId