diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 16:44:47 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 17:55:29 -0400 |
commit | 704ef0bd237dfb4329e2d868a1c08c75602e31d9 (patch) | |
tree | c9b7d69d303f4695a84cbd8f0a169e45b53a0eae /arch/arm/boot | |
parent | cce9e45cfcefb53d48fbb24fe4bbb7469cc1f272 (diff) | |
parent | 599a136e5f4a7c3ca324fb2749ca235cd90c9d51 (diff) |
Merge tag 'mvebu-dt-3.16-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu DT changes for v3.16 (incremental #2)" from Jason Cooper:
- kirkwood
- add OpenRD boards
- make keymile boards bootable with latest kernels
- mvebu
- add ehci/xhci to Armada 375/38x boards
* tag 'mvebu-dt-3.16-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: kirkwood: add kirkwood-km_fixedeth DTS file
ARM: dts: kirkwood: add kirkwood-km_common DTSI files
ARM: dts: kirkwood: resynch 98dx4122 dtsi
ARM: mvebu: add Device Tree description for the EHCI controllers on Armada 375
ARM: mvebu: add Device Tree description of the xHCI controller on Armada 375
ARM: mvebu: add Device Tree description of the EHCI controller on Armada 38x
ARM: mvebu: add Device Tree description of xHCI controllers on Armada 38x
ARM: Kirkwood: DT versions of OpenRD boards
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-375-db.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 24 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-385-db.dts | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-385-rd.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 24 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 43 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-km_common.dtsi | 48 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-km_fixedeth.dts | 23 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 38 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-openrd-base.dts | 42 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-openrd-client.dts | 73 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-openrd-ultimate.dts | 58 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-openrd.dtsi | 90 |
14 files changed, 453 insertions, 37 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5f55146a4bad..881c8c47681d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -128,6 +128,9 @@ kirkwood := \ | |||
128 | kirkwood-nsa310a.dtb \ | 128 | kirkwood-nsa310a.dtb \ |
129 | kirkwood-openblocks_a6.dtb \ | 129 | kirkwood-openblocks_a6.dtb \ |
130 | kirkwood-openblocks_a7.dtb \ | 130 | kirkwood-openblocks_a7.dtb \ |
131 | kirkwood-openrd-base.dtb \ | ||
132 | kirkwood-openrd-client.dtb \ | ||
133 | kirkwood-openrd-ultimate.dtb \ | ||
131 | kirkwood-rd88f6192.dtb \ | 134 | kirkwood-rd88f6192.dtb \ |
132 | kirkwood-rd88f6281-a0.dtb \ | 135 | kirkwood-rd88f6281-a0.dtb \ |
133 | kirkwood-rd88f6281-a1.dtb \ | 136 | kirkwood-rd88f6281-a1.dtb \ |
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts index 2f26b963eee9..eb90b83d7d38 100644 --- a/arch/arm/boot/dts/armada-375-db.dts +++ b/arch/arm/boot/dts/armada-375-db.dts | |||
@@ -101,6 +101,14 @@ | |||
101 | }; | 101 | }; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | usb@54000 { | ||
105 | status = "okay"; | ||
106 | }; | ||
107 | |||
108 | usb3@58000 { | ||
109 | status = "okay"; | ||
110 | }; | ||
111 | |||
104 | mvsdio@d4000 { | 112 | mvsdio@d4000 { |
105 | pinctrl-0 = <&sdio_pins &sdio_st_pins>; | 113 | pinctrl-0 = <&sdio_pins &sdio_st_pins>; |
106 | pinctrl-names = "default"; | 114 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 3b6de4c0e379..fb92551a1e71 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi | |||
@@ -345,6 +345,30 @@ | |||
345 | reg = <0x21010 0x1c>; | 345 | reg = <0x21010 0x1c>; |
346 | }; | 346 | }; |
347 | 347 | ||
348 | usb@50000 { | ||
349 | compatible = "marvell,orion-ehci"; | ||
350 | reg = <0x50000 0x500>; | ||
351 | interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; | ||
352 | clocks = <&gateclk 18>; | ||
353 | status = "disabled"; | ||
354 | }; | ||
355 | |||
356 | usb@54000 { | ||
357 | compatible = "marvell,orion-ehci"; | ||
358 | reg = <0x54000 0x500>; | ||
359 | interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>; | ||
360 | clocks = <&gateclk 26>; | ||
361 | status = "disabled"; | ||
362 | }; | ||
363 | |||
364 | usb3@58000 { | ||
365 | compatible = "marvell,armada-375-xhci"; | ||
366 | reg = <0x58000 0x20000>,<0x5b880 0x80>; | ||
367 | interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; | ||
368 | clocks = <&gateclk 16>; | ||
369 | status = "disabled"; | ||
370 | }; | ||
371 | |||
348 | xor@60800 { | 372 | xor@60800 { |
349 | compatible = "marvell,orion-xor"; | 373 | compatible = "marvell,orion-xor"; |
350 | reg = <0x60800 0x100 | 374 | reg = <0x60800 0x100 |
diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts index 7fcbc0d2a85f..ff9637dd8d0f 100644 --- a/arch/arm/boot/dts/armada-385-db.dts +++ b/arch/arm/boot/dts/armada-385-db.dts | |||
@@ -64,6 +64,10 @@ | |||
64 | phy-mode = "rgmii-id"; | 64 | phy-mode = "rgmii-id"; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | usb@50000 { | ||
68 | status = "ok"; | ||
69 | }; | ||
70 | |||
67 | ethernet@70000 { | 71 | ethernet@70000 { |
68 | status = "okay"; | 72 | status = "okay"; |
69 | phy = <&phy0>; | 73 | phy = <&phy0>; |
@@ -116,6 +120,14 @@ | |||
116 | bus-width = <8>; | 120 | bus-width = <8>; |
117 | status = "okay"; | 121 | status = "okay"; |
118 | }; | 122 | }; |
123 | |||
124 | usb3@f0000 { | ||
125 | status = "okay"; | ||
126 | }; | ||
127 | |||
128 | usb3@f8000 { | ||
129 | status = "okay"; | ||
130 | }; | ||
119 | }; | 131 | }; |
120 | 132 | ||
121 | pcie-controller { | 133 | pcie-controller { |
diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts index 4b39bed4ed07..40893255a3f0 100644 --- a/arch/arm/boot/dts/armada-385-rd.dts +++ b/arch/arm/boot/dts/armada-385-rd.dts | |||
@@ -76,6 +76,10 @@ | |||
76 | reg = <1>; | 76 | reg = <1>; |
77 | }; | 77 | }; |
78 | }; | 78 | }; |
79 | |||
80 | usb3@f0000 { | ||
81 | status = "okay"; | ||
82 | }; | ||
79 | }; | 83 | }; |
80 | 84 | ||
81 | pcie-controller { | 85 | pcie-controller { |
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 6ee59a344089..3de364e81b52 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
@@ -312,6 +312,14 @@ | |||
312 | status = "disabled"; | 312 | status = "disabled"; |
313 | }; | 313 | }; |
314 | 314 | ||
315 | usb@50000 { | ||
316 | compatible = "marvell,orion-ehci"; | ||
317 | reg = <0x58000 0x500>; | ||
318 | interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>; | ||
319 | clocks = <&gateclk 18>; | ||
320 | status = "disabled"; | ||
321 | }; | ||
322 | |||
315 | xor@60800 { | 323 | xor@60800 { |
316 | compatible = "marvell,orion-xor"; | 324 | compatible = "marvell,orion-xor"; |
317 | reg = <0x60800 0x100 | 325 | reg = <0x60800 0x100 |
@@ -416,6 +424,22 @@ | |||
416 | mrvl,clk-delay-cycles = <0x1F>; | 424 | mrvl,clk-delay-cycles = <0x1F>; |
417 | status = "disabled"; | 425 | status = "disabled"; |
418 | }; | 426 | }; |
427 | |||
428 | usb3@f0000 { | ||
429 | compatible = "marvell,armada-380-xhci"; | ||
430 | reg = <0xf0000 0x4000>,<0xf4000 0x4000>; | ||
431 | interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; | ||
432 | clocks = <&gateclk 9>; | ||
433 | status = "disabled"; | ||
434 | }; | ||
435 | |||
436 | usb3@f8000 { | ||
437 | compatible = "marvell,armada-380-xhci"; | ||
438 | reg = <0xf8000 0x4000>,<0xfc000 0x4000>; | ||
439 | interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; | ||
440 | clocks = <&gateclk 10>; | ||
441 | status = "disabled"; | ||
442 | }; | ||
419 | }; | 443 | }; |
420 | }; | 444 | }; |
421 | 445 | ||
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi index 2e8e412b9db0..9e1f741d74ff 100644 --- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi | |||
@@ -1,4 +1,39 @@ | |||
1 | / { | 1 | / { |
2 | mbus { | ||
3 | pciec: pcie-controller { | ||
4 | compatible = "marvell,kirkwood-pcie"; | ||
5 | status = "disabled"; | ||
6 | device_type = "pci"; | ||
7 | |||
8 | #address-cells = <3>; | ||
9 | #size-cells = <2>; | ||
10 | |||
11 | bus-range = <0x00 0xff>; | ||
12 | |||
13 | ranges = | ||
14 | <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000 | ||
15 | 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */ | ||
16 | 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>; | ||
17 | |||
18 | pcie0: pcie@1,0 { | ||
19 | device_type = "pci"; | ||
20 | assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>; | ||
21 | reg = <0x0800 0 0 0 0>; | ||
22 | #address-cells = <3>; | ||
23 | #size-cells = <2>; | ||
24 | #interrupt-cells = <1>; | ||
25 | ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0 | ||
26 | 0x81000000 0 0 0x81000000 0x1 0 1 0>; | ||
27 | interrupt-map-mask = <0 0 0 0>; | ||
28 | interrupt-map = <0 0 0 0 &intc 9>; | ||
29 | marvell,pcie-port = <0>; | ||
30 | marvell,pcie-lane = <0>; | ||
31 | clocks = <&gate_clk 2>; | ||
32 | status = "disabled"; | ||
33 | }; | ||
34 | }; | ||
35 | }; | ||
36 | |||
2 | ocp@f1000000 { | 37 | ocp@f1000000 { |
3 | pinctrl: pin-controller@10000 { | 38 | pinctrl: pin-controller@10000 { |
4 | compatible = "marvell,98dx4122-pinctrl"; | 39 | compatible = "marvell,98dx4122-pinctrl"; |
@@ -6,3 +41,11 @@ | |||
6 | }; | 41 | }; |
7 | }; | 42 | }; |
8 | }; | 43 | }; |
44 | |||
45 | &sata_phy0 { | ||
46 | status = "disabled"; | ||
47 | }; | ||
48 | |||
49 | &sata_phy1 { | ||
50 | status = "disabled"; | ||
51 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood-km_common.dtsi b/arch/arm/boot/dts/kirkwood-km_common.dtsi new file mode 100644 index 000000000000..8367c772c764 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-km_common.dtsi | |||
@@ -0,0 +1,48 @@ | |||
1 | / { | ||
2 | chosen { | ||
3 | bootargs = "console=ttyS0,115200n8 earlyprintk"; | ||
4 | stdout-path = &uart0; | ||
5 | }; | ||
6 | |||
7 | mbus { | ||
8 | pcie-controller { | ||
9 | status = "okay"; | ||
10 | |||
11 | pcie@1,0 { | ||
12 | status = "okay"; | ||
13 | }; | ||
14 | }; | ||
15 | }; | ||
16 | |||
17 | ocp@f1000000 { | ||
18 | pinctrl: pin-controller@10000 { | ||
19 | pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >; | ||
20 | pinctrl-names = "default"; | ||
21 | |||
22 | pmx_i2c_gpio_sda: pmx-gpio-sda { | ||
23 | marvell,pins = "mpp8"; | ||
24 | marvell,function = "gpio"; | ||
25 | }; | ||
26 | pmx_i2c_gpio_scl: pmx-gpio-scl { | ||
27 | marvell,pins = "mpp9"; | ||
28 | marvell,function = "gpio"; | ||
29 | }; | ||
30 | }; | ||
31 | |||
32 | serial@12000 { | ||
33 | status = "okay"; | ||
34 | }; | ||
35 | }; | ||
36 | |||
37 | i2c@0 { | ||
38 | compatible = "i2c-gpio"; | ||
39 | gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */ | ||
40 | &gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */ | ||
41 | i2c-gpio,delay-us = <2>; /* ~100 kHz */ | ||
42 | }; | ||
43 | }; | ||
44 | |||
45 | &nand { | ||
46 | status = "okay"; | ||
47 | chip-delay = <25>; | ||
48 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood-km_fixedeth.dts b/arch/arm/boot/dts/kirkwood-km_fixedeth.dts new file mode 100644 index 000000000000..9895f2b10f8a --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-km_fixedeth.dts | |||
@@ -0,0 +1,23 @@ | |||
1 | /dts-v1/; | ||
2 | |||
3 | #include "kirkwood.dtsi" | ||
4 | #include "kirkwood-98dx4122.dtsi" | ||
5 | #include "kirkwood-km_common.dtsi" | ||
6 | |||
7 | / { | ||
8 | model = "Keymile Kirkwood Fixed Eth"; | ||
9 | compatible = "keymile,km_fixedeth", "marvell,kirkwood-98DX4122", "marvell,kirkwood"; | ||
10 | |||
11 | memory { | ||
12 | device_type = "memory"; | ||
13 | reg = <0x00000000 0x10000000>; | ||
14 | }; | ||
15 | }; | ||
16 | |||
17 | ð0 { | ||
18 | status = "okay"; | ||
19 | ethernet0-port@0 { | ||
20 | speed = <1000>; /* <SPEED_1000> */ | ||
21 | duplex = <1>; /* <DUPLEX_FULL> */ | ||
22 | }; | ||
23 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts index 61139bf30985..235bf382fff9 100644 --- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts +++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | #include "kirkwood.dtsi" | 3 | #include "kirkwood.dtsi" |
4 | #include "kirkwood-98dx4122.dtsi" | 4 | #include "kirkwood-98dx4122.dtsi" |
5 | #include "kirkwood-km_common.dtsi" | ||
5 | 6 | ||
6 | / { | 7 | / { |
7 | model = "Keymile Kirkwood Reference Design"; | 8 | model = "Keymile Kirkwood Reference Design"; |
@@ -11,43 +12,6 @@ | |||
11 | device_type = "memory"; | 12 | device_type = "memory"; |
12 | reg = <0x00000000 0x08000000>; | 13 | reg = <0x00000000 0x08000000>; |
13 | }; | 14 | }; |
14 | |||
15 | chosen { | ||
16 | bootargs = "console=ttyS0,115200n8 earlyprintk"; | ||
17 | stdout-path = &uart0; | ||
18 | }; | ||
19 | |||
20 | ocp@f1000000 { | ||
21 | pinctrl: pin-controller@10000 { | ||
22 | pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >; | ||
23 | pinctrl-names = "default"; | ||
24 | |||
25 | pmx_i2c_gpio_sda: pmx-gpio-sda { | ||
26 | marvell,pins = "mpp8"; | ||
27 | marvell,function = "gpio"; | ||
28 | }; | ||
29 | pmx_i2c_gpio_scl: pmx-gpio-scl { | ||
30 | marvell,pins = "mpp9"; | ||
31 | marvell,function = "gpio"; | ||
32 | }; | ||
33 | }; | ||
34 | |||
35 | serial@12000 { | ||
36 | status = "ok"; | ||
37 | }; | ||
38 | }; | ||
39 | |||
40 | i2c@0 { | ||
41 | compatible = "i2c-gpio"; | ||
42 | gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */ | ||
43 | &gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */ | ||
44 | i2c-gpio,delay-us = <2>; /* ~100 kHz */ | ||
45 | }; | ||
46 | }; | ||
47 | |||
48 | &nand { | ||
49 | status = "okay"; | ||
50 | chip-delay = <25>; | ||
51 | }; | 15 | }; |
52 | 16 | ||
53 | &mdio { | 17 | &mdio { |
diff --git a/arch/arm/boot/dts/kirkwood-openrd-base.dts b/arch/arm/boot/dts/kirkwood-openrd-base.dts new file mode 100644 index 000000000000..8af58999606d --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-openrd-base.dts | |||
@@ -0,0 +1,42 @@ | |||
1 | /* | ||
2 | * Marvell OpenRD Base Board Description | ||
3 | * | ||
4 | * Andrew Lunn <andrew@lunn.ch> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | * | ||
10 | * This file contains the definitions that are specific to OpenRD | ||
11 | * base variant of the Marvell Kirkwood Development Board. | ||
12 | */ | ||
13 | |||
14 | /dts-v1/; | ||
15 | |||
16 | #include "kirkwood-openrd.dtsi" | ||
17 | |||
18 | / { | ||
19 | model = "OpenRD Base"; | ||
20 | compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood"; | ||
21 | |||
22 | ocp@f1000000 { | ||
23 | serial@12100 { | ||
24 | status = "okay"; | ||
25 | }; | ||
26 | }; | ||
27 | }; | ||
28 | |||
29 | &mdio { | ||
30 | status = "okay"; | ||
31 | |||
32 | ethphy0: ethernet-phy@8 { | ||
33 | reg = <8>; | ||
34 | }; | ||
35 | }; | ||
36 | |||
37 | ð0 { | ||
38 | status = "okay"; | ||
39 | ethernet0-port@0 { | ||
40 | phy-handle = <ðphy0>; | ||
41 | }; | ||
42 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts new file mode 100644 index 000000000000..887b9c1fee43 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts | |||
@@ -0,0 +1,73 @@ | |||
1 | /* | ||
2 | * Marvell OpenRD Client Board Description | ||
3 | * | ||
4 | * Andrew Lunn <andrew@lunn.ch> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | * | ||
10 | * This file contains the definitions that are specific to OpenRD | ||
11 | * client variant of the Marvell Kirkwood Development Board. | ||
12 | */ | ||
13 | |||
14 | /dts-v1/; | ||
15 | |||
16 | #include "kirkwood-openrd.dtsi" | ||
17 | |||
18 | / { | ||
19 | model = "OpenRD Client"; | ||
20 | compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood"; | ||
21 | |||
22 | ocp@f1000000 { | ||
23 | i2c@11000 { | ||
24 | status = "okay"; | ||
25 | clock-frequency = <400000>; | ||
26 | |||
27 | cs42l51: cs42l51@4a { | ||
28 | compatible = "cirrus,cs42l51"; | ||
29 | reg = <0x4a>; | ||
30 | }; | ||
31 | }; | ||
32 | }; | ||
33 | |||
34 | sound { | ||
35 | compatible = "simple-audio-card"; | ||
36 | simple-audio-card,format = "i2s"; | ||
37 | simple-audio-card,mclk-fs = <256>; | ||
38 | |||
39 | simple-audio-card,cpu { | ||
40 | sound-dai = <&audio0>; | ||
41 | }; | ||
42 | |||
43 | simple-audio-card,codec { | ||
44 | sound-dai = <&cs42l51>; | ||
45 | }; | ||
46 | }; | ||
47 | }; | ||
48 | |||
49 | &mdio { | ||
50 | status = "okay"; | ||
51 | |||
52 | ethphy0: ethernet-phy@8 { | ||
53 | reg = <8>; | ||
54 | }; | ||
55 | ethphy1: ethernet-phy@24 { | ||
56 | reg = <24>; | ||
57 | }; | ||
58 | }; | ||
59 | |||
60 | ð0 { | ||
61 | status = "okay"; | ||
62 | ethernet0-port@0 { | ||
63 | phy-handle = <ðphy0>; | ||
64 | }; | ||
65 | }; | ||
66 | |||
67 | ð1 { | ||
68 | status = "okay"; | ||
69 | ethernet1-port@0 { | ||
70 | phy-handle = <ðphy1>; | ||
71 | }; | ||
72 | }; | ||
73 | |||
diff --git a/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts new file mode 100644 index 000000000000..9f12f8b53e24 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts | |||
@@ -0,0 +1,58 @@ | |||
1 | /* | ||
2 | * Marvell OpenRD Ultimate Board Description | ||
3 | * | ||
4 | * Andrew Lunn <andrew@lunn.ch> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | * | ||
10 | * This file contains the definitions that are specific to OpenRD | ||
11 | * ultimate variant of the Marvell Kirkwood Development Board. | ||
12 | */ | ||
13 | |||
14 | /dts-v1/; | ||
15 | |||
16 | #include "kirkwood-openrd.dtsi" | ||
17 | |||
18 | / { | ||
19 | model = "OpenRD Ultimate"; | ||
20 | compatible = "marvell,openrd-ultimate", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood"; | ||
21 | |||
22 | ocp@f1000000 { | ||
23 | i2c@11000 { | ||
24 | status = "okay"; | ||
25 | clock-frequency = <400000>; | ||
26 | |||
27 | cs42l51: cs42l51@4a { | ||
28 | compatible = "cirrus,cs42l51"; | ||
29 | reg = <0x4a>; | ||
30 | }; | ||
31 | }; | ||
32 | }; | ||
33 | }; | ||
34 | |||
35 | &mdio { | ||
36 | status = "okay"; | ||
37 | |||
38 | ethphy0: ethernet-phy@0 { | ||
39 | reg = <0>; | ||
40 | }; | ||
41 | ethphy1: ethernet-phy@1 { | ||
42 | reg = <1>; | ||
43 | }; | ||
44 | }; | ||
45 | |||
46 | ð0 { | ||
47 | status = "okay"; | ||
48 | ethernet0-port@0 { | ||
49 | phy-handle = <ðphy0>; | ||
50 | }; | ||
51 | }; | ||
52 | |||
53 | ð1 { | ||
54 | status = "okay"; | ||
55 | ethernet1-port@0 { | ||
56 | phy-handle = <ðphy1>; | ||
57 | }; | ||
58 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi new file mode 100644 index 000000000000..d3330dadf7ed --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi | |||
@@ -0,0 +1,90 @@ | |||
1 | /* | ||
2 | * Marvell OpenRD (Base|Client|Ultimate) Board Description | ||
3 | * | ||
4 | * Andrew Lunn <andrew@lunn.ch> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | * | ||
10 | * This file contains the definitions that are common between the three | ||
11 | * variants of the Marvell Kirkwood Development Board. | ||
12 | */ | ||
13 | |||
14 | #include "kirkwood.dtsi" | ||
15 | #include "kirkwood-6281.dtsi" | ||
16 | |||
17 | / { | ||
18 | memory { | ||
19 | device_type = "memory"; | ||
20 | reg = <0x00000000 0x20000000>; | ||
21 | }; | ||
22 | |||
23 | chosen { | ||
24 | bootargs = "console=ttyS0,115200n8"; | ||
25 | stdout-path = &uart0; | ||
26 | }; | ||
27 | |||
28 | mbus { | ||
29 | pcie-controller { | ||
30 | status = "okay"; | ||
31 | |||
32 | pcie@1,0 { | ||
33 | status = "okay"; | ||
34 | }; | ||
35 | }; | ||
36 | }; | ||
37 | |||
38 | ocp@f1000000 { | ||
39 | pinctrl: pin-controller@10000 { | ||
40 | pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>; | ||
41 | pinctrl-names = "default"; | ||
42 | |||
43 | pmx_select28: pmx-select-uart-sd { | ||
44 | marvell,pins = "mpp28"; | ||
45 | marvell,function = "gpio"; | ||
46 | }; | ||
47 | pmx_sdio_cd: pmx-sdio-cd { | ||
48 | marvell,pins = "mpp29"; | ||
49 | marvell,function = "gpio"; | ||
50 | }; | ||
51 | pmx_select34: pmx-select-rs232-rs484 { | ||
52 | marvell,pins = "mpp34"; | ||
53 | marvell,function = "gpio"; | ||
54 | }; | ||
55 | }; | ||
56 | serial@12000 { | ||
57 | status = "okay"; | ||
58 | |||
59 | }; | ||
60 | sata@80000 { | ||
61 | status = "okay"; | ||
62 | nr-ports = <2>; | ||
63 | }; | ||
64 | mvsdio@90000 { | ||
65 | status = "okay"; | ||
66 | cd-gpios = <&gpio0 29 9>; | ||
67 | }; | ||
68 | }; | ||
69 | }; | ||
70 | |||
71 | &nand { | ||
72 | status = "okay"; | ||
73 | pinctrl-0 = <&pmx_nand>; | ||
74 | pinctrl-names = "default"; | ||
75 | |||
76 | partition@0 { | ||
77 | label = "u-boot"; | ||
78 | reg = <0x0000000 0x100000>; | ||
79 | }; | ||
80 | |||
81 | partition@100000 { | ||
82 | label = "uImage"; | ||
83 | reg = <0x0100000 0x400000>; | ||
84 | }; | ||
85 | |||
86 | partition@600000 { | ||
87 | label = "root"; | ||
88 | reg = <0x0600000 0x1FA00000>; | ||
89 | }; | ||
90 | }; | ||