aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2012-09-20 21:13:31 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-09-20 21:47:23 -0400
commitc9e23f00cdd1b18955a50ff9fa3d51b5a28498d0 (patch)
tree6b19e09dfe88d1627caaf5b8ec97945ba493d45c
parent3579a5824000dce3d431d88ecf031acb7588128b (diff)
ARM: dts: Assume status of all optional nodes as disabled for exynos4
Currently all boards must explicitly disable all unused device tree nodes of unused components (e.g. i2c, sdhci, etc...). This makes it necessary to all boards to be aware of all components on the SoC, which in turns makes board dts files longer and more difficult to maintain (e.g. adding new components to SoC-level tree requires adding nodes with status="disabled" to every board). This patch changes "status" of all optional components in SoC-level dts file to "disabled", adds status="okay" to respective nodes of used components in dts of all boards and removes all nodes with only status="disabled" from boards dts. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi22
-rw-r--r--arch/arm/boot/dts/exynos4210-origen.dts58
-rw-r--r--arch/arm/boot/dts/exynos4210-smdkv310.dts52
3 files changed, 28 insertions, 104 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 042fe9b8ef0c..9a19691a51fe 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -48,114 +48,133 @@
48 compatible = "samsung,s3c2410-wdt"; 48 compatible = "samsung,s3c2410-wdt";
49 reg = <0x10060000 0x100>; 49 reg = <0x10060000 0x100>;
50 interrupts = <0 43 0>; 50 interrupts = <0 43 0>;
51 status = "disabled";
51 }; 52 };
52 53
53 rtc@10070000 { 54 rtc@10070000 {
54 compatible = "samsung,s3c6410-rtc"; 55 compatible = "samsung,s3c6410-rtc";
55 reg = <0x10070000 0x100>; 56 reg = <0x10070000 0x100>;
56 interrupts = <0 44 0>, <0 45 0>; 57 interrupts = <0 44 0>, <0 45 0>;
58 status = "disabled";
57 }; 59 };
58 60
59 keypad@100A0000 { 61 keypad@100A0000 {
60 compatible = "samsung,s5pv210-keypad"; 62 compatible = "samsung,s5pv210-keypad";
61 reg = <0x100A0000 0x100>; 63 reg = <0x100A0000 0x100>;
62 interrupts = <0 109 0>; 64 interrupts = <0 109 0>;
65 status = "disabled";
63 }; 66 };
64 67
65 sdhci@12510000 { 68 sdhci@12510000 {
66 compatible = "samsung,exynos4210-sdhci"; 69 compatible = "samsung,exynos4210-sdhci";
67 reg = <0x12510000 0x100>; 70 reg = <0x12510000 0x100>;
68 interrupts = <0 73 0>; 71 interrupts = <0 73 0>;
72 status = "disabled";
69 }; 73 };
70 74
71 sdhci@12520000 { 75 sdhci@12520000 {
72 compatible = "samsung,exynos4210-sdhci"; 76 compatible = "samsung,exynos4210-sdhci";
73 reg = <0x12520000 0x100>; 77 reg = <0x12520000 0x100>;
74 interrupts = <0 74 0>; 78 interrupts = <0 74 0>;
79 status = "disabled";
75 }; 80 };
76 81
77 sdhci@12530000 { 82 sdhci@12530000 {
78 compatible = "samsung,exynos4210-sdhci"; 83 compatible = "samsung,exynos4210-sdhci";
79 reg = <0x12530000 0x100>; 84 reg = <0x12530000 0x100>;
80 interrupts = <0 75 0>; 85 interrupts = <0 75 0>;
86 status = "disabled";
81 }; 87 };
82 88
83 sdhci@12540000 { 89 sdhci@12540000 {
84 compatible = "samsung,exynos4210-sdhci"; 90 compatible = "samsung,exynos4210-sdhci";
85 reg = <0x12540000 0x100>; 91 reg = <0x12540000 0x100>;
86 interrupts = <0 76 0>; 92 interrupts = <0 76 0>;
93 status = "disabled";
87 }; 94 };
88 95
89 serial@13800000 { 96 serial@13800000 {
90 compatible = "samsung,exynos4210-uart"; 97 compatible = "samsung,exynos4210-uart";
91 reg = <0x13800000 0x100>; 98 reg = <0x13800000 0x100>;
92 interrupts = <0 52 0>; 99 interrupts = <0 52 0>;
100 status = "disabled";
93 }; 101 };
94 102
95 serial@13810000 { 103 serial@13810000 {
96 compatible = "samsung,exynos4210-uart"; 104 compatible = "samsung,exynos4210-uart";
97 reg = <0x13810000 0x100>; 105 reg = <0x13810000 0x100>;
98 interrupts = <0 53 0>; 106 interrupts = <0 53 0>;
107 status = "disabled";
99 }; 108 };
100 109
101 serial@13820000 { 110 serial@13820000 {
102 compatible = "samsung,exynos4210-uart"; 111 compatible = "samsung,exynos4210-uart";
103 reg = <0x13820000 0x100>; 112 reg = <0x13820000 0x100>;
104 interrupts = <0 54 0>; 113 interrupts = <0 54 0>;
114 status = "disabled";
105 }; 115 };
106 116
107 serial@13830000 { 117 serial@13830000 {
108 compatible = "samsung,exynos4210-uart"; 118 compatible = "samsung,exynos4210-uart";
109 reg = <0x13830000 0x100>; 119 reg = <0x13830000 0x100>;
110 interrupts = <0 55 0>; 120 interrupts = <0 55 0>;
121 status = "disabled";
111 }; 122 };
112 123
113 i2c@13860000 { 124 i2c@13860000 {
114 compatible = "samsung,s3c2440-i2c"; 125 compatible = "samsung,s3c2440-i2c";
115 reg = <0x13860000 0x100>; 126 reg = <0x13860000 0x100>;
116 interrupts = <0 58 0>; 127 interrupts = <0 58 0>;
128 status = "disabled";
117 }; 129 };
118 130
119 i2c@13870000 { 131 i2c@13870000 {
120 compatible = "samsung,s3c2440-i2c"; 132 compatible = "samsung,s3c2440-i2c";
121 reg = <0x13870000 0x100>; 133 reg = <0x13870000 0x100>;
122 interrupts = <0 59 0>; 134 interrupts = <0 59 0>;
135 status = "disabled";
123 }; 136 };
124 137
125 i2c@13880000 { 138 i2c@13880000 {
126 compatible = "samsung,s3c2440-i2c"; 139 compatible = "samsung,s3c2440-i2c";
127 reg = <0x13880000 0x100>; 140 reg = <0x13880000 0x100>;
128 interrupts = <0 60 0>; 141 interrupts = <0 60 0>;
142 status = "disabled";
129 }; 143 };
130 144
131 i2c@13890000 { 145 i2c@13890000 {
132 compatible = "samsung,s3c2440-i2c"; 146 compatible = "samsung,s3c2440-i2c";
133 reg = <0x13890000 0x100>; 147 reg = <0x13890000 0x100>;
134 interrupts = <0 61 0>; 148 interrupts = <0 61 0>;
149 status = "disabled";
135 }; 150 };
136 151
137 i2c@138A0000 { 152 i2c@138A0000 {
138 compatible = "samsung,s3c2440-i2c"; 153 compatible = "samsung,s3c2440-i2c";
139 reg = <0x138A0000 0x100>; 154 reg = <0x138A0000 0x100>;
140 interrupts = <0 62 0>; 155 interrupts = <0 62 0>;
156 status = "disabled";
141 }; 157 };
142 158
143 i2c@138B0000 { 159 i2c@138B0000 {
144 compatible = "samsung,s3c2440-i2c"; 160 compatible = "samsung,s3c2440-i2c";
145 reg = <0x138B0000 0x100>; 161 reg = <0x138B0000 0x100>;
146 interrupts = <0 63 0>; 162 interrupts = <0 63 0>;
163 status = "disabled";
147 }; 164 };
148 165
149 i2c@138C0000 { 166 i2c@138C0000 {
150 compatible = "samsung,s3c2440-i2c"; 167 compatible = "samsung,s3c2440-i2c";
151 reg = <0x138C0000 0x100>; 168 reg = <0x138C0000 0x100>;
152 interrupts = <0 64 0>; 169 interrupts = <0 64 0>;
170 status = "disabled";
153 }; 171 };
154 172
155 i2c@138D0000 { 173 i2c@138D0000 {
156 compatible = "samsung,s3c2440-i2c"; 174 compatible = "samsung,s3c2440-i2c";
157 reg = <0x138D0000 0x100>; 175 reg = <0x138D0000 0x100>;
158 interrupts = <0 65 0>; 176 interrupts = <0 65 0>;
177 status = "disabled";
159 }; 178 };
160 179
161 spi_0: spi@13920000 { 180 spi_0: spi@13920000 {
@@ -166,6 +185,7 @@
166 rx-dma-channel = <&pdma0 6>; /* preliminary */ 185 rx-dma-channel = <&pdma0 6>; /* preliminary */
167 #address-cells = <1>; 186 #address-cells = <1>;
168 #size-cells = <0>; 187 #size-cells = <0>;
188 status = "disabled";
169 }; 189 };
170 190
171 spi_1: spi@13930000 { 191 spi_1: spi@13930000 {
@@ -176,6 +196,7 @@
176 rx-dma-channel = <&pdma1 6>; /* preliminary */ 196 rx-dma-channel = <&pdma1 6>; /* preliminary */
177 #address-cells = <1>; 197 #address-cells = <1>;
178 #size-cells = <0>; 198 #size-cells = <0>;
199 status = "disabled";
179 }; 200 };
180 201
181 spi_2: spi@13940000 { 202 spi_2: spi@13940000 {
@@ -186,6 +207,7 @@
186 rx-dma-channel = <&pdma0 8>; /* preliminary */ 207 rx-dma-channel = <&pdma0 8>; /* preliminary */
187 #address-cells = <1>; 208 #address-cells = <1>;
188 #size-cells = <0>; 209 #size-cells = <0>;
210 status = "disabled";
189 }; 211 };
190 212
191 amba { 213 amba {
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 0c49caa09978..d1a1101fd96e 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -40,6 +40,7 @@
40 <&gpk2 4 2 3 3>, 40 <&gpk2 4 2 3 3>,
41 <&gpk2 5 2 3 3>, 41 <&gpk2 5 2 3 3>,
42 <&gpk2 6 2 3 3>; 42 <&gpk2 6 2 3 3>;
43 status = "okay";
43 }; 44 };
44 45
45 sdhci@12510000 { 46 sdhci@12510000 {
@@ -53,6 +54,7 @@
53 <&gpk0 4 2 3 3>, 54 <&gpk0 4 2 3 3>,
54 <&gpk0 5 2 3 3>, 55 <&gpk0 5 2 3 3>,
55 <&gpk0 6 2 3 3>; 56 <&gpk0 6 2 3 3>;
57 status = "okay";
56 }; 58 };
57 59
58 gpio_keys { 60 gpio_keys {
@@ -90,60 +92,4 @@
90 linux,code = <139>; 92 linux,code = <139>;
91 }; 93 };
92 }; 94 };
93
94 keypad@100A0000 {
95 status = "disabled";
96 };
97
98 sdhci@12520000 {
99 status = "disabled";
100 };
101
102 sdhci@12540000 {
103 status = "disabled";
104 };
105
106 i2c@13860000 {
107 status = "disabled";
108 };
109
110 i2c@13870000 {
111 status = "disabled";
112 };
113
114 i2c@13880000 {
115 status = "disabled";
116 };
117
118 i2c@13890000 {
119 status = "disabled";
120 };
121
122 i2c@138A0000 {
123 status = "disabled";
124 };
125
126 i2c@138B0000 {
127 status = "disabled";
128 };
129
130 i2c@138C0000 {
131 status = "disabled";
132 };
133
134 i2c@138D0000 {
135 status = "disabled";
136 };
137
138 spi_0: spi@13920000 {
139 status = "disabled";
140 };
141
142 spi_1: spi@13930000 {
143 status = "disabled";
144 };
145
146 spi_2: spi@13940000 {
147 status = "disabled";
148 };
149}; 95};
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 1beccc8f14ff..b87cca2fca74 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -40,6 +40,7 @@
40 <&gpk2 4 2 3 3>, 40 <&gpk2 4 2 3 3>,
41 <&gpk2 5 2 3 3>, 41 <&gpk2 5 2 3 3>,
42 <&gpk2 6 2 3 3>; 42 <&gpk2 6 2 3 3>;
43 status = "okay";
43 }; 44 };
44 45
45 keypad@100A0000 { 46 keypad@100A0000 {
@@ -47,6 +48,7 @@
47 samsung,keypad-num-columns = <8>; 48 samsung,keypad-num-columns = <8>;
48 linux,keypad-no-autorepeat; 49 linux,keypad-no-autorepeat;
49 linux,keypad-wakeup; 50 linux,keypad-wakeup;
51 status = "okay";
50 52
51 row-gpios = <&gpx2 0 3 3 0>, 53 row-gpios = <&gpx2 0 3 3 0>,
52 <&gpx2 1 3 3 0>; 54 <&gpx2 1 3 3 0>;
@@ -128,6 +130,7 @@
128 samsung,i2c-max-bus-freq = <20000>; 130 samsung,i2c-max-bus-freq = <20000>;
129 gpios = <&gpd1 0 2 3 0>, 131 gpios = <&gpd1 0 2 3 0>,
130 <&gpd1 1 2 3 0>; 132 <&gpd1 1 2 3 0>;
133 status = "okay";
131 134
132 eeprom@50 { 135 eeprom@50 {
133 compatible = "samsung,24ad0xd1"; 136 compatible = "samsung,24ad0xd1";
@@ -140,58 +143,11 @@
140 }; 143 };
141 }; 144 };
142 145
143 sdhci@12510000 {
144 status = "disabled";
145 };
146
147 sdhci@12520000 {
148 status = "disabled";
149 };
150
151 sdhci@12540000 {
152 status = "disabled";
153 };
154
155 i2c@13870000 {
156 status = "disabled";
157 };
158
159 i2c@13880000 {
160 status = "disabled";
161 };
162
163 i2c@13890000 {
164 status = "disabled";
165 };
166
167 i2c@138A0000 {
168 status = "disabled";
169 };
170
171 i2c@138B0000 {
172 status = "disabled";
173 };
174
175 i2c@138C0000 {
176 status = "disabled";
177 };
178
179 i2c@138D0000 {
180 status = "disabled";
181 };
182
183 spi_0: spi@13920000 {
184 status = "disabled";
185 };
186
187 spi_1: spi@13930000 {
188 status = "disabled";
189 };
190
191 spi_2: spi@13940000 { 146 spi_2: spi@13940000 {
192 gpios = <&gpc1 1 5 3 0>, 147 gpios = <&gpc1 1 5 3 0>,
193 <&gpc1 3 5 3 0>, 148 <&gpc1 3 5 3 0>,
194 <&gpc1 4 5 3 0>; 149 <&gpc1 4 5 3 0>;
150 status = "okay";
195 151
196 w25x80@0 { 152 w25x80@0 {
197 #address-cells = <1>; 153 #address-cells = <1>;