diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 09:44:11 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 09:44:11 -0500 |
commit | a44dca1717ce2c2381339e21c07d1731a63a7888 (patch) | |
tree | 3d0b3bd26492f9fa1f1f1c1ad838315b266da7c1 /arch/arm/boot/dts/spear1310-evb.dts | |
parent | 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 (diff) | |
parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) |
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits)
Linux 3.8-rc1
Revert "nfsd: warn on odd reply state in nfsd_vfs_read"
ARM: dts: fix duplicated build target and alphabetical sort out for exynos
dm stripe: add WRITE SAME support
dm: remove map_info
dm snapshot: do not use map_context
dm thin: dont use map_context
dm raid1: dont use map_context
dm flakey: dont use map_context
dm raid1: rename read_record to bio_record
dm: move target request nr to dm_target_io
dm snapshot: use per_bio_data
dm verity: use per_bio_data
dm raid1: use per_bio_data
dm: introduce per_bio_data
dm kcopyd: add WRITE SAME support to dm_kcopyd_zero
dm linear: add WRITE SAME support
dm: add WRITE SAME support
dm: prepare to support WRITE SAME
dm ioctl: use kmalloc if possible
...
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/boot/dts/spear1310-evb.dts')
-rw-r--r-- | arch/arm/boot/dts/spear1310-evb.dts | 165 |
1 files changed, 148 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts index dd4358bc26e2..b56a801e42a2 100644 --- a/arch/arm/boot/dts/spear1310-evb.dts +++ b/arch/arm/boot/dts/spear1310-evb.dts | |||
@@ -30,10 +30,14 @@ | |||
30 | pinctrl-0 = <&state_default>; | 30 | pinctrl-0 = <&state_default>; |
31 | 31 | ||
32 | state_default: pinmux { | 32 | state_default: pinmux { |
33 | i2c0-pmx { | 33 | i2c0 { |
34 | st,pins = "i2c0_grp"; | 34 | st,pins = "i2c0_grp"; |
35 | st,function = "i2c0"; | 35 | st,function = "i2c0"; |
36 | }; | 36 | }; |
37 | i2s0 { | ||
38 | st,pins = "i2s0_grp"; | ||
39 | st,function = "i2s0"; | ||
40 | }; | ||
37 | i2s1 { | 41 | i2s1 { |
38 | st,pins = "i2s1_grp"; | 42 | st,pins = "i2s1_grp"; |
39 | st,function = "i2s1"; | 43 | st,function = "i2s1"; |
@@ -42,6 +46,10 @@ | |||
42 | st,pins = "arm_gpio_grp"; | 46 | st,pins = "arm_gpio_grp"; |
43 | st,function = "arm_gpio"; | 47 | st,function = "arm_gpio"; |
44 | }; | 48 | }; |
49 | clcd { | ||
50 | st,pins = "clcd_grp" , "clcd_high_res"; | ||
51 | st,function = "clcd"; | ||
52 | }; | ||
45 | eth { | 53 | eth { |
46 | st,pins = "gmii_grp"; | 54 | st,pins = "gmii_grp"; |
47 | st,function = "gmii"; | 55 | st,function = "gmii"; |
@@ -74,11 +82,6 @@ | |||
74 | st,pins = "i2c_1_2_grp"; | 82 | st,pins = "i2c_1_2_grp"; |
75 | st,function = "i2c_1_2"; | 83 | st,function = "i2c_1_2"; |
76 | }; | 84 | }; |
77 | pci { | ||
78 | st,pins = "pcie0_grp","pcie1_grp", | ||
79 | "pcie2_grp"; | ||
80 | st,function = "pci"; | ||
81 | }; | ||
82 | smii { | 85 | smii { |
83 | st,pins = "smii_0_1_2_grp"; | 86 | st,pins = "smii_0_1_2_grp"; |
84 | st,function = "smii_0_1_2"; | 87 | st,function = "smii_0_1_2"; |
@@ -88,6 +91,14 @@ | |||
88 | "nand_16bit_grp"; | 91 | "nand_16bit_grp"; |
89 | st,function = "nand"; | 92 | st,function = "nand"; |
90 | }; | 93 | }; |
94 | sata { | ||
95 | st,pins = "sata0_grp"; | ||
96 | st,function = "sata"; | ||
97 | }; | ||
98 | pcie { | ||
99 | st,pins = "pcie1_grp", "pcie2_grp"; | ||
100 | st,function = "pci_express"; | ||
101 | }; | ||
91 | }; | 102 | }; |
92 | }; | 103 | }; |
93 | 104 | ||
@@ -109,9 +120,49 @@ | |||
109 | 120 | ||
110 | fsmc: flash@b0000000 { | 121 | fsmc: flash@b0000000 { |
111 | status = "okay"; | 122 | status = "okay"; |
123 | |||
124 | partition@0 { | ||
125 | label = "xloader"; | ||
126 | reg = <0x0 0x80000>; | ||
127 | }; | ||
128 | partition@80000 { | ||
129 | label = "u-boot"; | ||
130 | reg = <0x80000 0x140000>; | ||
131 | }; | ||
132 | partition@1C0000 { | ||
133 | label = "environment"; | ||
134 | reg = <0x1C0000 0x40000>; | ||
135 | }; | ||
136 | partition@200000 { | ||
137 | label = "dtb"; | ||
138 | reg = <0x200000 0x40000>; | ||
139 | }; | ||
140 | partition@240000 { | ||
141 | label = "linux"; | ||
142 | reg = <0x240000 0xC00000>; | ||
143 | }; | ||
144 | partition@E40000 { | ||
145 | label = "rootfs"; | ||
146 | reg = <0xE40000 0x0>; | ||
147 | }; | ||
148 | }; | ||
149 | |||
150 | gpio_keys { | ||
151 | compatible = "gpio-keys"; | ||
152 | #address-cells = <1>; | ||
153 | #size-cells = <0>; | ||
154 | |||
155 | button@1 { | ||
156 | label = "wakeup"; | ||
157 | linux,code = <0x100>; | ||
158 | gpios = <&gpio0 7 0x4>; | ||
159 | debounce-interval = <20>; | ||
160 | gpio-key,wakeup = <1>; | ||
161 | }; | ||
112 | }; | 162 | }; |
113 | 163 | ||
114 | gmac0: eth@e2000000 { | 164 | gmac0: eth@e2000000 { |
165 | phy-mode = "gmii"; | ||
115 | status = "okay"; | 166 | status = "okay"; |
116 | }; | 167 | }; |
117 | 168 | ||
@@ -135,23 +186,27 @@ | |||
135 | }; | 186 | }; |
136 | partition@10000 { | 187 | partition@10000 { |
137 | label = "u-boot"; | 188 | label = "u-boot"; |
138 | reg = <0x10000 0x40000>; | 189 | reg = <0x10000 0x50000>; |
190 | }; | ||
191 | partition@60000 { | ||
192 | label = "environment"; | ||
193 | reg = <0x60000 0x10000>; | ||
139 | }; | 194 | }; |
140 | partition@50000 { | 195 | partition@70000 { |
196 | label = "dtb"; | ||
197 | reg = <0x70000 0x10000>; | ||
198 | }; | ||
199 | partition@80000 { | ||
141 | label = "linux"; | 200 | label = "linux"; |
142 | reg = <0x50000 0x2c0000>; | 201 | reg = <0x80000 0x310000>; |
143 | }; | 202 | }; |
144 | partition@310000 { | 203 | partition@390000 { |
145 | label = "rootfs"; | 204 | label = "rootfs"; |
146 | reg = <0x310000 0x4f0000>; | 205 | reg = <0x390000 0x0>; |
147 | }; | 206 | }; |
148 | }; | 207 | }; |
149 | }; | 208 | }; |
150 | 209 | ||
151 | spi0: spi@e0100000 { | ||
152 | status = "okay"; | ||
153 | }; | ||
154 | |||
155 | ehci@e4800000 { | 210 | ehci@e4800000 { |
156 | status = "okay"; | 211 | status = "okay"; |
157 | }; | 212 | }; |
@@ -181,11 +236,11 @@ | |||
181 | status = "okay"; | 236 | status = "okay"; |
182 | }; | 237 | }; |
183 | 238 | ||
184 | i2c0: i2c@e0280000 { | 239 | gpio@d8400000 { |
185 | status = "okay"; | 240 | status = "okay"; |
186 | }; | 241 | }; |
187 | 242 | ||
188 | i2c1: i2c@5cd00000 { | 243 | i2c0: i2c@e0280000 { |
189 | status = "okay"; | 244 | status = "okay"; |
190 | }; | 245 | }; |
191 | 246 | ||
@@ -273,6 +328,7 @@ | |||
273 | 0x08080052 >; | 328 | 0x08080052 >; |
274 | autorepeat; | 329 | autorepeat; |
275 | st,mode = <0>; | 330 | st,mode = <0>; |
331 | suspended_rate = <2000000>; | ||
276 | status = "okay"; | 332 | status = "okay"; |
277 | }; | 333 | }; |
278 | 334 | ||
@@ -282,6 +338,81 @@ | |||
282 | 338 | ||
283 | serial@e0000000 { | 339 | serial@e0000000 { |
284 | status = "okay"; | 340 | status = "okay"; |
341 | pinctrl-names = "default"; | ||
342 | pinctrl-0 = <>; | ||
343 | }; | ||
344 | |||
345 | spi0: spi@e0100000 { | ||
346 | status = "okay"; | ||
347 | num-cs = <3>; | ||
348 | cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>; | ||
349 | |||
350 | stmpe610@0 { | ||
351 | compatible = "st,stmpe610"; | ||
352 | reg = <0>; | ||
353 | #address-cells = <1>; | ||
354 | #size-cells = <0>; | ||
355 | spi-max-frequency = <1000000>; | ||
356 | spi-cpha; | ||
357 | pl022,hierarchy = <0>; | ||
358 | pl022,interface = <0>; | ||
359 | pl022,slave-tx-disable; | ||
360 | pl022,com-mode = <0>; | ||
361 | pl022,rx-level-trig = <0>; | ||
362 | pl022,tx-level-trig = <0>; | ||
363 | pl022,ctrl-len = <0x7>; | ||
364 | pl022,wait-state = <0>; | ||
365 | pl022,duplex = <0>; | ||
366 | interrupts = <6 0x4>; | ||
367 | interrupt-parent = <&gpio1>; | ||
368 | irq-trigger = <0x2>; | ||
369 | |||
370 | stmpe_touchscreen { | ||
371 | compatible = "st,stmpe-ts"; | ||
372 | ts,sample-time = <4>; | ||
373 | ts,mod-12b = <1>; | ||
374 | ts,ref-sel = <0>; | ||
375 | ts,adc-freq = <1>; | ||
376 | ts,ave-ctrl = <1>; | ||
377 | ts,touch-det-delay = <2>; | ||
378 | ts,settling = <2>; | ||
379 | ts,fraction-z = <7>; | ||
380 | ts,i-drive = <1>; | ||
381 | }; | ||
382 | }; | ||
383 | |||
384 | m25p80@1 { | ||
385 | compatible = "st,m25p80"; | ||
386 | reg = <1>; | ||
387 | spi-max-frequency = <12000000>; | ||
388 | spi-cpol; | ||
389 | spi-cpha; | ||
390 | pl022,hierarchy = <0>; | ||
391 | pl022,interface = <0>; | ||
392 | pl022,slave-tx-disable; | ||
393 | pl022,com-mode = <0x2>; | ||
394 | pl022,rx-level-trig = <0>; | ||
395 | pl022,tx-level-trig = <0>; | ||
396 | pl022,ctrl-len = <0x11>; | ||
397 | pl022,wait-state = <0>; | ||
398 | pl022,duplex = <0>; | ||
399 | }; | ||
400 | |||
401 | spidev@2 { | ||
402 | compatible = "spidev"; | ||
403 | reg = <2>; | ||
404 | spi-max-frequency = <25000000>; | ||
405 | spi-cpha; | ||
406 | pl022,hierarchy = <0>; | ||
407 | pl022,interface = <0>; | ||
408 | pl022,slave-tx-disable; | ||
409 | pl022,com-mode = <0x2>; | ||
410 | pl022,rx-level-trig = <0>; | ||
411 | pl022,tx-level-trig = <0>; | ||
412 | pl022,ctrl-len = <0x11>; | ||
413 | pl022,wait-state = <0>; | ||
414 | pl022,duplex = <0>; | ||
415 | }; | ||
285 | }; | 416 | }; |
286 | 417 | ||
287 | wdt@ec800620 { | 418 | wdt@ec800620 { |