aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/lpc3250-ea3250.dts1
-rw-r--r--arch/arm/boot/dts/lpc3250-phy3250.dts3
-rw-r--r--arch/arm/boot/dts/lpc32xx.dtsi38
3 files changed, 24 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/lpc3250-ea3250.dts b/arch/arm/boot/dts/lpc3250-ea3250.dts
index f46a11827ef6..4adf4c96f798 100644
--- a/arch/arm/boot/dts/lpc3250-ea3250.dts
+++ b/arch/arm/boot/dts/lpc3250-ea3250.dts
@@ -201,6 +201,7 @@
201&mac { 201&mac {
202 phy-mode = "rmii"; 202 phy-mode = "rmii";
203 use-iram; 203 use-iram;
204 status = "okay";
204}; 205};
205 206
206/* Here, choose exactly one from: ohci, usbd */ 207/* Here, choose exactly one from: ohci, usbd */
diff --git a/arch/arm/boot/dts/lpc3250-phy3250.dts b/arch/arm/boot/dts/lpc3250-phy3250.dts
index ebd19258e22b..1b15f798794b 100644
--- a/arch/arm/boot/dts/lpc3250-phy3250.dts
+++ b/arch/arm/boot/dts/lpc3250-phy3250.dts
@@ -134,6 +134,7 @@
134&mac { 134&mac {
135 phy-mode = "rmii"; 135 phy-mode = "rmii";
136 use-iram; 136 use-iram;
137 status = "okay";
137}; 138};
138 139
139/* Here, choose exactly one from: ohci, usbd */ 140/* Here, choose exactly one from: ohci, usbd */
@@ -201,8 +202,6 @@
201}; 202};
202 203
203&ssp0 { 204&ssp0 {
204 #address-cells = <1>;
205 #size-cells = <0>;
206 num-cs = <1>; 205 num-cs = <1>;
207 cs-gpios = <&gpio 3 5 0>; 206 cs-gpios = <&gpio 3 5 0>;
208 status = "okay"; 207 status = "okay";
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi
index 20b38f4ade37..7b7ec7b1217b 100644
--- a/arch/arm/boot/dts/lpc32xx.dtsi
+++ b/arch/arm/boot/dts/lpc32xx.dtsi
@@ -1,14 +1,9 @@
1// SPDX-License-Identifier: GPL-2.0+
1/* 2/*
2 * NXP LPC32xx SoC 3 * NXP LPC32xx SoC
3 * 4 *
5 * Copyright (C) 2015-2019 Vladimir Zapolskiy <vz@mleia.com>
4 * Copyright 2012 Roland Stigge <stigge@antcom.de> 6 * Copyright 2012 Roland Stigge <stigge@antcom.de>
5 *
6 * The code contained herein is licensed under the GNU General Public
7 * License. You may obtain a copy of the GNU General Public License
8 * Version 2 or later at the following locations:
9 *
10 * http://www.opensource.org/licenses/gpl-license.html
11 * http://www.gnu.org/copyleft/gpl.html
12 */ 7 */
13 8
14#include <dt-bindings/clock/lpc32xx-clock.h> 9#include <dt-bindings/clock/lpc32xx-clock.h>
@@ -152,6 +147,7 @@
152 reg = <0x31060000 0x1000>; 147 reg = <0x31060000 0x1000>;
153 interrupts = <29 IRQ_TYPE_LEVEL_HIGH>; 148 interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;
154 clocks = <&clk LPC32XX_CLK_MAC>; 149 clocks = <&clk LPC32XX_CLK_MAC>;
150 status = "disabled";
155 }; 151 };
156 152
157 emc: memory-controller@31080000 { 153 emc: memory-controller@31080000 {
@@ -185,6 +181,8 @@
185 interrupts = <20 IRQ_TYPE_LEVEL_HIGH>; 181 interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
186 clocks = <&clk LPC32XX_CLK_SSP0>; 182 clocks = <&clk LPC32XX_CLK_SSP0>;
187 clock-names = "apb_pclk"; 183 clock-names = "apb_pclk";
184 #address-cells = <1>;
185 #size-cells = <0>;
188 status = "disabled"; 186 status = "disabled";
189 }; 187 };
190 188
@@ -192,6 +190,8 @@
192 compatible = "nxp,lpc3220-spi"; 190 compatible = "nxp,lpc3220-spi";
193 reg = <0x20088000 0x1000>; 191 reg = <0x20088000 0x1000>;
194 clocks = <&clk LPC32XX_CLK_SPI1>; 192 clocks = <&clk LPC32XX_CLK_SPI1>;
193 #address-cells = <1>;
194 #size-cells = <0>;
195 status = "disabled"; 195 status = "disabled";
196 }; 196 };
197 197
@@ -205,6 +205,8 @@
205 interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; 205 interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;
206 clocks = <&clk LPC32XX_CLK_SSP1>; 206 clocks = <&clk LPC32XX_CLK_SSP1>;
207 clock-names = "apb_pclk"; 207 clock-names = "apb_pclk";
208 #address-cells = <1>;
209 #size-cells = <0>;
208 status = "disabled"; 210 status = "disabled";
209 }; 211 };
210 212
@@ -212,12 +214,15 @@
212 compatible = "nxp,lpc3220-spi"; 214 compatible = "nxp,lpc3220-spi";
213 reg = <0x20090000 0x1000>; 215 reg = <0x20090000 0x1000>;
214 clocks = <&clk LPC32XX_CLK_SPI2>; 216 clocks = <&clk LPC32XX_CLK_SPI2>;
217 #address-cells = <1>;
218 #size-cells = <0>;
215 status = "disabled"; 219 status = "disabled";
216 }; 220 };
217 221
218 i2s0: i2s@20094000 { 222 i2s0: i2s@20094000 {
219 compatible = "nxp,lpc3220-i2s"; 223 compatible = "nxp,lpc3220-i2s";
220 reg = <0x20094000 0x1000>; 224 reg = <0x20094000 0x1000>;
225 status = "disabled";
221 }; 226 };
222 227
223 sd: sd@20098000 { 228 sd: sd@20098000 {
@@ -232,7 +237,8 @@
232 237
233 i2s1: i2s@2009c000 { 238 i2s1: i2s@2009c000 {
234 compatible = "nxp,lpc3220-i2s"; 239 compatible = "nxp,lpc3220-i2s";
235 reg = <0x2009C000 0x1000>; 240 reg = <0x2009c000 0x1000>;
241 status = "disabled";
236 }; 242 };
237 243
238 /* UART5 first since it is the default console, ttyS0 */ 244 /* UART5 first since it is the default console, ttyS0 */
@@ -275,7 +281,7 @@
275 281
276 i2c1: i2c@400a0000 { 282 i2c1: i2c@400a0000 {
277 compatible = "nxp,pnx-i2c"; 283 compatible = "nxp,pnx-i2c";
278 reg = <0x400A0000 0x100>; 284 reg = <0x400a0000 0x100>;
279 interrupt-parent = <&sic1>; 285 interrupt-parent = <&sic1>;
280 interrupts = <19 IRQ_TYPE_LEVEL_LOW>; 286 interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
281 #address-cells = <1>; 287 #address-cells = <1>;
@@ -286,7 +292,7 @@
286 292
287 i2c2: i2c@400a8000 { 293 i2c2: i2c@400a8000 {
288 compatible = "nxp,pnx-i2c"; 294 compatible = "nxp,pnx-i2c";
289 reg = <0x400A8000 0x100>; 295 reg = <0x400a8000 0x100>;
290 interrupt-parent = <&sic1>; 296 interrupt-parent = <&sic1>;
291 interrupts = <18 IRQ_TYPE_LEVEL_LOW>; 297 interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
292 #address-cells = <1>; 298 #address-cells = <1>;
@@ -297,7 +303,7 @@
297 303
298 mpwm: mpwm@400e8000 { 304 mpwm: mpwm@400e8000 {
299 compatible = "nxp,lpc3220-motor-pwm"; 305 compatible = "nxp,lpc3220-motor-pwm";
300 reg = <0x400E8000 0x78>; 306 reg = <0x400e8000 0x78>;
301 status = "disabled"; 307 status = "disabled";
302 #pwm-cells = <2>; 308 #pwm-cells = <2>;
303 }; 309 };
@@ -396,7 +402,7 @@
396 402
397 timer4: timer@4002c000 { 403 timer4: timer@4002c000 {
398 compatible = "nxp,lpc3220-timer"; 404 compatible = "nxp,lpc3220-timer";
399 reg = <0x4002C000 0x1000>; 405 reg = <0x4002c000 0x1000>;
400 interrupts = <3 IRQ_TYPE_LEVEL_LOW>; 406 interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
401 clocks = <&clk LPC32XX_CLK_TIMER4>; 407 clocks = <&clk LPC32XX_CLK_TIMER4>;
402 clock-names = "timerclk"; 408 clock-names = "timerclk";
@@ -414,7 +420,7 @@
414 420
415 watchdog: watchdog@4003c000 { 421 watchdog: watchdog@4003c000 {
416 compatible = "nxp,pnx4008-wdt"; 422 compatible = "nxp,pnx4008-wdt";
417 reg = <0x4003C000 0x1000>; 423 reg = <0x4003c000 0x1000>;
418 clocks = <&clk LPC32XX_CLK_WDOG>; 424 clocks = <&clk LPC32XX_CLK_WDOG>;
419 }; 425 };
420 426
@@ -453,7 +459,7 @@
453 459
454 timer1: timer@4004c000 { 460 timer1: timer@4004c000 {
455 compatible = "nxp,lpc3220-timer"; 461 compatible = "nxp,lpc3220-timer";
456 reg = <0x4004C000 0x1000>; 462 reg = <0x4004c000 0x1000>;
457 interrupts = <17 IRQ_TYPE_LEVEL_LOW>; 463 interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
458 clocks = <&clk LPC32XX_CLK_TIMER1>; 464 clocks = <&clk LPC32XX_CLK_TIMER1>;
459 clock-names = "timerclk"; 465 clock-names = "timerclk";
@@ -479,7 +485,7 @@
479 485
480 pwm1: pwm@4005c000 { 486 pwm1: pwm@4005c000 {
481 compatible = "nxp,lpc3220-pwm"; 487 compatible = "nxp,lpc3220-pwm";
482 reg = <0x4005C000 0x4>; 488 reg = <0x4005c000 0x4>;
483 clocks = <&clk LPC32XX_CLK_PWM1>; 489 clocks = <&clk LPC32XX_CLK_PWM1>;
484 assigned-clocks = <&clk LPC32XX_CLK_PWM1>; 490 assigned-clocks = <&clk LPC32XX_CLK_PWM1>;
485 assigned-clock-parents = <&clk LPC32XX_CLK_PERIPH>; 491 assigned-clock-parents = <&clk LPC32XX_CLK_PERIPH>;
@@ -488,7 +494,7 @@
488 494
489 pwm2: pwm@4005c004 { 495 pwm2: pwm@4005c004 {
490 compatible = "nxp,lpc3220-pwm"; 496 compatible = "nxp,lpc3220-pwm";
491 reg = <0x4005C004 0x4>; 497 reg = <0x4005c004 0x4>;
492 clocks = <&clk LPC32XX_CLK_PWM2>; 498 clocks = <&clk LPC32XX_CLK_PWM2>;
493 assigned-clocks = <&clk LPC32XX_CLK_PWM2>; 499 assigned-clocks = <&clk LPC32XX_CLK_PWM2>;
494 assigned-clock-parents = <&clk LPC32XX_CLK_PERIPH>; 500 assigned-clock-parents = <&clk LPC32XX_CLK_PERIPH>;