summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/lpc32xx.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 15:29:18 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-15 15:30:32 +0100
commit2a434f2471fdd4b27856bb857d6bd548406a80f3 (patch)
tree2e9e5e957bd53be2d5467e133efc7f56def984f7 /arch/arm/boot/dts/lpc32xx.dtsi
parentMerge tag 'arm-soc/for-5.1/devicetree-arm64' of https://github.com/Broadcom/s... (diff)
parentARM: dts: lpc32xx: ea3250: beautify gpio keys children nodes (diff)
downloadlinux-2a434f2471fdd4b27856bb857d6bd548406a80f3.tar.xz
linux-2a434f2471fdd4b27856bb857d6bd548406a80f3.zip
Merge tag 'lpc32xx-dt-for-5.1' of https://github.com/vzapolskiy/linux-lpc32xx into arm/dt
ARM: lpc32xx: devicetree updates for v5.1 Here are the changes for ARM NXP LPC32xx and ARM NXP LPC18xx/LPC43xx devicetree files: * added dts file for MYIR Tech MYD-LPC4357 development board, * two missing properties are added to LPC32xx keypad controller device tree node, this fixes a long-standing problem with its initialization, * LPC32xx PL11x LCD controller device node got corrected properties, which allows to use it with a new PL11x DRM driver, * output voltage level on one of Phytec phyCORE-LPC3250 fixed regulators is corrected, the fix is needed to remove duplicating platform data, * Phytec phyCORE-LPC3250 board gets a description of a kit LCD panel, this completes setup of CLCD device tree node for the board, * added unit addresses to memory device nodes on EA and Phytec boards, * fixes of ordinary warnings in dts formatting like leading zeroes, unused address and size cell properties and so on. * tag 'lpc32xx-dt-for-5.1' of https://github.com/vzapolskiy/linux-lpc32xx: ARM: dts: lpc32xx: ea3250: beautify gpio keys children nodes ARM: dts: lpc32xx: ea3250: add unit address to memory device node ARM: dts: lpc32xx: phy3250: add unit address to memory device node ARM: dts: lpc32xx: phy3250: setup LCD controller to panel interface ARM: dts: lpc32xx: phy3250: remove regulators umbrella device node ARM: dts: lpc32xx: phy3250: fix SD card regulator voltage ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller clocks property ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller variant ARM: dts: lpc32xx: reparent keypad controller to SIC1 ARM: dts: lpc32xx: add required clocks property to keypad device node ARM: dts: Add DT for MYIR Tech MYD-LPC4357 Development Board ARM: dts: lpc32xx: Remove leading 0x and 0s from bindings notation ARM: dts: lpc435x: remove address and size cells from gpio-keys-polled nodes Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/lpc32xx.dtsi')
-rw-r--r--arch/arm/boot/dts/lpc32xx.dtsi28
1 files changed, 15 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi
index 44b468e4c37a..20b38f4ade37 100644
--- a/arch/arm/boot/dts/lpc32xx.dtsi
+++ b/arch/arm/boot/dts/lpc32xx.dtsi
@@ -139,11 +139,11 @@
};
clcd: clcd@31040000 {
- compatible = "arm,pl110", "arm,primecell";
+ compatible = "arm,pl111", "arm,primecell";
reg = <0x31040000 0x1000>;
interrupts = <14 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clk LPC32XX_CLK_LCD>;
- clock-names = "apb_pclk";
+ clocks = <&clk LPC32XX_CLK_LCD>, <&clk LPC32XX_CLK_LCD>;
+ clock-names = "clcdclk", "apb_pclk";
status = "disabled";
};
@@ -230,7 +230,7 @@
status = "disabled";
};
- i2s1: i2s@2009C000 {
+ i2s1: i2s@2009c000 {
compatible = "nxp,lpc3220-i2s";
reg = <0x2009C000 0x1000>;
};
@@ -273,7 +273,7 @@
status = "disabled";
};
- i2c1: i2c@400A0000 {
+ i2c1: i2c@400a0000 {
compatible = "nxp,pnx-i2c";
reg = <0x400A0000 0x100>;
interrupt-parent = <&sic1>;
@@ -284,7 +284,7 @@
clocks = <&clk LPC32XX_CLK_I2C1>;
};
- i2c2: i2c@400A8000 {
+ i2c2: i2c@400a8000 {
compatible = "nxp,pnx-i2c";
reg = <0x400A8000 0x100>;
interrupt-parent = <&sic1>;
@@ -295,7 +295,7 @@
clocks = <&clk LPC32XX_CLK_I2C2>;
};
- mpwm: mpwm@400E8000 {
+ mpwm: mpwm@400e8000 {
compatible = "nxp,lpc3220-motor-pwm";
reg = <0x400E8000 0x78>;
status = "disabled";
@@ -394,7 +394,7 @@
#gpio-cells = <3>; /* bank, pin, flags */
};
- timer4: timer@4002C000 {
+ timer4: timer@4002c000 {
compatible = "nxp,lpc3220-timer";
reg = <0x4002C000 0x1000>;
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
@@ -412,7 +412,7 @@
status = "disabled";
};
- watchdog: watchdog@4003C000 {
+ watchdog: watchdog@4003c000 {
compatible = "nxp,pnx4008-wdt";
reg = <0x4003C000 0x1000>;
clocks = <&clk LPC32XX_CLK_WDOG>;
@@ -451,7 +451,7 @@
status = "disabled";
};
- timer1: timer@4004C000 {
+ timer1: timer@4004c000 {
compatible = "nxp,lpc3220-timer";
reg = <0x4004C000 0x1000>;
interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
@@ -462,7 +462,9 @@
key: key@40050000 {
compatible = "nxp,lpc3220-key";
reg = <0x40050000 0x1000>;
- interrupts = <54 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk LPC32XX_CLK_KEY>;
+ interrupt-parent = <&sic1>;
+ interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
@@ -475,7 +477,7 @@
status = "disabled";
};
- pwm1: pwm@4005C000 {
+ pwm1: pwm@4005c000 {
compatible = "nxp,lpc3220-pwm";
reg = <0x4005C000 0x4>;
clocks = <&clk LPC32XX_CLK_PWM1>;
@@ -484,7 +486,7 @@
status = "disabled";
};
- pwm2: pwm@4005C004 {
+ pwm2: pwm@4005c004 {
compatible = "nxp,lpc3220-pwm";
reg = <0x4005C004 0x4>;
clocks = <&clk LPC32XX_CLK_PWM2>;