mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
164 lines
3.5 KiB
Diff
164 lines
3.5 KiB
Diff
From b307e988cf350781da56165de027528b5ac1a992 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Fri, 24 Feb 2023 14:53:48 +0000
|
|
Subject: [PATCH] ARM: dts: bcm2711: Add extra serial aliases
|
|
|
|
With UART numbering from DT aliases re-enabled, add aliases for the
|
|
additional BCM2711 UARTs. Also use the opportunity to remove some
|
|
DTS duplication.
|
|
|
|
See: https://forums.raspberrypi.com/viewtopic.php?t=347868
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 19 ------------------
|
|
arch/arm/boot/dts/bcm2711-rpi-400.dts | 19 ------------------
|
|
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 19 ------------------
|
|
arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 15 +++-----------
|
|
arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 27 ++++++++++++++++++++++++++
|
|
5 files changed, 30 insertions(+), 69 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
|
@@ -268,25 +268,6 @@
|
|
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
|
};
|
|
|
|
- aliases {
|
|
- serial0 = &uart1;
|
|
- serial1 = &uart0;
|
|
- mmc0 = &emmc2;
|
|
- mmc1 = &mmcnr;
|
|
- mmc2 = &sdhost;
|
|
- i2c3 = &i2c3;
|
|
- i2c4 = &i2c4;
|
|
- i2c5 = &i2c5;
|
|
- i2c6 = &i2c6;
|
|
- i2c20 = &ddc0;
|
|
- i2c21 = &ddc1;
|
|
- spi3 = &spi3;
|
|
- spi4 = &spi4;
|
|
- spi5 = &spi5;
|
|
- spi6 = &spi6;
|
|
- /delete-property/ intc;
|
|
- };
|
|
-
|
|
/delete-node/ wifi-pwrseq;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
|
@@ -268,25 +268,6 @@
|
|
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
|
};
|
|
|
|
- aliases {
|
|
- serial0 = &uart1;
|
|
- serial1 = &uart0;
|
|
- mmc0 = &emmc2;
|
|
- mmc1 = &mmcnr;
|
|
- mmc2 = &sdhost;
|
|
- i2c3 = &i2c3;
|
|
- i2c4 = &i2c4;
|
|
- i2c5 = &i2c5;
|
|
- i2c6 = &i2c6;
|
|
- i2c20 = &ddc0;
|
|
- i2c21 = &ddc1;
|
|
- spi3 = &spi3;
|
|
- spi4 = &spi4;
|
|
- spi5 = &spi5;
|
|
- spi6 = &spi6;
|
|
- /delete-property/ intc;
|
|
- };
|
|
-
|
|
/delete-node/ wifi-pwrseq;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
|
@@ -277,25 +277,6 @@
|
|
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
|
};
|
|
|
|
- aliases {
|
|
- serial0 = &uart1;
|
|
- serial1 = &uart0;
|
|
- mmc0 = &emmc2;
|
|
- mmc1 = &mmcnr;
|
|
- mmc2 = &sdhost;
|
|
- i2c3 = &i2c3;
|
|
- i2c4 = &i2c4;
|
|
- i2c5 = &i2c5;
|
|
- i2c6 = &i2c6;
|
|
- i2c20 = &ddc0;
|
|
- i2c21 = &ddc1;
|
|
- spi3 = &spi3;
|
|
- spi4 = &spi4;
|
|
- spi5 = &spi5;
|
|
- spi6 = &spi6;
|
|
- /delete-property/ intc;
|
|
- };
|
|
-
|
|
/delete-node/ wifi-pwrseq;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
|
|
@@ -163,18 +163,9 @@
|
|
|
|
aliases {
|
|
serial0 = &uart0;
|
|
- mmc0 = &emmc2;
|
|
- mmc1 = &mmcnr;
|
|
- mmc2 = &sdhost;
|
|
- i2c3 = &i2c3;
|
|
- i2c4 = &i2c4;
|
|
- i2c5 = &i2c5;
|
|
- i2c6 = &i2c6;
|
|
- spi3 = &spi3;
|
|
- spi4 = &spi4;
|
|
- spi5 = &spi5;
|
|
- spi6 = &spi6;
|
|
- /delete-property/ intc;
|
|
+ serial1 = &uart1;
|
|
+ /delete-property/ i2c20;
|
|
+ /delete-property/ i2c21;
|
|
};
|
|
|
|
/delete-node/ wifi-pwrseq;
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
|
|
@@ -26,6 +26,33 @@
|
|
chosen {
|
|
/delete-property/ stdout-path;
|
|
};
|
|
+
|
|
+ aliases {
|
|
+ uart2 = &uart2;
|
|
+ uart3 = &uart3;
|
|
+ uart4 = &uart4;
|
|
+ uart5 = &uart5;
|
|
+ serial0 = &uart1;
|
|
+ serial1 = &uart0;
|
|
+ serial2 = &uart2;
|
|
+ serial3 = &uart3;
|
|
+ serial4 = &uart4;
|
|
+ serial5 = &uart5;
|
|
+ mmc0 = &emmc2;
|
|
+ mmc1 = &mmcnr;
|
|
+ mmc2 = &sdhost;
|
|
+ i2c3 = &i2c3;
|
|
+ i2c4 = &i2c4;
|
|
+ i2c5 = &i2c5;
|
|
+ i2c6 = &i2c6;
|
|
+ i2c20 = &ddc0;
|
|
+ i2c21 = &ddc1;
|
|
+ spi3 = &spi3;
|
|
+ spi4 = &spi4;
|
|
+ spi5 = &spi5;
|
|
+ spi6 = &spi6;
|
|
+ /delete-property/ intc;
|
|
+ };
|
|
};
|
|
|
|
&vc4 {
|