aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiraz Hashim <shiraz.hashim@st.com>2012-08-03 06:30:18 -0400
committerViresh Kumar <viresh.kumar@linaro.org>2012-11-26 06:25:32 -0500
commit86edd7b8ac2791ddf42ab082799ddb843813c3bc (patch)
tree4b39c92a300da2be438d7bcfd3ea6ee93e0a1e8d
parent80515a5a2e3c35e2994105f19af27650e8a16c51 (diff)
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: Shiraz Hashim <shiraz.hashim@st.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat
-rw-r--r--arch/arm/boot/dts/spear300.dtsi12
-rw-r--r--arch/arm/boot/dts/spear310.dtsi18
-rw-r--r--arch/arm/boot/dts/spear320.dtsi24
3 files changed, 52 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/spear300.dtsi b/arch/arm/boot/dts/spear300.dtsi
index fdac8713367a..090adc656015 100644
--- a/arch/arm/boot/dts/spear300.dtsi
+++ b/arch/arm/boot/dts/spear300.dtsi
@@ -52,6 +52,14 @@
52 status = "disabled"; 52 status = "disabled";
53 }; 53 };
54 54
55 shirq: interrupt-controller@0x50000000 {
56 compatible = "st,spear300-shirq";
57 reg = <0x50000000 0x1000>;
58 interrupts = <28>;
59 #interrupt-cells = <1>;
60 interrupt-controller;
61 };
62
55 apb { 63 apb {
56 #address-cells = <1>; 64 #address-cells = <1>;
57 #size-cells = <1>; 65 #size-cells = <1>;
@@ -64,12 +72,16 @@
64 compatible = "arm,pl061", "arm,primecell"; 72 compatible = "arm,pl061", "arm,primecell";
65 gpio-controller; 73 gpio-controller;
66 reg = <0xa9000000 0x1000>; 74 reg = <0xa9000000 0x1000>;
75 interrupts = <8>;
76 interrupt-parent = <&shirq>;
67 status = "disabled"; 77 status = "disabled";
68 }; 78 };
69 79
70 kbd@a0000000 { 80 kbd@a0000000 {
71 compatible = "st,spear300-kbd"; 81 compatible = "st,spear300-kbd";
72 reg = <0xa0000000 0x1000>; 82 reg = <0xa0000000 0x1000>;
83 interrupts = <7>;
84 interrupt-parent = <&shirq>;
73 status = "disabled"; 85 status = "disabled";
74 }; 86 };
75 }; 87 };
diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index 930303e48df9..e814e5e97083 100644
--- a/arch/arm/boot/dts/spear310.dtsi
+++ b/arch/arm/boot/dts/spear310.dtsi
@@ -40,6 +40,14 @@
40 status = "disabled"; 40 status = "disabled";
41 }; 41 };
42 42
43 shirq: interrupt-controller@0xb4000000 {
44 compatible = "st,spear310-shirq";
45 reg = <0xb4000000 0x1000>;
46 interrupts = <28 29 30 1>;
47 #interrupt-cells = <1>;
48 interrupt-controller;
49 };
50
43 apb { 51 apb {
44 #address-cells = <1>; 52 #address-cells = <1>;
45 #size-cells = <1>; 53 #size-cells = <1>;
@@ -50,30 +58,40 @@
50 serial@b2000000 { 58 serial@b2000000 {
51 compatible = "arm,pl011", "arm,primecell"; 59 compatible = "arm,pl011", "arm,primecell";
52 reg = <0xb2000000 0x1000>; 60 reg = <0xb2000000 0x1000>;
61 interrupts = <8>;
62 interrupt-parent = <&shirq>;
53 status = "disabled"; 63 status = "disabled";
54 }; 64 };
55 65
56 serial@b2080000 { 66 serial@b2080000 {
57 compatible = "arm,pl011", "arm,primecell"; 67 compatible = "arm,pl011", "arm,primecell";
58 reg = <0xb2080000 0x1000>; 68 reg = <0xb2080000 0x1000>;
69 interrupts = <9>;
70 interrupt-parent = <&shirq>;
59 status = "disabled"; 71 status = "disabled";
60 }; 72 };
61 73
62 serial@b2100000 { 74 serial@b2100000 {
63 compatible = "arm,pl011", "arm,primecell"; 75 compatible = "arm,pl011", "arm,primecell";
64 reg = <0xb2100000 0x1000>; 76 reg = <0xb2100000 0x1000>;
77 interrupts = <10>;
78 interrupt-parent = <&shirq>;
65 status = "disabled"; 79 status = "disabled";
66 }; 80 };
67 81
68 serial@b2180000 { 82 serial@b2180000 {
69 compatible = "arm,pl011", "arm,primecell"; 83 compatible = "arm,pl011", "arm,primecell";
70 reg = <0xb2180000 0x1000>; 84 reg = <0xb2180000 0x1000>;
85 interrupts = <11>;
86 interrupt-parent = <&shirq>;
71 status = "disabled"; 87 status = "disabled";
72 }; 88 };
73 89
74 serial@b2200000 { 90 serial@b2200000 {
75 compatible = "arm,pl011", "arm,primecell"; 91 compatible = "arm,pl011", "arm,primecell";
76 reg = <0xb2200000 0x1000>; 92 reg = <0xb2200000 0x1000>;
93 interrupts = <12>;
94 interrupt-parent = <&shirq>;
77 status = "disabled"; 95 status = "disabled";
78 }; 96 };
79 97
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi
index 6ff0d1e0e461..c056a84deabf 100644
--- a/arch/arm/boot/dts/spear320.dtsi
+++ b/arch/arm/boot/dts/spear320.dtsi
@@ -30,7 +30,8 @@
30 clcd@90000000 { 30 clcd@90000000 {
31 compatible = "arm,pl110", "arm,primecell"; 31 compatible = "arm,pl110", "arm,primecell";
32 reg = <0x90000000 0x1000>; 32 reg = <0x90000000 0x1000>;
33 interrupts = <33>; 33 interrupts = <8>;
34 interrupt-parent = <&shirq>;
34 status = "disabled"; 35 status = "disabled";
35 }; 36 };
36 37
@@ -49,13 +50,24 @@
49 sdhci@70000000 { 50 sdhci@70000000 {
50 compatible = "st,sdhci-spear"; 51 compatible = "st,sdhci-spear";
51 reg = <0x70000000 0x100>; 52 reg = <0x70000000 0x100>;
52 interrupts = <29>; 53 interrupts = <10>;
54 interrupt-parent = <&shirq>;
53 status = "disabled"; 55 status = "disabled";
54 }; 56 };
55 57
58 shirq: interrupt-controller@0xb3000000 {
59 compatible = "st,spear320-shirq";
60 reg = <0xb3000000 0x1000>;
61 interrupts = <30 28 29 1>;
62 #interrupt-cells = <1>;
63 interrupt-controller;
64 };
65
56 spi1: spi@a5000000 { 66 spi1: spi@a5000000 {
57 compatible = "arm,pl022", "arm,primecell"; 67 compatible = "arm,pl022", "arm,primecell";
58 reg = <0xa5000000 0x1000>; 68 reg = <0xa5000000 0x1000>;
69 interrupts = <15>;
70 interrupt-parent = <&shirq>;
59 #address-cells = <1>; 71 #address-cells = <1>;
60 #size-cells = <0>; 72 #size-cells = <0>;
61 status = "disabled"; 73 status = "disabled";
@@ -64,6 +76,8 @@
64 spi2: spi@a6000000 { 76 spi2: spi@a6000000 {
65 compatible = "arm,pl022", "arm,primecell"; 77 compatible = "arm,pl022", "arm,primecell";
66 reg = <0xa6000000 0x1000>; 78 reg = <0xa6000000 0x1000>;
79 interrupts = <16>;
80 interrupt-parent = <&shirq>;
67 #address-cells = <1>; 81 #address-cells = <1>;
68 #size-cells = <0>; 82 #size-cells = <0>;
69 status = "disabled"; 83 status = "disabled";
@@ -88,18 +102,24 @@
88 #size-cells = <0>; 102 #size-cells = <0>;
89 compatible = "snps,designware-i2c"; 103 compatible = "snps,designware-i2c";
90 reg = <0xa7000000 0x1000>; 104 reg = <0xa7000000 0x1000>;
105 interrupts = <21>;
106 interrupt-parent = <&shirq>;
91 status = "disabled"; 107 status = "disabled";
92 }; 108 };
93 109
94 serial@a3000000 { 110 serial@a3000000 {
95 compatible = "arm,pl011", "arm,primecell"; 111 compatible = "arm,pl011", "arm,primecell";
96 reg = <0xa3000000 0x1000>; 112 reg = <0xa3000000 0x1000>;
113 interrupts = <13>;
114 interrupt-parent = <&shirq>;
97 status = "disabled"; 115 status = "disabled";
98 }; 116 };
99 117
100 serial@a4000000 { 118 serial@a4000000 {
101 compatible = "arm,pl011", "arm,primecell"; 119 compatible = "arm,pl011", "arm,primecell";
102 reg = <0xa4000000 0x1000>; 120 reg = <0xa4000000 0x1000>;
121 interrupts = <14>;
122 interrupt-parent = <&shirq>;
103 status = "disabled"; 123 status = "disabled";
104 }; 124 };
105 125
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 06:27:51 -0400