Merge pull request #397 from makermelissa/master

Add BeagleBone AI Support

diff --git a/src/adafruit_blinka/board/beagleboard/beaglebone_ai.py b/src/adafruit_blinka/board/beagleboard/beaglebone_ai.py
new file mode 100644 (file)
index 0000000..d88111f
--- /dev/null
+++ b/src/adafruit_blinka/board/beagleboard/beaglebone_ai.py
@@ -0,0 +1,140 @@
+"""Pin definitions for the Beaglebone Black."""
+from adafruit_blinka.microcontroller.dra74x import pin
+
+# initial pins, to mimic bonescript demo
+# BeagleBone Black
+# P8_1 = DGND        # DGND
+# P8_2 = DGND        # DGND
+P8_3 = pin.P8_3  # GPIO1_6 - GPIO_38
+P8_4 = pin.P8_4  # GPIO1_7 - GPIO_39
+P8_5 = pin.P8_5  # GPIO1_2 - GPIO_34
+P8_6 = pin.P8_6  # GPIO1_3 - GPIO_35
+P8_7 = pin.P8_7  # TIMER4 - GPIO_66
+P8_8 = pin.P8_8  # TIMER7 - GPIO_67
+P8_9 = pin.P8_9  # TIMER5 - GPIO_69
+P8_10 = pin.P8_10  # TIMER6 - GPIO_68
+P8_11 = pin.P8_11  # GPIO1_13 - GPIO_45
+P8_12 = pin.P8_12  # GPIO1_12 - GPIO_44
+P8_13 = pin.P8_13  # EHRPWM2B - GPIO_23
+P8_14 = pin.P8_14  # GPIO0_26 - GPIO_26
+P8_15 = pin.P8_15  # GPIO1_15 - GPIO_47
+P8_16 = pin.P8_16  # GPIO1_14 - GPIO_46
+P8_17 = pin.P8_17  # GPIO0_27 - GPIO_27
+P8_18 = pin.P8_18  # GPIO2_1 - GPIO_65
+P8_19 = pin.P8_19  # EHRPWM2A - GPIO_22
+P8_20 = pin.P8_20  # GPIO1_31 - GPIO_63
+P8_21 = pin.P8_21  # GPIO1_30 - GPIO_62
+P8_22 = pin.P8_22  # GPIO1_5 - GPIO_37
+P8_23 = pin.P8_23  # GPIO1_4 - GPIO_36
+P8_24 = pin.P8_24  # GPIO1_1 - GPIO_33
+P8_25 = pin.P8_25  # GPIO1_0 - GPIO_32
+P8_26 = pin.P8_26  # GPIO1_29 - GPIO_61
+P8_27 = pin.P8_27  # GPIO2_22 - GPIO_86
+P8_28 = pin.P8_28  # GPIO2_24 - GPIO_88
+P8_29 = pin.P8_29  # GPIO2_23 - GPIO_87
+P8_30 = pin.P8_30  # GPIO2_25 - GPIO_89
+P8_31 = pin.P8_31  # UART5_CTSN - GPIO_10
+P8_32 = pin.P8_32  # UART5_RTSN - GPIO_11
+P8_33 = pin.P8_33  # UART4_RTSN - GPIO_9
+P8_34 = pin.P8_34  # UART3_RTSN - GPIO_81
+P8_35 = pin.P8_35  # UART4_CTSN - GPIO_8
+P8_36 = pin.P8_36  # UART3_CTSN - GPIO_80
+P8_37 = pin.P8_37  # UART5_TXD - GPIO_78
+P8_38 = pin.P8_38  # UART5_RXD - GPIO_79
+P8_39 = pin.P8_39  # GPIO2_12 - GPIO_76
+P8_40 = pin.P8_40  # GPIO2_13 - GPIO_77
+P8_41 = pin.P8_41  # GPIO2_10 - GPIO_74
+P8_42 = pin.P8_42  # GPIO2_11 - GPIO_75
+P8_43 = pin.P8_43  # GPIO2_8 - GPIO_72
+P8_44 = pin.P8_44  # GPIO2_9 - GPIO_73
+P8_45 = pin.P8_45  # GPIO2_6 - GPIO_70
+P8_46 = pin.P8_46  # GPIO2_7 - GPIO_71
+
+# P9_1 = DGND        # DGND
+# P9_2 = DGND        # DGND
+# P9_3 = VDD_3V3     # VDD_3V3
+# P9_4 = VDD_3V3     # VDD_3V3
+# P9_5 = VDD_5V      # VDD_5V
+# P9_6 = VDD_5V      # VDD_5V
+# P9_7 = SYS_5V      # SYS_5V
+# P9_8 = SYS_5V      # SYS_5V
+# P9_9 = PWR_BUT     # PWR_BUT
+# P9_10 = SYS_RESETN # SYS_RESETn
+P9_11 = pin.P9_11  # UART4_RXD - GPIO_30
+P9_12 = pin.P9_12  # GPIO1_28 - GPIO_60
+P9_13 = pin.P9_13  # UART4_TXD - GPIO_31
+P9_14 = pin.P9_14  # EHRPWM1A - GPIO_50
+P9_15 = pin.P9_15  # GPIO1_16 - GPIO_48
+P9_16 = pin.P9_16  # EHRPWM1B - GPIO_51
+P9_17 = pin.P9_17  # I2C1_SCL - GPIO_5
+P9_18 = pin.P9_18  # I2C1_SDA - GPIO_4
+P9_19 = pin.P9_19  # I2C2_SCL - GPIO_13
+P9_20 = pin.P9_20  # I2C2_SDA - GPIO_12
+P9_21 = pin.P9_21  # UART2_TXD - GPIO_3
+P9_22 = pin.P9_22  # UART2_RXD - GPIO_2
+P9_23 = pin.P9_23  # GPIO1_17 - GPIO_49
+P9_24 = pin.P9_24  # UART1_TXD - GPIO_15
+P9_25 = pin.P9_25  # GPIO3_21 - GPIO_117
+P9_26 = pin.P9_26  # UART1_RXD - GPIO_14
+P9_27 = pin.P9_27  # GPIO3_19 - GPIO_115
+P9_28 = pin.P9_28  # SPI1_CS0 - GPIO_113
+P9_29 = pin.P9_29  # SPI1_D0 - GPIO_111
+P9_30 = pin.P9_30  # SPI1_D1 - GPIO_112
+P9_31 = pin.P9_31  # SPI1_SCLK - GPIO_110
+# P9_32 = VDD_ADC    # VDD_ADC
+# P9_33 = AIN4       # AIN4
+# P9_34 = GNDA_ADC   # GNDA_ADC
+# P9_35 = AIN6       # AIN6
+# P9_36 = AIN5       # AIN5
+# P9_37 = AIN2       # AIN2
+# P9_38 = AIN3       # AIN3
+# P9_39 = AIN0       # AIN0
+# P9_40 = AIN1       # AIN1
+P9_41 = pin.P9_41  # CLKOUT2 - GPIO_20
+P9_42 = pin.P9_42  # GPIO0_7 - GPIO_7
+# P9_43 = DGND       # DGND
+# P9_44 = DGND       # DGND
+# P9_45 = DGND       # DGND
+# P9_46 = DGND       # DGND
+
+# common to all beagles
+LED_USR0 = pin.USR0
+LED_USR1 = pin.USR1
+LED_USR2 = pin.USR2
+LED_USR3 = pin.USR3
+LED_USR4 = pin.USR4
+
+# I2C and SPI pins from:
+# src/adafruit_blinka/board/raspi_40pin.py
+# SDA = pin.SDA
+# SCL = pin.SCL
+# CE1 = pin.D7
+# CE0 = pin.D8
+# MISO = pin.D9
+# MOSI = pin.D10
+# SCLK = pin.D11
+# SCK = pin.D11
+# TXD = pin.D14
+# RXD = pin.D15
+# MISO_1 = pin.D19
+# MOSI_1 = pin.D20
+# SCLK_1 = pin.D21
+# SCK_1 = pin.D21
+
+SDA = pin.I2C4_SDA  # P9_19
+SCL = pin.I2C4_SCL  # P9_20
+
+# Pins for SPI
+#
+# To enable SPI and an additional I2C port, add the following line to /boot/uEnv.txt:
+#    dtb=am5729-beagleboneai-roboticscape.dtb
+#
+# You can verify the dtb file exists by checking the /boot/dtbs/{kernel_version}/ folder
+#
+CE0 = pin.SPI1_CS0  # P9_28
+CE1 = pin.SPI1_CS1  # P9_42
+MOSI = pin.SPI1_D1  # P9_29
+MISO = pin.SPI1_D0  # P9_30
+SCLK = pin.SPI1_SCLK  # P9_31
+# CircuitPython naming convention for SPI Clock
+SCK = SCLK

diff --git a/src/adafruit_blinka/microcontroller/dra74x/__init__.py b/src/adafruit_blinka/microcontroller/dra74x/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/adafruit_blinka/microcontroller/dra74x/pin.py b/src/adafruit_blinka/microcontroller/dra74x/pin.py
new file mode 100644 (file)
index 0000000..28738c1
--- /dev/null
+++ b/src/adafruit_blinka/microcontroller/dra74x/pin.py
@@ -0,0 +1,185 @@
+"""DRA74x pin names"""
+from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+
+# BeagleBone AI
+# P8_1 = DGND           # DGND
+# P8_2 = DGND           # DGND
+P8_3 = Pin((0, 24))  # GPIO1_24 - GPIO_24
+P8_4 = Pin((0, 25))  # GPIO1_25 - GPIO_25
+P8_5 = Pin((6, 1))  # GPIO7_1 - GPIO_193
+P8_6 = Pin((6, 2))  # GPIO7_2 - GPIO_194
+P8_7 = Pin((5, 5))  # TIMER4 - GPIO_165
+P8_8 = Pin((5, 6))  # TIMER7 - GPIO_166
+P8_9 = Pin((5, 18))  # TIMER5 - GPIO_178
+P8_10 = Pin((5, 4))  # TIMER6 - GPIO_164
+P8_11 = Pin((2, 11))  # GPIO3_11 - GPIO_75
+P8_12 = Pin((2, 10))  # GPIO3_10 - GPIO_74
+P8_13 = Pin((3, 11))  # EHRPWM2B - GPIO_107
+P8_14 = Pin((3, 13))  # GPIO4_13 - GPIO_109
+P8_15 = Pin((3, 3))  # GPIO4_3 - GPIO_99
+P8_16 = Pin((3, 29))  # GPIO4_29 - GPIO_125
+P8_17 = Pin((7, 18))  # GPIO8_18 - GPIO_242
+P8_18 = Pin((3, 9))  # GPIO4_9 - GPIO_105
+P8_19 = Pin((3, 10))  # EHRPWM2A - GPIO_106
+P8_20 = Pin((5, 30))  # GPIO6_30 - GPIO_190
+P8_21 = Pin((5, 29))  # GPIO6_29 - GPIO_189
+P8_22 = Pin((0, 23))  # GPIO1_23 - GPIO_23
+P8_23 = Pin((0, 22))  # GPIO1_22 - GPIO_22
+P8_24 = Pin((6, 0))  # GPIO7_0 - GPIO_192
+P8_25 = Pin((5, 31))  # GPIO6_31 - GPIO_191
+P8_26 = Pin((3, 28))  # GPIO4_28 - GPIO_124
+P8_27 = Pin((3, 23))  # GPIO4_23 - GPIO_119
+P8_28 = Pin((3, 19))  # GPIO4_19 - GPIO_115
+P8_29 = Pin((3, 22))  # GPIO4_22 - GPIO_118
+P8_30 = Pin((3, 20))  # GPIO4_20 - GPIO_116
+P8_31 = Pin((7, 14))  # UART5_CTSN - GPIO_238
+P8_32 = Pin((7, 15))  # UART5_RTSN - GPIO_239
+P8_33 = Pin((7, 13))  # UART4_RTSN - GPIO_237
+P8_34 = Pin((7, 11))  # UART3_RTSN - GPIO_235
+P8_35 = Pin((7, 12))  # UART4_CTSN - GPIO_236
+P8_36 = Pin((7, 10))  # UART3_CTSN - GPIO_234
+P8_37 = Pin((7, 8))  # UART5_TXD - GPIO_232
+P8_38 = Pin((7, 9))  # UART5_RXD - GPIO_233
+P8_39 = Pin((7, 6))  # GPIO8_6 - GPIO_230
+P8_40 = Pin((7, 7))  # GPIO8_7 - GPIO_231
+P8_41 = Pin((7, 4))  # GPIO8_4 - GPIO_228
+P8_42 = Pin((7, 5))  # GPIO8_5 - GPIO_229
+P8_43 = Pin((7, 2))  # GPIO8_2 - GPIO_226
+P8_44 = Pin((7, 3))  # GPIO8_3 - GPIO_227
+P8_45 = Pin((7, 0))  # GPIO8_0 - GPIO_224
+P8_46 = Pin((7, 1))  # GPIO8_1 - GPIO_225
+
+# P9_1 = DGND           # DGND - GPIO_0
+# P9_2 = DGND           # DGND - GPIO_0
+# P9_3 = VDD_3V3        # VDD_3V3 - GPIO_0
+# P9_4 = VDD_3V3        # VDD_3V3 - GPIO_0
+# P9_5 = VDD_5V         # VDD_5V - GPIO_0
+# P9_6 = VDD_5V         # VDD_5V - GPIO_0
+# P9_7 = SYS_5V         # SYS_5V - GPIO_0
+# P9_8 = SYS_5V         # SYS_5V - GPIO_0
+# P9_9 = PWR_BUT        # PWR_BUT - GPIO_0
+# P9_10 = SYS_RESETN    # SYS_RESETn - GPIO_0
+P9_11 = Pin((7, 17))  # UART4_RXD - GPIO_241
+P9_12 = Pin((4, 0))  # GPIO5_0 - GPIO_128
+P9_13 = Pin((5, 12))  # UART4_TXD - GPIO_172
+P9_14 = Pin((3, 25))  # EHRPWM1A - GPIO_121
+P9_15 = Pin((2, 12))  # GPIO3_12 - GPIO_76
+P9_16 = Pin((3, 26))  # EHRPWM1B - GPIO_122
+P9_17 = Pin((6, 17))  # I2C1_SCL - GPIO_209
+P9_18 = Pin((6, 16))  # I2C1_SDA - GPIO_208
+P9_19 = Pin((6, 3))  # I2C2_SCL - GPIO_195
+P9_20 = Pin((6, 4))  # I2C2_SDA - GPIO_196
+P9_21 = Pin((2, 3))  # UART3_TXD - GPIO_67
+P9_22 = Pin((5, 19))  # UART3_RXD - GPIO_179
+P9_23 = Pin((6, 11))  # GPIO7_11 - GPIO_203
+P9_24 = Pin((5, 15))  # UART1_TXD - GPIO_175
+P9_25 = Pin((5, 17))  # GPIO6_17 - GPIO_177
+P9_26 = Pin((5, 14))  # UART1_RXD - GPIO_174
+P9_27 = Pin((3, 15))  # GPIO4_15 - GPIO_111
+P9_28 = Pin((3, 17))  # SPI1_CS0 - GPIO_113
+P9_29 = Pin((4, 11))  # SPI1_D0 - GPIO_139
+P9_30 = Pin((4, 12))  # SPI1_D1 - GPIO_140
+P9_31 = Pin((4, 10))  # SPI1_SCLK - GPIO_138
+# P9_32 = VDD_ADC       # VDD_ADC - GPIO_0
+# P9_33 = AIN4          # AIN4 - GPIO_0
+# P9_34 = GNDA_ADC      # GNDA_ADC - GPIO_0
+# P9_35 = AIN6          # AIN6 - GPIO_0
+# P9_36 = AIN5          # AIN5 - GPIO_0
+# P9_37 = AIN2          # AIN2 - GPIO_0
+# P9_38 = AIN3          # AIN3 - GPIO_0
+# P9_39 = AIN0          # AIN0 - GPIO_0
+# P9_40 = AIN1          # AIN1 - GPIO_0
+P9_41 = Pin((5, 20))  # CLKOUT2 - GPIO_180
+P9_42 = Pin((3, 18))  # GPIO4_18 - GPIO_114
+# P9_43 = DGND          # DGND - GPIO_0
+# P9_44 = DGND          # DGND - GPIO_0
+# P9_45 = DGND          # DGND - GPIO_0
+# P9_46 = DGND          # DGND - GPIO_0
+
+
+##########################################
+# User LEDs
+USR0 = Pin((2, 17))  # USR0 - GPIO3_17
+USR1 = Pin((4, 5))  # USR1 - GPIO5_5
+USR2 = Pin((2, 15))  # USR2 - GPIO3_15
+USR3 = Pin((2, 14))  # USR3 - GPIO3_14
+USR4 = Pin((2, 7))  # USR4 - GPIO3_7
+
+# I2C4
+I2C4_SCL = P9_19  # i2c4_scl
+I2C4_SDA = P9_20  # i2c4_sda
+
+# I2C5
+I2C5_SCL = P9_17  # i2c5_scl
+I2C5_SDA = P9_18  # i2c5_sda
+
+# SPI0
+SPI0_CS0 = P9_17
+SPI0_D1 = P9_18
+SPI0_D0 = P9_21
+SPI0_SCLK = P9_22
+
+# SPI1
+SPI1_CS0 = P9_28
+SPI1_CS1 = P9_42
+SPI1_SCLK = P9_31
+SPI1_D0 = P9_30
+SPI1_D1 = P9_29
+
+# UART0
+UART0_TXD = P8_44
+UART0_RXD = P8_36
+UART0_RTSn = P8_34
+UART0_CTSn = P8_45
+
+# UART3
+UART3_TXD = P9_21
+UART3_RXD = P9_22
+UART3_RTSn = P9_17
+UART3_CTSn = P9_18
+
+# UART5
+UART5_TXD = P9_13
+UART5_RXD = P9_11
+UART5_RTSn = P8_6
+UART5_CTSn = P8_5
+
+# UART8
+UART8_TXD = P8_37
+UART8_RXD = P8_38
+UART8_RTSn = P8_32
+UART8_CTSn = P8_31
+
+# UART10
+UART10_TXD = P9_24
+UART10_RXD = P9_26
+UART10_RTSn = P8_4
+UART10_CTSn = P8_3
+
+# PWM
+TIMER10 = P8_10
+TIMER11 = P8_7
+TIMER12 = P8_8
+TIMER14 = P8_9
+
+# ordered as i2cId, SCL, SDA
+i2cPorts = (
+    (3, I2C4_SCL, I2C4_SDA),  # default config
+    (4, I2C4_SCL, I2C4_SDA),  # roboticscape config
+    (3, I2C5_SCL, I2C5_SDA),  # roboticscape config
+)
+
+# ordered as spiId, sckId, mosiId, misoId
+spiPorts = (
+    (0, SPI0_SCLK, SPI0_D0, SPI0_D1),
+    (1, SPI1_SCLK, SPI1_D1, SPI1_D0),
+)
+
+# ordered as uartId, txId, rxId
+uartPorts = (
+    (0, UART0_TXD, UART0_RXD),
+    (3, UART3_TXD, UART3_RXD),
+    (5, UART5_TXD, UART5_RXD),
+    (8, UART8_TXD, UART8_RXD),
+    (10, UART10_TXD, UART10_RXD),
+)

diff --git a/src/board.py b/src/board.py
index 9f68792e33f17f24ee615e7ee3a6f33d896dccb3..1a4eb3abd1cfa9e4f67058699812ed18d2189f45 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -67,11 +67,16 @@ elif board_id == ap_board.BEAGLEBONE_BLACK_INDUSTRIAL:
 
 elif board_id == ap_board.BEAGLEBONE_GREEN_WIRELESS:
     from adafruit_blinka.board.beagleboard.beaglebone_black import *
+
 elif board_id == ap_board.BEAGLEBONE_BLACK_WIRELESS:
     from adafruit_blinka.board.beagleboard.beaglebone_black import *
+
 elif board_id == ap_board.BEAGLEBONE_POCKETBEAGLE:
     from adafruit_blinka.board.beagleboard.beaglebone_pocketbeagle import *
 
+elif board_id == ap_board.BEAGLEBONE_AI:
+    from adafruit_blinka.board.beagleboard.beaglebone_ai import *
+
 elif board_id == ap_board.ORANGE_PI_PC:
     from adafruit_blinka.board.orangepi.orangepipc import *
 

diff --git a/src/busio.py b/src/busio.py
index 8e61dc2c11ad96fa14c21f70ec20de2cc61eac3e..34b1214fd9c26b49006a3b09122505a8d597c2f7 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -198,6 +198,9 @@ class SPI(Lockable):
         if detector.board.any_raspberry_pi or detector.board.any_raspberry_pi_40_pin:
             from adafruit_blinka.microcontroller.bcm283x.pin import Pin
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+        elif detector.board.BEAGLEBONE_AI:
+            from adafruit_blinka.microcontroller.dra74x.pin import Pin
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif detector.board.any_beaglebone:
             from adafruit_blinka.microcontroller.am335x.pin import Pin
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

diff --git a/src/digitalio.py b/src/digitalio.py
index 0f48807bff36d430718fdcd903dd50b26721be25..82e231c7243bd948c02e4ca601d0b5af8ffc940d 100755 (executable)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -15,6 +15,8 @@ if detector.chip.BCM2XXX:
     from adafruit_blinka.microcontroller.bcm283x.pin import Pin
 elif detector.chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x.pin import Pin
+elif detector.chip.DRA74X:
+    from adafruit_blinka.microcontroller.dra74x.pin import Pin
 elif detector.chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
 elif detector.chip.SAMA5:

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 020b070d78fd6cec2d9017ea94fd5903dbeedc34..df91de45af99973c6ea47cf5b4aa37e8abe150ec 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -38,6 +38,8 @@ elif chip_id == ap_chip.STM32F405:
     from adafruit_blinka.microcontroller.stm32.stm32f405 import *
 elif chip_id == ap_chip.BCM2XXX:
     from adafruit_blinka.microcontroller.bcm283x import *
+elif chip_id == ap_chip.DRA74X:
+    from adafruit_blinka.microcontroller.dra74x.pin import *
 elif chip_id == ap_chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x import *
 elif chip_id == ap_chip.SUN8I:

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 73d9acb07b97b0d93df4a23876d6f78269d354bd..4ac63dd15b9deb192ab1dcf01680c19920969805 100755 (executable)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -12,6 +12,8 @@ elif chip_id == ap_chip.STM32F405:
     from adafruit_blinka.microcontroller.stm32.stm32f405.pin import *
 elif chip_id == ap_chip.BCM2XXX:
     from adafruit_blinka.microcontroller.bcm283x.pin import *
+elif chip_id == ap_chip.DRA74X:
+    from adafruit_blinka.microcontroller.dra74x.pin import *
 elif chip_id == ap_chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x.pin import *
 elif chip_id == ap_chip.SUN8I: