From: Melissa LeBlanc-Williams Date: Thu, 9 Jan 2020 17:29:05 +0000 (-0800) Subject: Merge pull request #215 from yeyeto2788/AllWinner_refactor X-Git-Tag: 3.3.10 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/acd42dc865632e67ccce11031ecafce016fcf2b1?hp=31ce09daee21e6f3d43be63060747efe08a0271d Merge pull request #215 from yeyeto2788/AllWinner_refactor Simple refactor to place all AllWinner boards within the same module --- diff --git a/src/adafruit_blinka/board/orangepipc.py b/src/adafruit_blinka/board/orangepipc.py index 8c6e88e..7f32cdf 100644 --- a/src/adafruit_blinka/board/orangepipc.py +++ b/src/adafruit_blinka/board/orangepipc.py @@ -1,6 +1,6 @@ """Pin definitions for the Orange Pi PC.""" -from adafruit_blinka.microcontroller.allwinner_h3 import pin +from adafruit_blinka.microcontroller.allwinner.h3 import pin PA12 = pin.PA12 SDA = pin.PA12 diff --git a/src/adafruit_blinka/board/orangepir1.py b/src/adafruit_blinka/board/orangepir1.py index 9319450..0752c51 100644 --- a/src/adafruit_blinka/board/orangepir1.py +++ b/src/adafruit_blinka/board/orangepir1.py @@ -1,6 +1,6 @@ """Pin definitions for the Orange Pi R1.""" -from adafruit_blinka.microcontroller.allwinner_h3 import pin +from adafruit_blinka.microcontroller.allwinner.h3 import pin PA12 = pin.PA12 SDA = pin.PA12 diff --git a/src/adafruit_blinka/board/orangepizero.py b/src/adafruit_blinka/board/orangepizero.py index bb425aa..a1dd925 100644 --- a/src/adafruit_blinka/board/orangepizero.py +++ b/src/adafruit_blinka/board/orangepizero.py @@ -2,7 +2,7 @@ # The Orange Pi Zero uses the AllWinner H2 SoC, but pins # are the same as the AllWinner H3 SoC, so we import those -from adafruit_blinka.microcontroller.allwinner_h3 import pin +from adafruit_blinka.microcontroller.allwinner.h3 import pin PA12 = pin.PA12 SDA = pin.PA12 diff --git a/src/adafruit_blinka/board/tritium-h3.py b/src/adafruit_blinka/board/tritium-h3.py index 620957c..516528a 100644 --- a/src/adafruit_blinka/board/tritium-h3.py +++ b/src/adafruit_blinka/board/tritium-h3.py @@ -1,6 +1,6 @@ """Pin definitions for the Tritium H3.""" -from adafruit_blinka.microcontroller.allwinner_h3 import pin +from adafruit_blinka.microcontroller.allwinner.h3 import pin PA12 = pin.PA12 SDA = pin.PA12 diff --git a/src/adafruit_blinka/microcontroller/allwinner/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/__init__.py new file mode 100644 index 0000000..78b6459 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/allwinner/__init__.py @@ -0,0 +1 @@ +"""Definition of all Allwinner chips""" \ No newline at end of file diff --git a/src/adafruit_blinka/microcontroller/allwinner/a64/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/a64/__init__.py new file mode 100644 index 0000000..18e8421 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/allwinner/a64/__init__.py @@ -0,0 +1 @@ +"""Definition for the AllWinner A64 chip""" \ No newline at end of file diff --git a/src/adafruit_blinka/microcontroller/allwinner/a64/pin.py b/src/adafruit_blinka/microcontroller/allwinner/a64/pin.py new file mode 100644 index 0000000..0ecf2f2 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/allwinner/a64/pin.py @@ -0,0 +1,65 @@ +from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin + +PB0 = Pin(32) +UART2_TX = PB0 +PB1 = Pin(33) +UART2_RX = PB1 +PB2 = Pin(34) +PB3 = Pin(35) +PB4 = Pin(36) +PB5 = Pin(37) +PB6 = Pin(38) +PB7 = Pin(39) + +PC4 = Pin(68) + +PD0 = Pin(96) +UART3_TX = PD0 +SPI1_CS = PD0 +PD1 = Pin(97) +SPI1_SCLK = PD1 +UART3_RX = PD1 +PD2 = Pin(98) +UART4_TX = PD2 +SPI1_MOSI = PD2 +PD3 = Pin(99) +UART4_RX = PD3 +SPI1_MISO = PD3 +PD4 = Pin(100) +PD5 = Pin(101) +PD6 = Pin(102) + +PE14 = Pin(142) +TWI2_SCL = PE14 +PE15 = Pin(143) +TWI2_SDA = PE15 + +PH2 = Pin(226) +TWI1_SCL = PH2 +PH3 = Pin(227) +TWI1_SDA = PH3 +PH4 = Pin(228) +PH5 = Pin(229) +PH6 = Pin(230) + +PL2 = Pin(354) +PL3 = Pin(355) +PL9 = Pin(361) +PL10 = Pin(362) + +# ordered as i2cId, sclId, sdaId +i2cPorts = ( + (1, TWI1_SCL, TWI1_SDA), + (2, TWI2_SCL, TWI2_SDA) +) + +# ordered as spiId, sckId, mosiId, misoId +spiPorts = ( + (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO), +) +# ordered as uartId, txId, rxId +uartPorts = ( + (2, UART2_TX, UART2_RX), + (3, UART3_TX, UART3_RX), + (4, UART4_TX, UART4_RX), +) diff --git a/src/adafruit_blinka/microcontroller/allwinner/h3/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/h3/__init__.py new file mode 100644 index 0000000..e6b08ac --- /dev/null +++ b/src/adafruit_blinka/microcontroller/allwinner/h3/__init__.py @@ -0,0 +1 @@ +"""Definition for the AllWinner H3 chip""" \ No newline at end of file diff --git a/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h3/pin.py similarity index 82% rename from src/adafruit_blinka/microcontroller/allwinner_h3/pin.py rename to src/adafruit_blinka/microcontroller/allwinner/h3/pin.py index f2ed8c0..7ddf86c 100644 --- a/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py +++ b/src/adafruit_blinka/microcontroller/allwinner/h3/pin.py @@ -55,8 +55,15 @@ PG12 = Pin(204) PG13 = Pin(205) -i2cPorts = ( (0, TWI0_SCL, TWI0_SDA), ) +i2cPorts = ( + (0, TWI0_SCL, TWI0_SDA), +) # ordered as spiId, sckId, mosiId, misoId -spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO), ) +spiPorts = ( + (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), + (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO), +) # ordered as uartId, txId, rxId -uartPorts = ( (3, UART3_TX, UART3_RX), ) +uartPorts = ( + (3, UART3_TX, UART3_RX), +) diff --git a/src/adafruit_blinka/microcontroller/allwinner_h3/__init__.py b/src/adafruit_blinka/microcontroller/allwinner_h3/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/busio.py b/src/busio.py index f396b62..d5ae7c9 100755 --- a/src/busio.py +++ b/src/busio.py @@ -130,7 +130,7 @@ class SPI(Lockable): from adafruit_blinka.microcontroller.am335x.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.ORANGE_PI_PC or board_id == ap_board.ORANGE_PI_R1 or board_id == ap_board.ORANGE_PI_ZERO: - from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin + from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.GIANT_BOARD: from adafruit_blinka.microcontroller.sama5.pin import Pin diff --git a/src/digitalio.py b/src/digitalio.py index bb2a48e..5dc7daf 100755 --- a/src/digitalio.py +++ b/src/digitalio.py @@ -16,7 +16,7 @@ if detector.chip.BCM2XXX: elif detector.chip.AM33XX: from adafruit_blinka.microcontroller.am335x.pin import Pin elif detector.chip.SUN8I: - from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin + from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin elif detector.chip.SAMA5: from adafruit_blinka.microcontroller.sama5.pin import Pin elif detector.chip.T210: diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py index 5d5f094..5bef237 100755 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@ -33,7 +33,7 @@ elif chip_id == ap_chip.BCM2XXX: elif chip_id == ap_chip.AM33XX: from adafruit_blinka.microcontroller.am335x import * elif chip_id == ap_chip.SUN8I: - from adafruit_blinka.microcontroller.allwinner_h3 import * + from adafruit_blinka.microcontroller.allwinner.h3 import * elif chip_id == ap_chip.SAMA5: from adafruit_blinka.microcontroller.sama5 import * elif chip_id == ap_chip.T210: diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py index d1b5b8f..ebe9cba 100755 --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@ -15,7 +15,7 @@ elif chip_id == ap_chip.BCM2XXX: elif chip_id == ap_chip.AM33XX: from adafruit_blinka.microcontroller.am335x.pin import * elif chip_id == ap_chip.SUN8I: - from adafruit_blinka.microcontroller.allwinner_h3.pin import * + from adafruit_blinka.microcontroller.allwinner.h3.pin import * elif chip_id == ap_chip.SAMA5: from adafruit_blinka.microcontroller.sama5.pin import * elif chip_id == ap_chip.T210: