Commit 86edd7b8 authored by Shiraz Hashim's avatar Shiraz Hashim Committed by Viresh Kumar

ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor

shirq layer has been adapted to DT, add corresponding nodes in all
SPEAr3xx variants.
Signed-off-by: default avatarShiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 80515a5a
...@@ -52,6 +52,14 @@ sdhci@70000000 { ...@@ -52,6 +52,14 @@ sdhci@70000000 {
status = "disabled"; status = "disabled";
}; };
shirq: interrupt-controller@0x50000000 {
compatible = "st,spear300-shirq";
reg = <0x50000000 0x1000>;
interrupts = <28>;
#interrupt-cells = <1>;
interrupt-controller;
};
apb { apb {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -64,12 +72,16 @@ gpio1: gpio@a9000000 { ...@@ -64,12 +72,16 @@ gpio1: gpio@a9000000 {
compatible = "arm,pl061", "arm,primecell"; compatible = "arm,pl061", "arm,primecell";
gpio-controller; gpio-controller;
reg = <0xa9000000 0x1000>; reg = <0xa9000000 0x1000>;
interrupts = <8>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
kbd@a0000000 { kbd@a0000000 {
compatible = "st,spear300-kbd"; compatible = "st,spear300-kbd";
reg = <0xa0000000 0x1000>; reg = <0xa0000000 0x1000>;
interrupts = <7>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -40,6 +40,14 @@ fsmc: flash@44000000 { ...@@ -40,6 +40,14 @@ fsmc: flash@44000000 {
status = "disabled"; status = "disabled";
}; };
shirq: interrupt-controller@0xb4000000 {
compatible = "st,spear310-shirq";
reg = <0xb4000000 0x1000>;
interrupts = <28 29 30 1>;
#interrupt-cells = <1>;
interrupt-controller;
};
apb { apb {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -50,30 +58,40 @@ apb { ...@@ -50,30 +58,40 @@ apb {
serial@b2000000 { serial@b2000000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0xb2000000 0x1000>; reg = <0xb2000000 0x1000>;
interrupts = <8>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
serial@b2080000 { serial@b2080000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0xb2080000 0x1000>; reg = <0xb2080000 0x1000>;
interrupts = <9>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
serial@b2100000 { serial@b2100000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0xb2100000 0x1000>; reg = <0xb2100000 0x1000>;
interrupts = <10>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
serial@b2180000 { serial@b2180000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0xb2180000 0x1000>; reg = <0xb2180000 0x1000>;
interrupts = <11>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
serial@b2200000 { serial@b2200000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0xb2200000 0x1000>; reg = <0xb2200000 0x1000>;
interrupts = <12>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -30,7 +30,8 @@ pinmux: pinmux@b3000000 { ...@@ -30,7 +30,8 @@ pinmux: pinmux@b3000000 {
clcd@90000000 { clcd@90000000 {
compatible = "arm,pl110", "arm,primecell"; compatible = "arm,pl110", "arm,primecell";
reg = <0x90000000 0x1000>; reg = <0x90000000 0x1000>;
interrupts = <33>; interrupts = <8>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
...@@ -49,13 +50,24 @@ fsmc: flash@4c000000 { ...@@ -49,13 +50,24 @@ fsmc: flash@4c000000 {
sdhci@70000000 { sdhci@70000000 {
compatible = "st,sdhci-spear"; compatible = "st,sdhci-spear";
reg = <0x70000000 0x100>; reg = <0x70000000 0x100>;
interrupts = <29>; interrupts = <10>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
shirq: interrupt-controller@0xb3000000 {
compatible = "st,spear320-shirq";
reg = <0xb3000000 0x1000>;
interrupts = <30 28 29 1>;
#interrupt-cells = <1>;
interrupt-controller;
};
spi1: spi@a5000000 { spi1: spi@a5000000 {
compatible = "arm,pl022", "arm,primecell"; compatible = "arm,pl022", "arm,primecell";
reg = <0xa5000000 0x1000>; reg = <0xa5000000 0x1000>;
interrupts = <15>;
interrupt-parent = <&shirq>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -64,6 +76,8 @@ spi1: spi@a5000000 { ...@@ -64,6 +76,8 @@ spi1: spi@a5000000 {
spi2: spi@a6000000 { spi2: spi@a6000000 {
compatible = "arm,pl022", "arm,primecell"; compatible = "arm,pl022", "arm,primecell";
reg = <0xa6000000 0x1000>; reg = <0xa6000000 0x1000>;
interrupts = <16>;
interrupt-parent = <&shirq>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -88,18 +102,24 @@ i2c1: i2c@a7000000 { ...@@ -88,18 +102,24 @@ i2c1: i2c@a7000000 {
#size-cells = <0>; #size-cells = <0>;
compatible = "snps,designware-i2c"; compatible = "snps,designware-i2c";
reg = <0xa7000000 0x1000>; reg = <0xa7000000 0x1000>;
interrupts = <21>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
serial@a3000000 { serial@a3000000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0xa3000000 0x1000>; reg = <0xa3000000 0x1000>;
interrupts = <13>;
interrupt-parent = <&shirq>;
status = "disabled"; status = "disabled";
}; };
serial@a4000000 { serial@a4000000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0xa4000000 0x1000>; reg = <0xa4000000 0x1000>;
interrupts = <14>;
interrupt-parent = <&shirq>;
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