1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
|
From dfc14f5786f1613f398422c7567c7e0cdd60f021 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 {
|
