From: Melissa LeBlanc-Williams Date: Mon, 10 May 2021 21:04:08 +0000 (-0700) Subject: Merge pull request #468 from twa127/master X-Git-Tag: 6.9.0 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/fc2fe5bb3ae61ca7b2cab559b95870daa2d6d1d9?hp=d85d9793819737fb29c6febe9b066f035f77be30 Merge pull request #468 from twa127/master Add Support for Rock Pi E --- diff --git a/src/adafruit_blinka/board/radxa/rockpie.py b/src/adafruit_blinka/board/radxa/rockpie.py new file mode 100644 index 0000000..edb79ed --- /dev/null +++ b/src/adafruit_blinka/board/radxa/rockpie.py @@ -0,0 +1,54 @@ +"""Pin definitions for the Rock Pi E.""" + +from adafruit_blinka.microcontroller.rockchip.rk3328 import pin + +D3 = pin.GPIO3_A4 # /UART1_TX/PIN 100/ +D5 = pin.GPIO3_A6 # /UART1_RX/PIN 102/ +D7 = pin.GPIO1_D4 # /PIN 60/ +D8 = pin.GPIO2_A0 # /UART2_TX/PIN 64/ +D10 = pin.GPIO2_A1 # /UART2_RX/PIN 65/ +D11 = pin.GPIO2_A2 # /PWM_IR/PIN 66/ +D12 = pin.GPIO2_C2 # /PDM_CLK/I2S1_SCLK/PIN 82/ +D13 = pin.GPIO2_A3 # /PIN 67/ +D15 = pin.GPIO0_D3 # /PIN 27/ +D19 = pin.GPIO3_A1 # /SPI0_TXD/PIN 97/ +D21 = pin.GPIO3_A2 # /SPI0_RXD/PIN 98/ +D23 = pin.GPIO3_A0 # /SPI0_CLK/PIN 96/ +D24 = pin.GPIO3_B0 # /SPI0_CSN0/PIN 104/ +D26 = pin.GPIO2_B4 # /PIN 76/ +D27 = pin.GPIO2_A4 # /I2C1_SDAPIN 68/ +D28 = pin.GPIO2_A5 # /I2C1_SCL/PIN 69/ +D29 = pin.GPIO2_C4 # /I2S1_SDIO1/PDM_SDI1/PIN 84/ +D31 = pin.GPIO2_C5 # /I2S1_SDIO2/PDM_SDI2/PIN 85/ +D32 = pin.GPIO2_C0 # /I2S1_LRCK_RX/PIN 80/ +D33 = pin.GPIO2_A6 # /PWM2/PIN 70/ +D35 = pin.GPIO2_C1 # /I2S1_LRCK_TX/PIN 81/ +D36 = pin.GPIO2_B7 # /I2S1_MCLK/PIN 79/ +D37 = pin.GPIO2_C6 # /PDM_SDI3/PIN 86/ +D38 = pin.GPIO2_C3 # /PDM_SDI0/I2S1_SDI/PIN 83/ +D40 = pin.GPIO2_C7 # /PDM_FSYNC/I2S1_SDO/PIN 87/ + +SDA2 = D27 +SCL2 = D28 + +SDA = SDA2 +SCL = SCL2 + +SCLK = D23 +MOSI = D19 +MISO = D21 +CS = D24 +SCK = SCLK + +UART1_TX = D3 +UART2_RX = D5 +UART2_TX = D8 +UART2_RX = D10 + +UART4_TX = D19 +UART4_RX = D21 + +UART_TX = UART2_TX +UART_RX = UART2_RX + +PWM2 = pin.PWM2 diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3328/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3328/pin.py new file mode 100644 index 0000000..a0c8426 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rockchip/rk3328/pin.py @@ -0,0 +1,163 @@ +"""A Pin class for use with Rockchip RK3328.""" + +from adafruit_blinka.microcontroller.generic_linux.sysfs_pin import Pin + +GPIO0_A0 = Pin((0, 0)) +GPIO0_A1 = Pin((0, 1)) +GPIO0_A2 = Pin((0, 2)) +GPIO0_A3 = Pin((0, 3)) +GPIO0_A4 = Pin((0, 4)) +GPIO0_A5 = Pin((0, 5)) +GPIO0_A6 = Pin((0, 6)) +GPIO0_B7 = Pin((0, 7)) +GPIO0_B0 = Pin((0, 8)) +GPIO0_B1 = Pin((0, 9)) +GPIO0_B2 = Pin((0, 10)) +GPIO0_B3 = Pin((0, 11)) +GPIO0_B4 = Pin((0, 12)) +GPIO0_B5 = Pin((0, 13)) +GPIO0_B6 = Pin((0, 14)) +GPIO0_B7 = Pin((0, 15)) +GPIO0_C0 = Pin((0, 16)) +GPIO0_C1 = Pin((0, 17)) +GPIO0_C2 = Pin((0, 18)) +GPIO0_C3 = Pin((0, 19)) +GPIO0_C4 = Pin((0, 20)) +GPIO0_C5 = Pin((0, 21)) +GPIO0_C6 = Pin((0, 22)) +GPIO0_C7 = Pin((0, 23)) +GPIO0_D0 = Pin((0, 24)) +GPIO0_D1 = Pin((0, 25)) +GPIO0_D2 = Pin((0, 26)) +GPIO0_D3 = Pin((0, 27)) +GPIO0_D4 = Pin((0, 28)) +GPIO0_D5 = Pin((0, 29)) +GPIO0_D6 = Pin((0, 30)) +GPIO0_D7 = Pin((0, 31)) + +GPIO1_A0 = Pin((1, 0)) +GPIO1_A1 = Pin((1, 1)) +GPIO1_A2 = Pin((1, 2)) +GPIO1_A3 = Pin((1, 3)) +GPIO1_A4 = Pin((1, 4)) +GPIO1_A5 = Pin((1, 5)) +GPIO1_A6 = Pin((1, 6)) +GPIO1_B7 = Pin((1, 7)) +GPIO1_B0 = Pin((1, 8)) +GPIO1_B1 = Pin((1, 9)) +GPIO1_B2 = Pin((1, 10)) +GPIO1_B3 = Pin((1, 11)) +GPIO1_B4 = Pin((1, 12)) +GPIO1_B5 = Pin((1, 13)) +GPIO1_B6 = Pin((1, 14)) +GPIO1_B7 = Pin((1, 15)) +GPIO1_C0 = Pin((1, 16)) +GPIO1_C1 = Pin((1, 17)) +GPIO1_C2 = Pin((1, 18)) +GPIO1_C3 = Pin((1, 19)) +GPIO1_C4 = Pin((1, 20)) +GPIO1_C5 = Pin((1, 21)) +GPIO1_C6 = Pin((1, 22)) +GPIO1_C7 = Pin((1, 23)) +GPIO1_D0 = Pin((1, 24)) +GPIO1_D1 = Pin((1, 25)) +GPIO1_D2 = Pin((1, 26)) +GPIO1_D3 = Pin((1, 27)) +GPIO1_D4 = Pin((1, 28)) +GPIO1_D5 = Pin((1, 29)) +GPIO1_D6 = Pin((1, 30)) +GPIO1_D7 = Pin((1, 31)) + +GPIO2_A0 = Pin((2, 0)) +GPIO2_A1 = Pin((2, 1)) +GPIO2_A2 = Pin((2, 2)) +GPIO2_A3 = Pin((2, 3)) +GPIO2_A4 = Pin((2, 4)) +GPIO2_A5 = Pin((2, 5)) +GPIO2_A6 = Pin((2, 6)) +GPIO2_B7 = Pin((2, 7)) +GPIO2_B0 = Pin((2, 8)) +GPIO2_B1 = Pin((2, 9)) +GPIO2_B2 = Pin((2, 10)) +GPIO2_B3 = Pin((2, 11)) +GPIO2_B4 = Pin((2, 12)) +GPIO2_B5 = Pin((2, 13)) +GPIO2_B6 = Pin((2, 14)) +GPIO2_B7 = Pin((2, 15)) +GPIO2_C0 = Pin((2, 16)) +GPIO2_C1 = Pin((2, 17)) +GPIO2_C2 = Pin((2, 18)) +GPIO2_C3 = Pin((2, 19)) +GPIO2_C4 = Pin((2, 20)) +GPIO2_C5 = Pin((2, 21)) +GPIO2_C6 = Pin((2, 22)) +GPIO2_C7 = Pin((2, 23)) +GPIO2_D0 = Pin((2, 24)) +GPIO2_D1 = Pin((2, 25)) +GPIO2_D2 = Pin((2, 26)) +GPIO2_D3 = Pin((2, 27)) +GPIO2_D4 = Pin((2, 28)) +GPIO2_D5 = Pin((2, 29)) +GPIO2_D6 = Pin((2, 30)) +GPIO2_D7 = Pin((2, 31)) + +GPIO3_A0 = Pin((3, 0)) +GPIO3_A1 = Pin((3, 1)) +GPIO3_A2 = Pin((3, 2)) +GPIO3_A3 = Pin((3, 3)) +GPIO3_A4 = Pin((3, 4)) +GPIO3_A5 = Pin((3, 5)) +GPIO3_A6 = Pin((3, 6)) +GPIO3_B7 = Pin((3, 7)) +GPIO3_B0 = Pin((3, 8)) +GPIO3_B1 = Pin((3, 9)) +GPIO3_B2 = Pin((3, 10)) +GPIO3_B3 = Pin((3, 11)) +GPIO3_B4 = Pin((3, 12)) +GPIO3_B5 = Pin((3, 13)) +GPIO3_B6 = Pin((3, 14)) +GPIO3_B7 = Pin((3, 15)) +GPIO3_C0 = Pin((3, 16)) +GPIO3_C1 = Pin((3, 17)) +GPIO3_C2 = Pin((3, 18)) +GPIO3_C3 = Pin((3, 19)) +GPIO3_C4 = Pin((3, 20)) +GPIO3_C5 = Pin((3, 21)) +GPIO3_C6 = Pin((3, 22)) +GPIO3_C7 = Pin((3, 23)) +GPIO3_D0 = Pin((3, 24)) +GPIO3_D1 = Pin((3, 25)) +GPIO3_D2 = Pin((3, 26)) +GPIO3_D3 = Pin((3, 27)) +GPIO3_D4 = Pin((3, 28)) +GPIO3_D5 = Pin((3, 29)) +GPIO3_D6 = Pin((3, 30)) +GPIO3_D7 = Pin((3, 31)) + +# I2C +I2C1_SDA = GPIO2_A4 +I2C1_SCL = GPIO2_A5 + +# SPI +SPI0_CS = GPIO3_B0 +SPI0_SCLK = GPIO3_A0 +SPI0_MISO = GPIO3_A2 +SPI0_MOSI = GPIO3_A1 + +# UART +UART1_TX = GPIO3_A4 +UART1_RX = GPIO3_A6 +UART2_TX = GPIO2_A0 +UART2_RX = GPIO2_A1 + +# PWM +PWM2 = GPIO2_A6 + +# ordered as i2cId, SCL, SDA +i2cPorts = ((0, I2C1_SCL, I2C1_SDA),) + +# ordered as spiId, sckId, mosiId, misoId +spiPorts = ((0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO),) + +# SysFS pwm outputs, pwm channel and pin in first tuple +pwmOuts = (((2, 0), PWM2),) diff --git a/src/board.py b/src/board.py index c8eed9e..c2469cc 100755 --- a/src/board.py +++ b/src/board.py @@ -200,6 +200,9 @@ elif board_id == ap_board.ROCK_PI_S: elif board_id == ap_board.ROCK_PI_4: from adafruit_blinka.board.radxa.rockpi4 import * +elif board_id == ap_board.ROCK_PI_E: + from adafruit_blinka.board.radxa.rockpie import * + elif board_id == ap_board.UDOO_X86: from adafruit_blinka.board.udoo_x86ultra import * diff --git a/src/busio.py b/src/busio.py index b02311e..c599afa 100755 --- a/src/busio.py +++ b/src/busio.py @@ -261,6 +261,8 @@ class SPI(Lockable): from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.ROCK_PI_4: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI + elif detector.board.ROCK_PI_E: + from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.SIFIVE_UNLEASHED: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.ftdi_ft232h: diff --git a/src/digitalio.py b/src/digitalio.py index 7b4ea8f..c08c6b4 100755 --- a/src/digitalio.py +++ b/src/digitalio.py @@ -53,6 +53,8 @@ elif detector.chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308.pin import Pin elif detector.chip.RK3399: from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin +elif detector.chip.RK3328: + from adafruit_blinka.microcontroller.rockchip.rk3328.pin import Pin elif detector.board.ftdi_ft232h: from adafruit_blinka.microcontroller.ft232h.pin import Pin elif detector.board.binho_nova: diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py index 1855a35..254d50a 100755 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@ -85,6 +85,8 @@ elif chip_id == ap_chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308.pin import * elif chip_id == ap_chip.RK3399: from adafruit_blinka.microcontroller.rockchip.rk3399.pin import * +elif chip_id == ap_chip.RK3328: + from adafruit_blinka.microcontroller.rockchip.rk3328.pin import * elif chip_id == ap_chip.H5: from adafruit_blinka.microcontroller.allwinner.h5.pin import * elif chip_id == ap_chip.IMX8MX: diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py index 2966087..3483624 100755 --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@ -66,6 +66,8 @@ elif chip_id == ap_chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308.pin import * elif chip_id == ap_chip.RK3399: from adafruit_blinka.microcontroller.rockchip.rk3399.pin import * +elif chip_id == ap_chip.RK3328: + from adafruit_blinka.microcontroller.rockchip.rk3328.pin import * elif chip_id == ap_chip.MIPS24KC: from adafruit_blinka.microcontroller.atheros.ar9331.pin import * elif chip_id == ap_chip.MIPS24KEC: