From bb9dd9909c672798b9d69c8e3689b2e443c8d936 Mon Sep 17 00:00:00 2001 From: "adam_cummick:g9T51EHpC9gPQqG6sb9Q@gitlab.com" Date: Wed, 20 Oct 2021 09:05:10 -0400 Subject: [PATCH] Split RP4 and CM4 SPI definitions --- .../microcontroller/bcm283x/pin.py | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pin.py b/src/adafruit_blinka/microcontroller/bcm283x/pin.py index 82b8b26..dd8abe6 100644 --- a/src/adafruit_blinka/microcontroller/bcm283x/pin.py +++ b/src/adafruit_blinka/microcontroller/bcm283x/pin.py @@ -1,5 +1,6 @@ """Broadcom BCM283x pin names""" import RPi.GPIO as GPIO +from adafruit_blinka.agnostic import detector GPIO.setmode(GPIO.BCM) # Use BCM pins D4 = GPIO #4 GPIO.setwarnings(False) # shh! @@ -138,14 +139,21 @@ D44 = Pin(44) D45 = Pin(45) # ordered as spiId, sckId, mosiId, misoId -spiPorts = ( - (0, SCLK, MOSI, MISO), - (1, SCLK_1, MOSI_1, MISO_1), - (2, SCLK_2, MOSI_2, MISO_2), - (3, D3, D2, D1), # SPI3 on Pi4/CM4 - (4, D7, D6, D5), # SPI4 on Pi4/CM4 - (5, D15, D14, D13), # SPI5 on Pi4/CM4 -) +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), + ) # ordered as uartId, txId, rxId uartPorts = ((1, TXD, RXD),) -- 2.49.0