ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 07:22:33 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
17d8c5825e
openwrt/target/linux/bcm27xx/patches-6.1/950-0706-ARM-dts-bcm2711-rpi-ds-Group-the-common-pins.patch
Álvaro Fernández Rojas 793f8ab62c bcm27xx: 6.1: add kernel patches 
Add kernel patches for version 6.1.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2023-06-09 19:12:30 +02:00

694 lines
14 KiB
Diff
Raw Blame History

From d06fdceb579a5dcdb1bc864ec7ca4f8a94bc3cab Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Tue, 9 May 2023 13:52:39 +0100
Subject: [PATCH] ARM: dts: bcm2711-rpi-ds: Group the common pins
Move common pin group declarations into the shared bcm2711-rpi-ds.dtsi.
No functional change.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 121 -------------------------
arch/arm/boot/dts/bcm2711-rpi-400.dts | 121 -------------------------
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 121 -------------------------
arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 121 -------------------------
arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 121 +++++++++++++++++++++++++
5 files changed, 121 insertions(+), 484 deletions(-)
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -310,103 +310,6 @@
};
&gpio {
- spi0_pins: spi0_pins {
- brcm,pins = <9 10 11>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- spi0_cs_pins: spi0_cs_pins {
- brcm,pins = <8 7>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi3_pins: spi3_pins {
- brcm,pins = <1 2 3>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi3_cs_pins: spi3_cs_pins {
- brcm,pins = <0 24>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi4_pins: spi4_pins {
- brcm,pins = <5 6 7>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi4_cs_pins: spi4_cs_pins {
- brcm,pins = <4 25>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi5_pins: spi5_pins {
- brcm,pins = <13 14 15>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi5_cs_pins: spi5_cs_pins {
- brcm,pins = <12 26>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi6_pins: spi6_pins {
- brcm,pins = <19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi6_cs_pins: spi6_cs_pins {
- brcm,pins = <18 27>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- i2c0_pins: i2c0 {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c1_pins: i2c1 {
- brcm,pins = <2 3>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c3_pins: i2c3 {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c4_pins: i2c4 {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c5_pins: i2c5 {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c6_pins: i2c6 {
- brcm,pins = <22 23>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2s_pins: i2s {
- brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- sdio_pins: sdio_pins {
- brcm,pins = <34 35 36 37 38 39>;
- brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
- brcm,pull = <0 2 2 2 2 2>;
- };
-
bt_pins: bt_pins {
brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
// to fool pinctrl
@@ -431,30 +334,6 @@
brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
brcm,pull = <0 2 2 0>;
};
-
- uart2_pins: uart2_pins {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart3_pins: uart3_pins {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart4_pins: uart4_pins {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart5_pins: uart5_pins {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
};
&i2c0if {
--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
@@ -310,103 +310,6 @@
};
&gpio {
- spi0_pins: spi0_pins {
- brcm,pins = <9 10 11>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- spi0_cs_pins: spi0_cs_pins {
- brcm,pins = <8 7>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi3_pins: spi3_pins {
- brcm,pins = <1 2 3>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi3_cs_pins: spi3_cs_pins {
- brcm,pins = <0 24>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi4_pins: spi4_pins {
- brcm,pins = <5 6 7>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi4_cs_pins: spi4_cs_pins {
- brcm,pins = <4 25>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi5_pins: spi5_pins {
- brcm,pins = <13 14 15>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi5_cs_pins: spi5_cs_pins {
- brcm,pins = <12 26>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi6_pins: spi6_pins {
- brcm,pins = <19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi6_cs_pins: spi6_cs_pins {
- brcm,pins = <18 27>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- i2c0_pins: i2c0 {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c1_pins: i2c1 {
- brcm,pins = <2 3>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c3_pins: i2c3 {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c4_pins: i2c4 {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c5_pins: i2c5 {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c6_pins: i2c6 {
- brcm,pins = <22 23>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2s_pins: i2s {
- brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- sdio_pins: sdio_pins {
- brcm,pins = <34 35 36 37 38 39>;
- brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
- brcm,pull = <0 2 2 2 2 2>;
- };
-
bt_pins: bt_pins {
brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
// to fool pinctrl
@@ -431,30 +334,6 @@
brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
brcm,pull = <0 2 2 0>;
};
-
- uart2_pins: uart2_pins {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart3_pins: uart3_pins {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart4_pins: uart4_pins {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart5_pins: uart5_pins {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
};
&i2c0if {
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
@@ -319,103 +319,6 @@
};
&gpio {
- spi0_pins: spi0_pins {
- brcm,pins = <9 10 11>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- spi0_cs_pins: spi0_cs_pins {
- brcm,pins = <8 7>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi3_pins: spi3_pins {
- brcm,pins = <1 2 3>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi3_cs_pins: spi3_cs_pins {
- brcm,pins = <0 24>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi4_pins: spi4_pins {
- brcm,pins = <5 6 7>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi4_cs_pins: spi4_cs_pins {
- brcm,pins = <4 25>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi5_pins: spi5_pins {
- brcm,pins = <13 14 15>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi5_cs_pins: spi5_cs_pins {
- brcm,pins = <12 26>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi6_pins: spi6_pins {
- brcm,pins = <19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi6_cs_pins: spi6_cs_pins {
- brcm,pins = <18 27>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- i2c0_pins: i2c0 {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c1_pins: i2c1 {
- brcm,pins = <2 3>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c3_pins: i2c3 {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c4_pins: i2c4 {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c5_pins: i2c5 {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c6_pins: i2c6 {
- brcm,pins = <22 23>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2s_pins: i2s {
- brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- sdio_pins: sdio_pins {
- brcm,pins = <34 35 36 37 38 39>;
- brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
- brcm,pull = <0 2 2 2 2 2>;
- };
-
bt_pins: bt_pins {
brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
// to fool pinctrl
@@ -440,30 +343,6 @@
brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
brcm,pull = <0 2 2 0>;
};
-
- uart2_pins: uart2_pins {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart3_pins: uart3_pins {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart4_pins: uart4_pins {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart5_pins: uart5_pins {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
};
&i2c0if {
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
@@ -200,132 +200,11 @@
};
&gpio {
- spi0_pins: spi0_pins {
- brcm,pins = <9 10 11>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- spi0_cs_pins: spi0_cs_pins {
- brcm,pins = <8 7>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi3_pins: spi3_pins {
- brcm,pins = <1 2 3>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi3_cs_pins: spi3_cs_pins {
- brcm,pins = <0 24>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi4_pins: spi4_pins {
- brcm,pins = <5 6 7>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi4_cs_pins: spi4_cs_pins {
- brcm,pins = <4 25>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi5_pins: spi5_pins {
- brcm,pins = <13 14 15>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi5_cs_pins: spi5_cs_pins {
- brcm,pins = <12 26>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- spi6_pins: spi6_pins {
- brcm,pins = <19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT3>;
- };
-
- spi6_cs_pins: spi6_cs_pins {
- brcm,pins = <18 27>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- };
-
- i2c0_pins: i2c0 {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c1_pins: i2c1 {
- brcm,pins = <2 3>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c3_pins: i2c3 {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c4_pins: i2c4 {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c5_pins: i2c5 {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2c6_pins: i2c6 {
- brcm,pins = <22 23>;
- brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>;
- };
-
- i2s_pins: i2s {
- brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
- sdio_pins: sdio_pins {
- brcm,pins = <34 35 36 37 38 39>;
- brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
- brcm,pull = <0 2 2 2 2 2>;
- };
-
uart0_pins: uart0_pins {
brcm,pins;
brcm,function;
brcm,pull;
};
-
- uart2_pins: uart2_pins {
- brcm,pins = <0 1>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart3_pins: uart3_pins {
- brcm,pins = <4 5>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart4_pins: uart4_pins {
- brcm,pins = <8 9>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
-
- uart5_pins: uart5_pins {
- brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT4>;
- brcm,pull = <0 2>;
- };
};
&i2c0if {
--- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
@@ -171,6 +171,127 @@
&gpio {
interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+
+ spi0_pins: spi0_pins {
+ brcm,pins = <9 10 11>;
+ brcm,function = <BCM2835_FSEL_ALT0>;
+ };
+
+ spi0_cs_pins: spi0_cs_pins {
+ brcm,pins = <8 7>;
+ brcm,function = <BCM2835_FSEL_GPIO_OUT>;
+ };
+
+ spi3_pins: spi3_pins {
+ brcm,pins = <1 2 3>;
+ brcm,function = <BCM2835_FSEL_ALT3>;
+ };
+
+ spi3_cs_pins: spi3_cs_pins {
+ brcm,pins = <0 24>;
+ brcm,function = <BCM2835_FSEL_GPIO_OUT>;
+ };
+
+ spi4_pins: spi4_pins {
+ brcm,pins = <5 6 7>;
+ brcm,function = <BCM2835_FSEL_ALT3>;
+ };
+
+ spi4_cs_pins: spi4_cs_pins {
+ brcm,pins = <4 25>;
+ brcm,function = <BCM2835_FSEL_GPIO_OUT>;
+ };
+
+ spi5_pins: spi5_pins {
+ brcm,pins = <13 14 15>;
+ brcm,function = <BCM2835_FSEL_ALT3>;
+ };
+
+ spi5_cs_pins: spi5_cs_pins {
+ brcm,pins = <12 26>;
+ brcm,function = <BCM2835_FSEL_GPIO_OUT>;
+ };
+
+ spi6_pins: spi6_pins {
+ brcm,pins = <19 20 21>;
+ brcm,function = <BCM2835_FSEL_ALT3>;
+ };
+
+ spi6_cs_pins: spi6_cs_pins {
+ brcm,pins = <18 27>;
+ brcm,function = <BCM2835_FSEL_GPIO_OUT>;
+ };
+
+ i2c0_pins: i2c0 {
+ brcm,pins = <0 1>;
+ brcm,function = <BCM2835_FSEL_ALT0>;
+ brcm,pull = <BCM2835_PUD_UP>;
+ };
+
+ i2c1_pins: i2c1 {
+ brcm,pins = <2 3>;
+ brcm,function = <BCM2835_FSEL_ALT0>;
+ brcm,pull = <BCM2835_PUD_UP>;
+ };
+
+ i2c3_pins: i2c3 {
+ brcm,pins = <4 5>;
+ brcm,function = <BCM2835_FSEL_ALT5>;
+ brcm,pull = <BCM2835_PUD_UP>;
+ };
+
+ i2c4_pins: i2c4 {
+ brcm,pins = <8 9>;
+ brcm,function = <BCM2835_FSEL_ALT5>;
+ brcm,pull = <BCM2835_PUD_UP>;
+ };
+
+ i2c5_pins: i2c5 {
+ brcm,pins = <12 13>;
+ brcm,function = <BCM2835_FSEL_ALT5>;
+ brcm,pull = <BCM2835_PUD_UP>;
+ };
+
+ i2c6_pins: i2c6 {
+ brcm,pins = <22 23>;
+ brcm,function = <BCM2835_FSEL_ALT5>;
+ brcm,pull = <BCM2835_PUD_UP>;
+ };
+
+ i2s_pins: i2s {
+ brcm,pins = <18 19 20 21>;
+ brcm,function = <BCM2835_FSEL_ALT0>;
+ };
+
+ sdio_pins: sdio_pins {
+ brcm,pins = <34 35 36 37 38 39>;
+ brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
+ brcm,pull = <0 2 2 2 2 2>;
+ };
+
+ uart2_pins: uart2_pins {
+ brcm,pins = <0 1>;
+ brcm,function = <BCM2835_FSEL_ALT4>;
+ brcm,pull = <0 2>;
+ };
+
+ uart3_pins: uart3_pins {
+ brcm,pins = <4 5>;
+ brcm,function = <BCM2835_FSEL_ALT4>;
+ brcm,pull = <0 2>;
+ };
+
+ uart4_pins: uart4_pins {
+ brcm,pins = <8 9>;
+ brcm,function = <BCM2835_FSEL_ALT4>;
+ brcm,pull = <0 2>;
+ };
+
+ uart5_pins: uart5_pins {
+ brcm,pins = <12 13>;
+ brcm,function = <BCM2835_FSEL_ALT4>;
+ brcm,pull = <0 2>;
+ };
};
&emmc2 {
Reference in New Issue View Git Blame Copy Permalink