aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 11:31:45 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-14 11:31:45 -0400
commit66a2886d867343eff6bf2646bea2c923d0cbf620 (patch)
treead44dcca4fa410ab2c16b4964f6c19571421b4df /arch/arm/boot/dts
parentd2819f80d465672b09c2f4cb52303b7f951c4d0f (diff)
parentf613e220aebfafb653f7ce264950c15c99e27f2a (diff)
Merge branch 'spear/dt' into spear/clock
Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/spear300-evb.dts187
-rw-r--r--arch/arm/boot/dts/spear310-evb.dts20
-rw-r--r--arch/arm/boot/dts/spear320-evb.dts25
-rw-r--r--arch/arm/boot/dts/spear3xx.dtsi6
-rw-r--r--arch/arm/boot/dts/spear600-evb.dts29
-rw-r--r--arch/arm/boot/dts/spear600.dtsi6
6 files changed, 190 insertions, 83 deletions
diff --git a/arch/arm/boot/dts/spear300-evb.dts b/arch/arm/boot/dts/spear300-evb.dts
index 402ca0d55011..fc82b1a26458 100644
--- a/arch/arm/boot/dts/spear300-evb.dts
+++ b/arch/arm/boot/dts/spear300-evb.dts
@@ -87,6 +87,31 @@
87 87
88 smi: flash@fc000000 { 88 smi: flash@fc000000 {
89 status = "okay"; 89 status = "okay";
90 clock-rate=<50000000>;
91
92 flash@f8000000 {
93 #address-cells = <1>;
94 #size-cells = <1>;
95 reg = <0xf8000000 0x800000>;
96 st,smi-fast-mode;
97
98 partition@0 {
99 label = "xloader";
100 reg = <0x0 0x10000>;
101 };
102 partition@10000 {
103 label = "u-boot";
104 reg = <0x10000 0x40000>;
105 };
106 partition@50000 {
107 label = "linux";
108 reg = <0x50000 0x2c0000>;
109 };
110 partition@310000 {
111 label = "rootfs";
112 reg = <0x310000 0x4f0000>;
113 };
114 };
90 }; 115 };
91 116
92 spi0: spi@d0100000 { 117 spi0: spi@d0100000 {
@@ -119,87 +144,87 @@
119 }; 144 };
120 145
121 kbd@a0000000 { 146 kbd@a0000000 {
122 linux,keymap = < 0x00010000 147 linux,keymap = < 0x00000001
123 0x00020100 148 0x00010002
124 0x00030200 149 0x00020003
125 0x00040300 150 0x00030004
126 0x00050400 151 0x00040005
127 0x00060500 152 0x00050006
128 0x00070600 153 0x00060007
129 0x00080700 154 0x00070008
130 0x00090800 155 0x00080009
131 0x000a0001 156 0x0100000a
132 0x000c0101 157 0x0101000c
133 0x000d0201 158 0x0102000d
134 0x000e0301 159 0x0103000e
135 0x000f0401 160 0x0104000f
136 0x00100501 161 0x01050010
137 0x00110601 162 0x01060011
138 0x00120701 163 0x01070012
139 0x00130801 164 0x01080013
140 0x00140002 165 0x02000014
141 0x00150102 166 0x02010015
142 0x00160202 167 0x02020016
143 0x00170302 168 0x02030017
144 0x00180402 169 0x02040018
145 0x00190502 170 0x02050019
146 0x001a0602 171 0x0206001a
147 0x001b0702 172 0x0207001b
148 0x001c0802 173 0x0208001c
149 0x001d0003 174 0x0300001d
150 0x001e0103 175 0x0301001e
151 0x001f0203 176 0x0302001f
152 0x00200303 177 0x03030020
153 0x00210403 178 0x03040021
154 0x00220503 179 0x03050022
155 0x00230603 180 0x03060023
156 0x00240703 181 0x03070024
157 0x00250803 182 0x03080025
158 0x00260004 183 0x04000026
159 0x00270104 184 0x04010027
160 0x00280204 185 0x04020028
161 0x00290304 186 0x04030029
162 0x002a0404 187 0x0404002a
163 0x002b0504 188 0x0405002b
164 0x002c0604 189 0x0406002c
165 0x002d0704 190 0x0407002d
166 0x002e0804 191 0x0408002e
167 0x002f0005 192 0x0500002f
168 0x00300105 193 0x05010030
169 0x00310205 194 0x05020031
170 0x00320305 195 0x05030032
171 0x00330405 196 0x05040033
172 0x00340505 197 0x05050034
173 0x00350605 198 0x05060035
174 0x00360705 199 0x05070036
175 0x00370805 200 0x05080037
176 0x00380006 201 0x06000038
177 0x00390106 202 0x06010039
178 0x003a0206 203 0x0602003a
179 0x003b0306 204 0x0603003b
180 0x003c0406 205 0x0604003c
181 0x003d0506 206 0x0605003d
182 0x003e0606 207 0x0606003e
183 0x003f0706 208 0x0607003f
184 0x00400806 209 0x06080040
185 0x00410007 210 0x07000041
186 0x00420107 211 0x07010042
187 0x00430207 212 0x07020043
188 0x00440307 213 0x07030044
189 0x00450407 214 0x07040045
190 0x00460507 215 0x07050046
191 0x00470607 216 0x07060047
192 0x00480707 217 0x07070048
193 0x00490807 218 0x07080049
194 0x004a0008 219 0x0800004a
195 0x004b0108 220 0x0801004b
196 0x004c0208 221 0x0802004c
197 0x004d0308 222 0x0803004d
198 0x004e0408 223 0x0804004e
199 0x004f0508 224 0x0805004f
200 0x00500608 225 0x08060050
201 0x00510708 226 0x08070051
202 0x00520808 >; 227 0x08080052 >;
203 autorepeat; 228 autorepeat;
204 st,mode = <0>; 229 st,mode = <0>;
205 status = "okay"; 230 status = "okay";
diff --git a/arch/arm/boot/dts/spear310-evb.dts b/arch/arm/boot/dts/spear310-evb.dts
index 6d95317100ad..dc5e2d445a93 100644
--- a/arch/arm/boot/dts/spear310-evb.dts
+++ b/arch/arm/boot/dts/spear310-evb.dts
@@ -103,11 +103,27 @@
103 clock-rate=<50000000>; 103 clock-rate=<50000000>;
104 104
105 flash@f8000000 { 105 flash@f8000000 {
106 label = "m25p64";
107 reg = <0xf8000000 0x800000>;
108 #address-cells = <1>; 106 #address-cells = <1>;
109 #size-cells = <1>; 107 #size-cells = <1>;
108 reg = <0xf8000000 0x800000>;
110 st,smi-fast-mode; 109 st,smi-fast-mode;
110
111 partition@0 {
112 label = "xloader";
113 reg = <0x0 0x10000>;
114 };
115 partition@10000 {
116 label = "u-boot";
117 reg = <0x10000 0x40000>;
118 };
119 partition@50000 {
120 label = "linux";
121 reg = <0x50000 0x2c0000>;
122 };
123 partition@310000 {
124 label = "rootfs";
125 reg = <0x310000 0x4f0000>;
126 };
111 }; 127 };
112 }; 128 };
113 129
diff --git a/arch/arm/boot/dts/spear320-evb.dts b/arch/arm/boot/dts/spear320-evb.dts
index 0c6463b71a37..6308fa3bec1e 100644
--- a/arch/arm/boot/dts/spear320-evb.dts
+++ b/arch/arm/boot/dts/spear320-evb.dts
@@ -110,6 +110,31 @@
110 110
111 smi: flash@fc000000 { 111 smi: flash@fc000000 {
112 status = "okay"; 112 status = "okay";
113 clock-rate=<50000000>;
114
115 flash@f8000000 {
116 #address-cells = <1>;
117 #size-cells = <1>;
118 reg = <0xf8000000 0x800000>;
119 st,smi-fast-mode;
120
121 partition@0 {
122 label = "xloader";
123 reg = <0x0 0x10000>;
124 };
125 partition@10000 {
126 label = "u-boot";
127 reg = <0x10000 0x40000>;
128 };
129 partition@50000 {
130 label = "linux";
131 reg = <0x50000 0x2c0000>;
132 };
133 partition@310000 {
134 label = "rootfs";
135 reg = <0x310000 0x4f0000>;
136 };
137 };
113 }; 138 };
114 139
115 spi0: spi@d0100000 { 140 spi0: spi@d0100000 {
diff --git a/arch/arm/boot/dts/spear3xx.dtsi b/arch/arm/boot/dts/spear3xx.dtsi
index 0ae7c8e86311..91072553963f 100644
--- a/arch/arm/boot/dts/spear3xx.dtsi
+++ b/arch/arm/boot/dts/spear3xx.dtsi
@@ -139,6 +139,12 @@
139 interrupts = <12>; 139 interrupts = <12>;
140 status = "disabled"; 140 status = "disabled";
141 }; 141 };
142
143 timer@f0000000 {
144 compatible = "st,spear-timer";
145 reg = <0xf0000000 0x400>;
146 interrupts = <2>;
147 };
142 }; 148 };
143 }; 149 };
144}; 150};
diff --git a/arch/arm/boot/dts/spear600-evb.dts b/arch/arm/boot/dts/spear600-evb.dts
index 790a7a8a5ccd..1119c22c9a82 100644
--- a/arch/arm/boot/dts/spear600-evb.dts
+++ b/arch/arm/boot/dts/spear600-evb.dts
@@ -33,6 +33,35 @@
33 status = "okay"; 33 status = "okay";
34 }; 34 };
35 35
36 smi: flash@fc000000 {
37 status = "okay";
38 clock-rate=<50000000>;
39
40 flash@f8000000 {
41 #address-cells = <1>;
42 #size-cells = <1>;
43 reg = <0xf8000000 0x800000>;
44 st,smi-fast-mode;
45
46 partition@0 {
47 label = "xloader";
48 reg = <0x0 0x10000>;
49 };
50 partition@10000 {
51 label = "u-boot";
52 reg = <0x10000 0x40000>;
53 };
54 partition@50000 {
55 label = "linux";
56 reg = <0x50000 0x2c0000>;
57 };
58 partition@310000 {
59 label = "rootfs";
60 reg = <0x310000 0x4f0000>;
61 };
62 };
63 };
64
36 apb { 65 apb {
37 serial@d0000000 { 66 serial@d0000000 {
38 status = "okay"; 67 status = "okay";
diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index d777e3a6f178..089f0a42c50e 100644
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -177,6 +177,12 @@
177 interrupts = <28>; 177 interrupts = <28>;
178 status = "disabled"; 178 status = "disabled";
179 }; 179 };
180
181 timer@f0000000 {
182 compatible = "st,spear-timer";
183 reg = <0xf0000000 0x400>;
184 interrupts = <16>;
185 };
180 }; 186 };
181 }; 187 };
182}; 188};
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-10 08:21:17 -0400