From: happyme531 <2302004040@qq.com>
Date: Wed, 7 Dec 2022 12:51:34 +0000 (+0800)
Subject: Remove MUX index from peripheral pin for Rock5
X-Git-Tag: 8.10.0^2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/529e545fca1c13896bedd6b5de47a71230f19cf3?hp=-c

Remove MUX index from peripheral pin for Rock5

Use the lowest MUX index possible.
---

529e545fca1c13896bedd6b5de47a71230f19cf3
diff --git a/src/adafruit_blinka/board/radxa/rock5.py b/src/adafruit_blinka/board/radxa/rock5.py
index a96ce7c..1f54c39 100644
--- a/src/adafruit_blinka/board/radxa/rock5.py
+++ b/src/adafruit_blinka/board/radxa/rock5.py
@@ -51,84 +51,96 @@ D40 = pin.GPIO3_B3
 
 
 # UART
-UART2_TX_M0 = pin.GPIO0_B5
-UART2_RX_M0 = pin.GPIO0_B6
-UART2_TX_M2 = pin.GPIO3_B1
-UART2_RX_M2 = pin.GPIO3_B2
-UART3_TX_M1 = pin.GPIO3_B5
-UART3_RX_M1 = pin.GPIO3_B6
-UART4_TX_M2 = pin.GPIO1_B3
-UART4_RX_M2 = pin.GPIO1_B2
-UART7_TX_M1 = pin.GPIO3_C0
-UART7_RX_M1 = pin.GPIO3_C1
-UART7_TX_M2 = pin.GPIO1_B5
-UART7_RX_M2 = pin.GPIO1_B4
+# UART2_M0
+UART2_TX = pin.GPIO0_B5
+UART2_RX = pin.GPIO0_B6
+# UART3_M1
+UART3_TX = pin.GPIO3_B5
+UART3_RX = pin.GPIO3_B6
+# UART4_M2
+UART4_TX = pin.GPIO1_B3
+UART4_RX = pin.GPIO1_B2
+# UART7_M1
+UART7_TX = pin.GPIO3_C0
+UART7_RX = pin.GPIO3_C1
 
 # Default UART -> UART2_M0
 
-TX = UART2_TX_M0
-RX = UART2_RX_M0
-TXD = UART2_TX_M0
-RXD = UART2_RX_M0
+TX = UART2_TX
+RX = UART2_RX
+TXD = UART2_TX
+RXD = UART2_RX
 
 # I2C
-I2C0_SCL_M1 = pin.GPIO4_C5
-I2C0_SDA_M1 = pin.GPIO4_C6
-I2C1_SCL_M0 = pin.GPIO0_B5
-I2C1_SDA_M0 = pin.GPIO0_B6
-I2C3_SCL_M1 = pin.GPIO3_B7
-I2C3_SDA_M1 = pin.GPIO3_C0
-I2C7_SCL_M3 = pin.GPIO4_B2
-I2C7_SDA_M3 = pin.GPIO4_B3
-I2C8_SCL_M4 = pin.GPIO3_C2
-I2C8_SDA_M4 = pin.GPIO3_C3
+# I2C0_M1
+I2C0_SCL = pin.GPIO4_C5
+I2C0_SDA = pin.GPIO4_C6
+# I2C1_M0
+I2C1_SCL = pin.GPIO0_B5
+I2C1_SDA = pin.GPIO0_B6
+# I2C3_M1
+I2C3_SCL = pin.GPIO3_B7
+I2C3_SDA = pin.GPIO3_C0
+# I2C7_M3
+I2C7_SCL = pin.GPIO4_B2
+I2C7_SDA = pin.GPIO4_B3
+# I2C8_M4
+I2C8_SCL = pin.GPIO3_C2
+I2C8_SDA = pin.GPIO3_C3
 
 # Default I2C -> I2C7_M3
-SCL = I2C7_SCL_M3
-SDA = I2C7_SDA_M3
+SCL = I2C7_SCL
+SDA = I2C7_SDA
 
 # SPI
-SPI0_MOSI_M2 = pin.GPIO1_B2
-SPI0_MISO_M2 = pin.GPIO1_B1
-SPI0_CLK_M2 = pin.GPIO1_B3
-SPI0_SCLK_M2 = pin.SPI0_CLK_M2
-SPI0_CS0_M2 = pin.GPIO1_B4
-SPI0_CS1_M2 = pin.GPIO1_B5
-
-SPI1_MOSI_M1 = pin.GPIO3_B7
-SPI1_MISO_M1 = pin.GPIO3_C0
-SPI1_CLK_M1 = pin.GPIO3_C1
-SPI1_SCLK_M1 = pin.SPI1_CLK_M1
-SPI1_CS0_M1 = pin.SPI1_CS0_M1
-SPI1_CS1_M1 = pin.SPI1_CS1_M1
-
-SPI3_MISO_M0 = pin.GPIO4_C4
-SPI3_MOSI_M0 = pin.GPIO4_C5
-SPI3_SCK_M0 = pin.GPIO4_C6
-SPI3_SCLK_M0 = pin.SPI3_SCK_M0
+# SPI0_M2
+SPI0_MOSI = pin.GPIO1_B2
+SPI0_MISO = pin.GPIO1_B1
+SPI0_CLK = pin.GPIO1_B3
+SPI0_SCLK = pin.SPI0_CLK
+SPI0_CS0 = pin.GPIO1_B4
+SPI0_CS1 = pin.GPIO1_B5
+# SPI1_M1
+SPI1_MOSI = pin.GPIO3_B7
+SPI1_MISO = pin.GPIO3_C0
+SPI1_CLK = pin.GPIO3_C1
+SPI1_SCLK = pin.SPI1_CLK
+SPI1_CS0 = pin.SPI1_CS0
+SPI1_CS1 = pin.SPI1_CS1
+# SPI3_M0
+SPI3_MISO = pin.GPIO4_C4
+SPI3_MOSI = pin.GPIO4_C5
+SPI3_SCK = pin.GPIO4_C6
+SPI3_SCLK = pin.SPI3_SCK
 
 # Default SPI -> SPI0_M2
-MOSI = SPI0_MOSI_M2
-MISO = SPI0_MISO_M2
-SCLK = SPI0_SCLK_M2
-CS = SPI0_CS0_M2
-CS1 = SPI0_CS1_M2
+MOSI = SPI0_MOSI
+MISO = SPI0_MISO
+SCLK = SPI0_SCLK
+CS = SPI0_CS0
+CS1 = SPI0_CS1
 
 # PWM
-PWM2_M1 = pin.GPIO3_B1
-PWM3_IR_M1 = pin.GPIO3_B2
-PWM5_M2 = pin.GPIO4_C4
-PWM6_M2 = pin.GPIO4_C5
-PWM7_IR_M3 = pin.GPIO4_C6
-PWM8_M0 = pin.GPIO3_A7
-PWM12_M0 = pin.GPIO3_B5
-PWM13_M0 = pin.GPIO3_B6
-PWM13_M2 = pin.GPIO1_B7
-PWM14_M0 = pin.GPIO3_C2
-PWM14_M1 = pin.GPIO4_B2
-PWM15_IR_M0 = pin.GPIO3_C3
-PWM15_IR_M1 = pin.GPIO4_B3
-PWM15_IR_M3 = pin.GPIO1_D7
+# PWM2_M1
+PWM2 = pin.GPIO3_B1
+# PWM3_IR_M1
+PWM3 = pin.GPIO3_B2
+# PWM5_M2
+PWM5 = pin.GPIO4_C4
+# PWM6_M2
+PWM6 = pin.GPIO4_C5
+# PWM7_IR_M3
+PWM7 = pin.GPIO4_C6
+# PWM8_M0
+PWM8 = pin.GPIO3_A7
+# PWM12_M0
+PWM12 = pin.GPIO3_B5
+# PWM13_M0
+PWM13 = pin.GPIO3_B6
+# PWM14_M0
+PWM14 = pin.GPIO3_C2
+# PWM15_IR_M0
+PWM15 = pin.GPIO3_C3
 
 # ADC
 ADC_IN0 = pin.ADC_IN0