Remove duplicate in micorcontrollr/pin.py and reorder Uart ports in A20/pin.py to...

diff --git a/src/adafruit_blinka/microcontroller/allwinner/a20/pin.py b/src/adafruit_blinka/microcontroller/allwinner/a20/pin.py
index 7e2d41de809552a3465b859fbf45c18651828aa6..ff3df62747fbdc884648ec46dc4a530e5298b7c2 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/a20/pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/a20/pin.py
@@ -154,9 +154,9 @@ spiPorts = ((0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO),
 uartPorts = (
     (0, UART0_TX, UART0_RX),
     (2, UART2_TX, UART2_RX),
 uartPorts = (
     (0, UART0_TX, UART0_RX),
     (2, UART2_TX, UART2_RX),

+    (4, UART4_TX, UART4_RX),

     (5, UART5_TX, UART5_RX),
     (6, UART6_TX, UART6_RX),
     (5, UART5_TX, UART5_RX),
     (6, UART6_TX, UART6_RX),

-    (4, UART4_TX, UART4_RX),

     (7, UART7_TX, UART7_RX),
 )
 
     (7, UART7_TX, UART7_RX),
 )
 

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index abb665da199b36aad3d4b1bf40d361de90bf3249..fdd77ddef20d159f3baa6862a2c00affbf6d0282 100644 (file)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -97,8 +97,6 @@ elif chip_id == ap_chip.A64:
     from adafruit_blinka.microcontroller.allwinner.a64.pin import *
 elif chip_id == ap_chip.A33:
     from adafruit_blinka.microcontroller.allwinner.a33.pin import *
     from adafruit_blinka.microcontroller.allwinner.a64.pin import *
 elif chip_id == ap_chip.A33:
     from adafruit_blinka.microcontroller.allwinner.a33.pin import *

-elif chip_id == ap_chip.A20:
-    from adafruit_blinka.microcontroller.allwinner.a20.pin import *

 elif chip_id == ap_chip.RK3308:
     from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
 elif chip_id == ap_chip.RK3399:
 elif chip_id == ap_chip.RK3308:
     from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
 elif chip_id == ap_chip.RK3399: