Merge pull request #1005 from makermelissa/libgpiod-fix

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

diff --git a/src/adafruit_blinka/microcontroller/bcm2712/pin.py b/src/adafruit_blinka/microcontroller/bcm2712/pin.py
index 19c88543a8776c8ad61f6838051d48b434d9f3fa..736114f13f408007d23ef73c77fe51c12e6f9d21 100644 (file)
--- a/src/adafruit_blinka/microcontroller/bcm2712/pin.py
+++ b/src/adafruit_blinka/microcontroller/bcm2712/pin.py
@@ -1,86 +1,90 @@
-# SPDX-FileCopyrightText: 2023 Melissa LeBlanc-Williams for Adafruit Industries
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries

 #
 # SPDX-License-Identifier: MIT
 """Broadcom BCM2712 pin names"""
 #
 # SPDX-License-Identifier: MIT
 """Broadcom BCM2712 pin names"""

-from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin

 
 

-# Pi 1B rev1 only?
-D0 = Pin((4, 0))
-D1 = Pin((4, 1))
+# Use lgpio pins for Raspberry Pi 5
+from adafruit_blinka.microcontroller.generic_linux.lgpio_pin import Pin

 
 

-D2 = Pin((4, 2))
-SDA = Pin((4, 2))
-D3 = Pin((4, 3))
-SCL = Pin((4, 3))
+D0 = Pin(0)
+D1 = Pin(1)

 
 

-D4 = Pin((4, 4))
-D5 = Pin((4, 5))
-D6 = Pin((4, 6))
+D2 = Pin(2)
+SDA = Pin(2)
+D3 = Pin(3)
+SCL = Pin(3)

 
 

-D7 = Pin((4, 7))
-CE1 = Pin((4, 7))
-D8 = Pin((4, 8))
-CE0 = Pin((4, 8))
-D9 = Pin((4, 9))
-MISO = Pin((4, 9))
-D10 = Pin((4, 10))
-MOSI = Pin((4, 10))
-D11 = Pin((4, 11))
-SCLK = Pin((4, 11))  # Raspberry Pi naming
-SCK = Pin((4, 11))  # CircuitPython naming
+D4 = Pin(4)
+D5 = Pin(5)
+D6 = Pin(6)

 
 

-D12 = Pin((4, 12))
-D13 = Pin((4, 13))
+D7 = Pin(7)
+CE1 = Pin(7)
+D8 = Pin(8)
+CE0 = Pin(8)
+D9 = Pin(9)
+MISO = Pin(9)
+D10 = Pin(10)
+MOSI = Pin(10)
+D11 = Pin(11)
+SCLK = Pin(11)  # Raspberry Pi naming
+SCK = Pin(11)  # CircuitPython naming

 
 

-D14 = Pin((4, 14))
-TXD = Pin((4, 14))
-D15 = Pin((4, 15))
-RXD = Pin((4, 15))
+D12 = Pin(12)
+D13 = Pin(13)

 
 

-D16 = Pin((4, 16))
-D17 = Pin((4, 17))
-D18 = Pin((4, 18))
-D19 = Pin((4, 19))
-MISO_1 = Pin((4, 19))
-D20 = Pin((4, 20))
-MOSI_1 = Pin((4, 20))
-D21 = Pin((4, 21))
-SCLK_1 = Pin((4, 21))
-SCK_1 = Pin((4, 21))
-D22 = Pin((4, 22))
-D23 = Pin((4, 23))
-D24 = Pin((4, 24))
-D25 = Pin((4, 25))
-D26 = Pin((4, 26))
-D27 = Pin((4, 27))
-D28 = Pin((4, 28))
-D29 = Pin((4, 29))
-D30 = Pin((4, 30))
-D31 = Pin((4, 31))
-D32 = Pin((4, 32))
-D33 = Pin((4, 33))
-D34 = Pin((4, 34))
-D35 = Pin((4, 35))
-D36 = Pin((4, 36))
-D37 = Pin((4, 37))
-D38 = Pin((4, 38))
-D39 = Pin((4, 39))
-D40 = Pin((4, 40))
-MISO_2 = Pin((4, 40))
-D41 = Pin((4, 41))
-MOSI_2 = Pin((4, 41))
-D42 = Pin((4, 42))
-SCLK_2 = Pin((4, 42))
-SCK_2 = Pin((4, 43))
-D43 = Pin((4, 43))
-D44 = Pin((4, 44))
-D45 = Pin((4, 45))
+D14 = Pin(14)
+TXD = Pin(14)
+D15 = Pin(15)
+RXD = Pin(15)
+
+D16 = Pin(16)
+D17 = Pin(17)
+D18 = Pin(18)
+D19 = Pin(19)
+MISO_1 = Pin(19)
+D20 = Pin(20)
+MOSI_1 = Pin(20)
+D21 = Pin(21)
+SCLK_1 = Pin(21)
+SCK_1 = Pin(21)
+D22 = Pin(22)
+D23 = Pin(23)
+D24 = Pin(24)
+D25 = Pin(25)
+D26 = Pin(26)
+D27 = Pin(27)
+D28 = Pin(28)
+D29 = Pin(29)
+D30 = Pin(30)
+D31 = Pin(31)
+D32 = Pin(32)
+D33 = Pin(33)
+D34 = Pin(34)
+D35 = Pin(35)
+D36 = Pin(36)
+D37 = Pin(37)
+D38 = Pin(38)
+D39 = Pin(39)
+D40 = Pin(40)
+MISO_2 = Pin(40)
+D41 = Pin(41)
+MOSI_2 = Pin(41)
+D42 = Pin(42)
+SCLK_2 = Pin(42)
+SCK_2 = Pin(43)
+D43 = Pin(43)
+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),
 
 # 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),
+    (4, D7, D6, D5),
+    (5, D15, D14, D13),

 )
 
 # ordered as uartId, txId, rxId
 )
 
 # ordered as uartId, txId, rxId


@@ -92,4 +96,5 @@ 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

 )
 )