Fix Incorrect SPI Pin Assignments for Rockpi4

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / microcontroller / bcm283x / pin.py

diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pin.py b/src/adafruit_blinka/microcontroller/bcm283x/pin.py
index dd8abe60e943cf0f3f8dac1ef61f1f1303f81e69..a24ed220dfc72e6cf21fac3752407b5f1e3b5767 100644 (file)
--- a/src/adafruit_blinka/microcontroller/bcm283x/pin.py
+++ b/src/adafruit_blinka/microcontroller/bcm283x/pin.py
@@ -1,6 +1,8 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT

 """Broadcom BCM283x pin names"""
 """Broadcom BCM283x pin names"""

-import RPi.GPIO as GPIO
-from adafruit_blinka.agnostic import detector
+from RPi import GPIO

 
 GPIO.setmode(GPIO.BCM)  # Use BCM pins D4 = GPIO #4
 GPIO.setwarnings(False)  # shh!
 
 GPIO.setmode(GPIO.BCM)  # Use BCM pins D4 = GPIO #4
 GPIO.setwarnings(False)  # shh!


@@ -139,21 +141,11 @@ D44 = Pin(44)
 D45 = Pin(45)
 
 # ordered as spiId, sckId, mosiId, misoId
 D45 = Pin(45)
 
 # ordered as spiId, sckId, mosiId, misoId

-if detector.board.id in ["RASPBERRY_PI_4B", "RASPBERRY_PI_CM4"]:
-    spiPorts = (
-        (0, SCLK, MOSI, MISO),
-        (6, SCLK_1, MOSI_1, MISO_1),
-        (2, SCLK_2, MOSI_2, MISO_2),
-        (3, D3, D2, D1),
-        (4, D7, D6, D5),
-        (5, D15, D14, D13),
-    )
-else:
-    spiPorts = (
-        (0, SCLK, MOSI, MISO),
-        (1, SCLK_1, MOSI_1, MISO_1),
-        (2, SCLK_2, MOSI_2, MISO_2),
-    )
+spiPorts = (
+    (0, SCLK, MOSI, MISO),
+    (1, SCLK_1, MOSI_1, MISO_1),
+    (2, SCLK_2, MOSI_2, MISO_2),
+)

 
 # ordered as uartId, txId, rxId
 uartPorts = ((1, TXD, RXD),)
 
 # ordered as uartId, txId, rxId
 uartPorts = ((1, TXD, RXD),)


@@ -164,5 +156,4 @@ uartPorts = ((1, TXD, RXD),)
 i2cPorts = (
     (1, SCL, SDA),
     (0, D1, D0),  # both pi 1 and pi 2 i2c ports!
 i2cPorts = (
     (1, SCL, SDA),
     (0, D1, D0),  # both pi 1 and pi 2 i2c ports!

-    (10, D45, D44),  # internal i2c bus for the CM4

 )
 )