cc10d21d71dc9e9c73342fdfb169964c304cbc81
[oweals/openwrt.git] /
1 From 2b354a7c56f375ba414b9b9c96f160f5749e5e64 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Thu, 1 Dec 2016 18:40:51 +0100
4 Subject: [PATCH 1/6] ARM: BCM5301X: Enable UART by default for BCM4708(1),
5  BCM4709(4) & BCM53012
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 Every device tested so far got UART0 (at 0x18000300) working as serial
11 console. It's most likely part of reference design and all vendors use
12 it that way.
13
14 It seems to be easier to enable it by default and just disable it if we
15 ever see a device with different hardware design.
16
17 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
18 Acked-by: Jon Mason <jon.mason@broadcom.com>
19 Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
20 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
21 ---
22  arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  | 4 ----
23  arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts       | 4 ----
24  arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts       | 4 ----
25  arch/arm/boot/dts/bcm4708-netgear-r6250.dts        | 4 ----
26  arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts      | 4 ----
27  arch/arm/boot/dts/bcm4708.dtsi                     | 4 ++++
28  arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 ----
29  arch/arm/boot/dts/bcm47081.dtsi                    | 4 ++++
30  arch/arm/boot/dts/bcm4709-netgear-r7000.dts        | 4 ----
31  arch/arm/boot/dts/bcm4709-netgear-r8000.dts        | 4 ----
32  arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 4 ----
33  arch/arm/boot/dts/bcm4709.dtsi                     | 1 +
34  arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts      | 4 ----
35  arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts      | 4 ----
36  arch/arm/boot/dts/bcm47094-netgear-r8500.dts       | 4 ----
37  arch/arm/boot/dts/bcm47094.dtsi                    | 1 +
38  arch/arm/boot/dts/bcm94708.dts                     | 4 ----
39  arch/arm/boot/dts/bcm94709.dts                     | 4 ----
40  arch/arm/boot/dts/bcm953012er.dts                  | 4 ----
41  arch/arm/boot/dts/bcm953012k.dts                   | 1 -
42  20 files changed, 10 insertions(+), 61 deletions(-)
43
44 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
45 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
46 @@ -136,10 +136,6 @@
47         };
48  };
49  
50 -&uart0 {
51 -       status = "okay";
52 -};
53 -
54  &usb2 {
55         vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
56  };
57 --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
58 +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
59 @@ -55,10 +55,6 @@
60         };
61  };
62  
63 -&uart0 {
64 -       status = "okay";
65 -};
66 -
67  &spi_nor {
68         status = "okay";
69  };
70 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
71 +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
72 @@ -56,10 +56,6 @@
73         };
74  };
75  
76 -&uart0 {
77 -       status = "okay";
78 -};
79 -
80  &spi_nor {
81         status = "okay";
82  };
83 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
84 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
85 @@ -83,10 +83,6 @@
86         };
87  };
88  
89 -&uart0 {
90 -       status = "okay";
91 -};
92 -
93  &usb3 {
94         vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
95  };
96 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
97 +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
98 @@ -119,10 +119,6 @@
99         };
100  };
101  
102 -&uart0 {
103 -       status = "okay";
104 -};
105 -
106  &spi_nor {
107         status = "okay";
108  };
109 --- a/arch/arm/boot/dts/bcm4708.dtsi
110 +++ b/arch/arm/boot/dts/bcm4708.dtsi
111 @@ -34,3 +34,7 @@
112         };
113  
114  };
115 +
116 +&uart0 {
117 +       status = "okay";
118 +};
119 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
120 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
121 @@ -122,7 +122,3 @@
122                 };
123         };
124  };
125 -
126 -&uart0 {
127 -       status = "okay";
128 -};
129 --- a/arch/arm/boot/dts/bcm47081.dtsi
130 +++ b/arch/arm/boot/dts/bcm47081.dtsi
131 @@ -24,3 +24,7 @@
132                 };
133         };
134  };
135 +
136 +&uart0 {
137 +       status = "okay";
138 +};
139 --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
140 +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
141 @@ -100,7 +100,3 @@
142                 };
143         };
144  };
145 -
146 -&uart0 {
147 -       status = "okay";
148 -};
149 --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
150 +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
151 @@ -107,10 +107,6 @@
152         };
153  };
154  
155 -&uart0 {
156 -       status = "okay";
157 -};
158 -
159  &usb2 {
160         vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
161  };
162 --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
163 +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
164 @@ -97,10 +97,6 @@
165         };
166  };
167  
168 -&uart0 {
169 -       status = "okay";
170 -};
171 -
172  &usb2 {
173         vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
174  };
175 --- a/arch/arm/boot/dts/bcm4709.dtsi
176 +++ b/arch/arm/boot/dts/bcm4709.dtsi
177 @@ -8,4 +8,5 @@
178  
179  &uart0 {
180         clock-frequency = <125000000>;
181 +       status = "okay";
182  };
183 --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
184 +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
185 @@ -105,10 +105,6 @@
186         };
187  };
188  
189 -&uart0 {
190 -       status = "okay";
191 -};
192 -
193  &usb3 {
194         vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
195  };
196 --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
197 +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
198 @@ -98,10 +98,6 @@
199         };
200  };
201  
202 -&uart0 {
203 -       status = "okay";
204 -};
205 -
206  &usb3 {
207         vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
208  };
209 --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
210 +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
211 @@ -97,7 +97,3 @@
212                 };
213         };
214  };
215 -
216 -&uart0 {
217 -       status = "okay";
218 -};
219 --- a/arch/arm/boot/dts/bcm47094.dtsi
220 +++ b/arch/arm/boot/dts/bcm47094.dtsi
221 @@ -14,4 +14,5 @@
222  
223  &uart0 {
224         clock-frequency = <125000000>;
225 +       status = "okay";
226  };
227 --- a/arch/arm/boot/dts/bcm94708.dts
228 +++ b/arch/arm/boot/dts/bcm94708.dts
229 @@ -50,7 +50,3 @@
230                 reg = <0x00000000 0x08000000>;
231         };
232  };
233 -
234 -&uart0 {
235 -       status = "okay";
236 -};
237 --- a/arch/arm/boot/dts/bcm94709.dts
238 +++ b/arch/arm/boot/dts/bcm94709.dts
239 @@ -50,7 +50,3 @@
240                 reg = <0x00000000 0x08000000>;
241         };
242  };
243 -
244 -&uart0 {
245 -       status = "okay";
246 -};
247 --- a/arch/arm/boot/dts/bcm953012er.dts
248 +++ b/arch/arm/boot/dts/bcm953012er.dts
249 @@ -70,10 +70,6 @@
250         };
251  };
252  
253 -&uart0 {
254 -       status = "okay";
255 -};
256 -
257  &spi_nor {
258         status = "okay";
259  };
260 --- a/arch/arm/boot/dts/bcm953012k.dts
261 +++ b/arch/arm/boot/dts/bcm953012k.dts
262 @@ -54,7 +54,6 @@
263  
264  &uart0 {
265         clock-frequency = <62499840>;
266 -       status = "okay";
267  };
268  
269  &uart1 {