Skip to content

L
linux
Commit b715802f authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy
Browse files
Options

arm: dts: lpc32xx: assign interrupt types 

LPC32xx interrupt controller has two cells, instead of zero
specify proper irq types for all consumers.
Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
parent c82e688a
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 29 deletions
arch/arm/boot/dts/lpc32xx.dtsi
View file @ b715802f
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/clock/lpc32xx-clock.h> #include <dt-bindings/clock/lpc32xx-clock.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ { / {
compatible = "nxp,lpc3220"; compatible = "nxp,lpc3220";
...@@ -66,7 +67,7 @@ slc: flash@20020000 { ...@@ -66,7 +67,7 @@ slc: flash@20020000 {
mlc: flash@200a8000 { mlc: flash@200a8000 {
compatible = "nxp,lpc3220-mlc"; compatible = "nxp,lpc3220-mlc";
reg = <0x200a8000 0x11000>; reg = <0x200a8000 0x11000>;
interrupts = <11 0>; interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_MLC>; clocks = <&clk LPC32XX_CLK_MLC>;
status = "disabled"; status = "disabled";
}; };
...@@ -74,7 +75,7 @@ mlc: flash@200a8000 { ...@@ -74,7 +75,7 @@ mlc: flash@200a8000 {
dma: dma@31000000 { dma: dma@31000000 {
compatible = "arm,pl080", "arm,primecell"; compatible = "arm,pl080", "arm,primecell";
reg = <0x31000000 0x1000>; reg = <0x31000000 0x1000>;
interrupts = <0x1c 0>; interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_DMA>; clocks = <&clk LPC32XX_CLK_DMA>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
}; };
...@@ -91,7 +92,7 @@ usb { ...@@ -91,7 +92,7 @@ usb {
ohci: ohci@0 { ohci: ohci@0 {
compatible = "nxp,ohci-nxp", "usb-ohci"; compatible = "nxp,ohci-nxp", "usb-ohci";
reg = <0x0 0x300>; reg = <0x0 0x300>;
interrupts = <0x3b 0>; interrupts = <59 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&usbclk LPC32XX_USB_CLK_HOST>; clocks = <&usbclk LPC32XX_USB_CLK_HOST>;
status = "disabled"; status = "disabled";
}; };
...@@ -99,7 +100,10 @@ ohci: ohci@0 { ...@@ -99,7 +100,10 @@ ohci: ohci@0 {
usbd: usbd@0 { usbd: usbd@0 {
compatible = "nxp,lpc3220-udc"; compatible = "nxp,lpc3220-udc";
reg = <0x0 0x300>; reg = <0x0 0x300>;
interrupts = <0x3d 0>, <0x3e 0>, <0x3c 0>, <0x3a 0>; interrupts = <61 IRQ_TYPE_LEVEL_HIGH>,
<62 IRQ_TYPE_LEVEL_HIGH>,
<60 IRQ_TYPE_LEVEL_HIGH>,
<58 IRQ_TYPE_LEVEL_LOW>;
clocks = <&usbclk LPC32XX_USB_CLK_DEVICE>; clocks = <&usbclk LPC32XX_USB_CLK_DEVICE>;
status = "disabled"; status = "disabled";
}; };
...@@ -107,7 +111,7 @@ usbd: usbd@0 { ...@@ -107,7 +111,7 @@ usbd: usbd@0 {
i2cusb: i2c@300 { i2cusb: i2c@300 {
compatible = "nxp,pnx-i2c"; compatible = "nxp,pnx-i2c";
reg = <0x300 0x100>; reg = <0x300 0x100>;
interrupts = <0x3f 0>; interrupts = <63 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&usbclk LPC32XX_USB_CLK_I2C>; clocks = <&usbclk LPC32XX_USB_CLK_I2C>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -124,7 +128,7 @@ usbclk: clock-controller@f00 { ...@@ -124,7 +128,7 @@ usbclk: clock-controller@f00 {
clcd: clcd@31040000 { clcd: clcd@31040000 {
compatible = "arm,pl110", "arm,primecell"; compatible = "arm,pl110", "arm,primecell";
reg = <0x31040000 0x1000>; reg = <0x31040000 0x1000>;
interrupts = <0x0e 0>; interrupts = <14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_LCD>; clocks = <&clk LPC32XX_CLK_LCD>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled"; status = "disabled";
...@@ -133,7 +137,7 @@ clcd: clcd@31040000 { ...@@ -133,7 +137,7 @@ clcd: clcd@31040000 {
mac: ethernet@31060000 { mac: ethernet@31060000 {
compatible = "nxp,lpc-eth"; compatible = "nxp,lpc-eth";
reg = <0x31060000 0x1000>; reg = <0x31060000 0x1000>;
interrupts = <0x1d 0>; interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_MAC>; clocks = <&clk LPC32XX_CLK_MAC>;
}; };
...@@ -161,7 +165,7 @@ apb { ...@@ -161,7 +165,7 @@ apb {
ssp0: ssp@20084000 { ssp0: ssp@20084000 {
compatible = "arm,pl022", "arm,primecell"; compatible = "arm,pl022", "arm,primecell";
reg = <0x20084000 0x1000>; reg = <0x20084000 0x1000>;
interrupts = <0x14 0>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_SSP0>; clocks = <&clk LPC32XX_CLK_SSP0>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
}; };
...@@ -174,7 +178,7 @@ spi1: spi@20088000 { ...@@ -174,7 +178,7 @@ spi1: spi@20088000 {
ssp1: ssp@2008c000 { ssp1: ssp@2008c000 {
compatible = "arm,pl022", "arm,primecell"; compatible = "arm,pl022", "arm,primecell";
reg = <0x2008c000 0x1000>; reg = <0x2008c000 0x1000>;
interrupts = <0x15 0>; interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_SSP1>; clocks = <&clk LPC32XX_CLK_SSP1>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
}; };
...@@ -192,7 +196,8 @@ i2s0: i2s@20094000 { ...@@ -192,7 +196,8 @@ i2s0: i2s@20094000 {
sd: sd@20098000 { sd: sd@20098000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x20098000 0x1000>; reg = <0x20098000 0x1000>;
interrupts = <0x0f 0>, <0x0d 0>; interrupts = <15 IRQ_TYPE_LEVEL_HIGH>,
<13 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_SD>; clocks = <&clk LPC32XX_CLK_SD>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled"; status = "disabled";
...@@ -208,7 +213,7 @@ uart5: serial@40090000 { ...@@ -208,7 +213,7 @@ uart5: serial@40090000 {
/* actually, ns16550a w/ 64 byte fifos! */ /* actually, ns16550a w/ 64 byte fifos! */
compatible = "nxp,lpc3220-uart"; compatible = "nxp,lpc3220-uart";
reg = <0x40090000 0x1000>; reg = <0x40090000 0x1000>;
interrupts = <9 0>; interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
clocks = <&clk LPC32XX_CLK_UART5>; clocks = <&clk LPC32XX_CLK_UART5>;
status = "disabled"; status = "disabled";
...@@ -217,7 +222,7 @@ uart5: serial@40090000 { ...@@ -217,7 +222,7 @@ uart5: serial@40090000 {
uart3: serial@40080000 { uart3: serial@40080000 {
compatible = "nxp,lpc3220-uart"; compatible = "nxp,lpc3220-uart";
reg = <0x40080000 0x1000>; reg = <0x40080000 0x1000>;
interrupts = <7 0>; interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
clocks = <&clk LPC32XX_CLK_UART3>; clocks = <&clk LPC32XX_CLK_UART3>;
status = "disabled"; status = "disabled";
...@@ -226,7 +231,7 @@ uart3: serial@40080000 { ...@@ -226,7 +231,7 @@ uart3: serial@40080000 {
uart4: serial@40088000 { uart4: serial@40088000 {
compatible = "nxp,lpc3220-uart"; compatible = "nxp,lpc3220-uart";
reg = <0x40088000 0x1000>; reg = <0x40088000 0x1000>;
interrupts = <8 0>; interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
clocks = <&clk LPC32XX_CLK_UART4>; clocks = <&clk LPC32XX_CLK_UART4>;
status = "disabled"; status = "disabled";
...@@ -235,7 +240,7 @@ uart4: serial@40088000 { ...@@ -235,7 +240,7 @@ uart4: serial@40088000 {
uart6: serial@40098000 { uart6: serial@40098000 {
compatible = "nxp,lpc3220-uart"; compatible = "nxp,lpc3220-uart";
reg = <0x40098000 0x1000>; reg = <0x40098000 0x1000>;
interrupts = <10 0>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
clocks = <&clk LPC32XX_CLK_UART6>; clocks = <&clk LPC32XX_CLK_UART6>;
status = "disabled"; status = "disabled";
...@@ -244,7 +249,7 @@ uart6: serial@40098000 { ...@@ -244,7 +249,7 @@ uart6: serial@40098000 {
i2c1: i2c@400A0000 { i2c1: i2c@400A0000 {
compatible = "nxp,pnx-i2c"; compatible = "nxp,pnx-i2c";
reg = <0x400A0000 0x100>; reg = <0x400A0000 0x100>;
interrupts = <0x33 0>; interrupts = <51 IRQ_TYPE_LEVEL_LOW>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pnx,timeout = <0x64>; pnx,timeout = <0x64>;
...@@ -254,7 +259,7 @@ i2c1: i2c@400A0000 { ...@@ -254,7 +259,7 @@ i2c1: i2c@400A0000 {
i2c2: i2c@400A8000 { i2c2: i2c@400A8000 {
compatible = "nxp,pnx-i2c"; compatible = "nxp,pnx-i2c";
reg = <0x400A8000 0x100>; reg = <0x400A8000 0x100>;
interrupts = <0x32 0>; interrupts = <50 IRQ_TYPE_LEVEL_LOW>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pnx,timeout = <0x64>; pnx,timeout = <0x64>;
...@@ -308,28 +313,28 @@ mic: interrupt-controller@40008000 { ...@@ -308,28 +313,28 @@ mic: interrupt-controller@40008000 {
uart1: serial@40014000 { uart1: serial@40014000 {
compatible = "nxp,lpc3220-hsuart"; compatible = "nxp,lpc3220-hsuart";
reg = <0x40014000 0x1000>; reg = <0x40014000 0x1000>;
interrupts = <26 0>; interrupts = <26 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
uart2: serial@40018000 { uart2: serial@40018000 {
compatible = "nxp,lpc3220-hsuart"; compatible = "nxp,lpc3220-hsuart";
reg = <0x40018000 0x1000>; reg = <0x40018000 0x1000>;
interrupts = <25 0>; interrupts = <25 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
uart7: serial@4001c000 { uart7: serial@4001c000 {
compatible = "nxp,lpc3220-hsuart"; compatible = "nxp,lpc3220-hsuart";
reg = <0x4001c000 0x1000>; reg = <0x4001c000 0x1000>;
interrupts = <24 0>; interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
rtc: rtc@40024000 { rtc: rtc@40024000 {
compatible = "nxp,lpc3220-rtc"; compatible = "nxp,lpc3220-rtc";
reg = <0x40024000 0x1000>; reg = <0x40024000 0x1000>;
interrupts = <0x34 0>; interrupts = <52 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_RTC>; clocks = <&clk LPC32XX_CLK_RTC>;
}; };
...@@ -343,7 +348,7 @@ gpio: gpio@40028000 { ...@@ -343,7 +348,7 @@ gpio: gpio@40028000 {
timer4: timer@4002C000 { timer4: timer@4002C000 {
compatible = "nxp,lpc3220-timer"; compatible = "nxp,lpc3220-timer";
reg = <0x4002C000 0x1000>; reg = <0x4002C000 0x1000>;
interrupts = <0x3 0>; interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
clocks = <&clk LPC32XX_CLK_TIMER4>; clocks = <&clk LPC32XX_CLK_TIMER4>;
clock-names = "timerclk"; clock-names = "timerclk";
status = "disabled"; status = "disabled";
...@@ -352,7 +357,7 @@ timer4: timer@4002C000 { ...@@ -352,7 +357,7 @@ timer4: timer@4002C000 {
timer5: timer@40030000 { timer5: timer@40030000 {
compatible = "nxp,lpc3220-timer"; compatible = "nxp,lpc3220-timer";
reg = <0x40030000 0x1000>; reg = <0x40030000 0x1000>;
interrupts = <0x4 0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
clocks = <&clk LPC32XX_CLK_TIMER5>; clocks = <&clk LPC32XX_CLK_TIMER5>;
clock-names = "timerclk"; clock-names = "timerclk";
status = "disabled"; status = "disabled";
...@@ -369,7 +374,7 @@ timer0: timer@40044000 { ...@@ -369,7 +374,7 @@ timer0: timer@40044000 {
reg = <0x40044000 0x1000>; reg = <0x40044000 0x1000>;
clocks = <&clk LPC32XX_CLK_TIMER0>; clocks = <&clk LPC32XX_CLK_TIMER0>;
clock-names = "timerclk"; clock-names = "timerclk";
interrupts = <0x10 0>; interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
}; };
/* /*
...@@ -382,7 +387,7 @@ timer0: timer@40044000 { ...@@ -382,7 +387,7 @@ timer0: timer@40044000 {
adc: adc@40048000 { adc: adc@40048000 {
compatible = "nxp,lpc3220-adc"; compatible = "nxp,lpc3220-adc";
reg = <0x40048000 0x1000>; reg = <0x40048000 0x1000>;
interrupts = <0x27 0>; interrupts = <39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_ADC>; clocks = <&clk LPC32XX_CLK_ADC>;
status = "disabled"; status = "disabled";
}; };
...@@ -390,7 +395,7 @@ adc: adc@40048000 { ...@@ -390,7 +395,7 @@ adc: adc@40048000 {
tsc: tsc@40048000 { tsc: tsc@40048000 {
compatible = "nxp,lpc3220-tsc"; compatible = "nxp,lpc3220-tsc";
reg = <0x40048000 0x1000>; reg = <0x40048000 0x1000>;
interrupts = <0x27 0>; interrupts = <39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk LPC32XX_CLK_ADC>; clocks = <&clk LPC32XX_CLK_ADC>;
status = "disabled"; status = "disabled";
}; };
...@@ -398,7 +403,7 @@ tsc: tsc@40048000 { ...@@ -398,7 +403,7 @@ tsc: tsc@40048000 {
timer1: timer@4004C000 { timer1: timer@4004C000 {
compatible = "nxp,lpc3220-timer"; compatible = "nxp,lpc3220-timer";
reg = <0x4004C000 0x1000>; reg = <0x4004C000 0x1000>;
interrupts = <0x11 0>; interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
clocks = <&clk LPC32XX_CLK_TIMER1>; clocks = <&clk LPC32XX_CLK_TIMER1>;
clock-names = "timerclk"; clock-names = "timerclk";
}; };
...@@ -406,14 +411,14 @@ timer1: timer@4004C000 { ...@@ -406,14 +411,14 @@ timer1: timer@4004C000 {
key: key@40050000 { key: key@40050000 {
compatible = "nxp,lpc3220-key"; compatible = "nxp,lpc3220-key";
reg = <0x40050000 0x1000>; reg = <0x40050000 0x1000>;
interrupts = <54 0>; interrupts = <54 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
timer2: timer@40058000 { timer2: timer@40058000 {
compatible = "nxp,lpc3220-timer"; compatible = "nxp,lpc3220-timer";
reg = <0x40058000 0x1000>; reg = <0x40058000 0x1000>;
interrupts = <0x12 0>; interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
clocks = <&clk LPC32XX_CLK_TIMER2>; clocks = <&clk LPC32XX_CLK_TIMER2>;
clock-names = "timerclk"; clock-names = "timerclk";
status = "disabled"; status = "disabled";
...@@ -436,7 +441,7 @@ pwm2: pwm@4005C004 { ...@@ -436,7 +441,7 @@ pwm2: pwm@4005C004 {
timer3: timer@40060000 { timer3: timer@40060000 {
compatible = "nxp,lpc3220-timer"; compatible = "nxp,lpc3220-timer";
reg = <0x40060000 0x1000>; reg = <0x40060000 0x1000>;
interrupts = <0x13 0>; interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
clocks = <&clk LPC32XX_CLK_TIMER3>; clocks = <&clk LPC32XX_CLK_TIMER3>;
clock-names = "timerclk"; clock-names = "timerclk";
status = "disabled"; status = "disabled";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7