aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/armada-370-netgear-rn102.dts5
-rw-r--r--arch/arm/boot/dts/armada-370-netgear-rn104.dts5
-rw-r--r--arch/arm/boot/dts/armada-xp-netgear-rn2120.dts5
-rw-r--r--arch/arm/boot/dts/armada-xp.dtsi2
-rw-r--r--arch/arm/boot/dts/dove.dtsi11
-rw-r--r--arch/arm/boot/dts/kirkwood-6192.dtsi107
-rw-r--r--arch/arm/boot/dts/kirkwood-6281.dtsi2
-rw-r--r--arch/arm/boot/dts/kirkwood-6282.dtsi37
-rw-r--r--arch/arm/boot/dts/kirkwood-laplug.dts175
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi18
11 files changed, 349 insertions, 19 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 25d708c47eb5..2752a13f1b60 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
88 kirkwood-iomega_ix2_200.dtb \ 88 kirkwood-iomega_ix2_200.dtb \
89 kirkwood-is2.dtb \ 89 kirkwood-is2.dtb \
90 kirkwood-km_kirkwood.dtb \ 90 kirkwood-km_kirkwood.dtb \
91 kirkwood-laplug.dtb \
91 kirkwood-lschlv2.dtb \ 92 kirkwood-lschlv2.dtb \
92 kirkwood-lsxhl.dtb \ 93 kirkwood-lsxhl.dtb \
93 kirkwood-mplcec4.dtb \ 94 kirkwood-mplcec4.dtb \
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index 6a7383f24c7c..651aeb5ef439 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -122,6 +122,11 @@
122 clock-frequency = <100000>; 122 clock-frequency = <100000>;
123 status = "okay"; 123 status = "okay";
124 124
125 isl12057: isl12057@68 {
126 compatible = "isl,isl12057";
127 reg = <0x68>;
128 };
129
125 g762: g762@3e { 130 g762: g762@3e {
126 compatible = "gmt,g762"; 131 compatible = "gmt,g762";
127 reg = <0x3e>; 132 reg = <0x3e>;
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index 272e2e2fc58f..4e27587667bf 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -117,6 +117,11 @@
117 clock-frequency = <100000>; 117 clock-frequency = <100000>;
118 status = "okay"; 118 status = "okay";
119 119
120 isl12057: isl12057@68 {
121 compatible = "isl,isl12057";
122 reg = <0x68>;
123 };
124
120 g762: g762@3e { 125 g762: g762@3e {
121 compatible = "gmt,g762"; 126 compatible = "gmt,g762";
122 reg = <0x3e>; 127 reg = <0x3e>;
diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index f048b4ee4d52..ff049ee862eb 100644
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -174,6 +174,11 @@
174 clock-frequency = <400000>; 174 clock-frequency = <400000>;
175 status = "okay"; 175 status = "okay";
176 176
177 isl12057: isl12057@68 {
178 compatible = "isl,isl12057";
179 reg = <0x68>;
180 };
181
177 /* Controller for rear fan #1 of 3 (Protechnic 182 /* Controller for rear fan #1 of 3 (Protechnic
178 * MGT4012XB-O20, 8000RPM) near eSATA port */ 183 * MGT4012XB-O20, 8000RPM) near eSATA port */
179 g762_fan1: g762@3e { 184 g762_fan1: g762@3e {
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 4919fb82ac62..b8b84a22f0f3 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -113,7 +113,7 @@
113 113
114 armada-370-xp-pmsu@22000 { 114 armada-370-xp-pmsu@22000 {
115 compatible = "marvell,armada-370-xp-pmsu"; 115 compatible = "marvell,armada-370-xp-pmsu";
116 reg = <0x22100 0x430>, <0x20800 0x20>; 116 reg = <0x22100 0x400>, <0x20800 0x20>;
117 }; 117 };
118 118
119 eth2: ethernet@30000 { 119 eth2: ethernet@30000 {
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 852db2860015..8de1031233ae 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -336,10 +336,21 @@
336 reg = <0xa0000 0x2400>; 336 reg = <0xa0000 0x2400>;
337 interrupts = <62>; 337 interrupts = <62>;
338 clocks = <&gate_clk 3>; 338 clocks = <&gate_clk 3>;
339 phys = <&sata_phy0>;
340 phy-names = "port0";
339 nr-ports = <1>; 341 nr-ports = <1>;
340 status = "disabled"; 342 status = "disabled";
341 }; 343 };
342 344
345 sata_phy0: sata-phy@a2000 {
346 compatible = "marvell,mvebu-sata-phy";
347 reg = <0xa2000 0x0334>;
348 clocks = <&gate_clk 3>;
349 clock-names = "sata";
350 #phy-cells = <0>;
351 status = "ok";
352 };
353
343 audio0: audio-controller@b0000 { 354 audio0: audio-controller@b0000 {
344 compatible = "marvell,dove-audio"; 355 compatible = "marvell,dove-audio";
345 reg = <0xb0000 0x2210>; 356 reg = <0xb0000 0x2210>;
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
new file mode 100644
index 000000000000..3916937d6818
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -0,0 +1,107 @@
1/ {
2 mbus {
3 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 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
37 ocp@f1000000 {
38 pinctrl: pinctrl@10000 {
39 compatible = "marvell,88f6192-pinctrl";
40 reg = <0x10000 0x20>;
41
42 pmx_nand: pmx-nand {
43 marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
44 "mpp4", "mpp5", "mpp18",
45 "mpp19";
46 marvell,function = "nand";
47 };
48 pmx_sata0: pmx-sata0 {
49 marvell,pins = "mpp5", "mpp21", "mpp23";
50 marvell,function = "sata0";
51 };
52 pmx_sata1: pmx-sata1 {
53 marvell,pins = "mpp4", "mpp20", "mpp22";
54 marvell,function = "sata1";
55 };
56 pmx_spi: pmx-spi {
57 marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
58 marvell,function = "spi";
59 };
60 pmx_twsi0: pmx-twsi0 {
61 marvell,pins = "mpp8", "mpp9";
62 marvell,function = "twsi0";
63 };
64 pmx_uart0: pmx-uart0 {
65 marvell,pins = "mpp10", "mpp11";
66 marvell,function = "uart0";
67 };
68 pmx_uart1: pmx-uart1 {
69 marvell,pins = "mpp13", "mpp14";
70 marvell,function = "uart1";
71 };
72 pmx_sdio: pmx-sdio {
73 marvell,pins = "mpp12", "mpp13", "mpp14",
74 "mpp15", "mpp16", "mpp17";
75 marvell,function = "sdio";
76 };
77 };
78
79 rtc@10300 {
80 compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
81 reg = <0x10300 0x20>;
82 interrupts = <53>;
83 clocks = <&gate_clk 7>;
84 };
85
86 sata@80000 {
87 compatible = "marvell,orion-sata";
88 reg = <0x80000 0x5000>;
89 interrupts = <21>;
90 clocks = <&gate_clk 14>, <&gate_clk 15>;
91 clock-names = "0", "1";
92 status = "disabled";
93 };
94
95 mvsdio@90000 {
96 compatible = "marvell,orion-sdio";
97 reg = <0x90000 0x200>;
98 interrupts = <28>;
99 clocks = <&gate_clk 4>;
100 bus-width = <4>;
101 cap-sdio-irq;
102 cap-sd-highspeed;
103 cap-mmc-highspeed;
104 status = "disabled";
105 };
106 };
107};
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index e4e1968dfca8..416d96e1302f 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -89,6 +89,8 @@
89 interrupts = <21>; 89 interrupts = <21>;
90 clocks = <&gate_clk 14>, <&gate_clk 15>; 90 clocks = <&gate_clk 14>, <&gate_clk 15>;
91 clock-names = "0", "1"; 91 clock-names = "0", "1";
92 phys = <&sata_phy0>, <&sata_phy1>;
93 phy-names = "port0", "port1";
92 status = "disabled"; 94 status = "disabled";
93 }; 95 };
94 96
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index f010c21220bf..2902e0d7971d 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -104,6 +104,12 @@
104 }; 104 };
105 }; 105 };
106 106
107 thermal@10078 {
108 compatible = "marvell,kirkwood-thermal";
109 reg = <0x10078 0x4>;
110 status = "okay";
111 };
112
107 rtc@10300 { 113 rtc@10300 {
108 compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; 114 compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
109 reg = <0x10300 0x20>; 115 reg = <0x10300 0x20>;
@@ -111,12 +117,25 @@
111 clocks = <&gate_clk 7>; 117 clocks = <&gate_clk 7>;
112 }; 118 };
113 119
120 i2c@11100 {
121 compatible = "marvell,mv64xxx-i2c";
122 reg = <0x11100 0x20>;
123 #address-cells = <1>;
124 #size-cells = <0>;
125 interrupts = <32>;
126 clock-frequency = <100000>;
127 clocks = <&gate_clk 7>;
128 status = "disabled";
129 };
130
114 sata@80000 { 131 sata@80000 {
115 compatible = "marvell,orion-sata"; 132 compatible = "marvell,orion-sata";
116 reg = <0x80000 0x5000>; 133 reg = <0x80000 0x5000>;
117 interrupts = <21>; 134 interrupts = <21>;
118 clocks = <&gate_clk 14>, <&gate_clk 15>; 135 clocks = <&gate_clk 14>, <&gate_clk 15>;
119 clock-names = "0", "1"; 136 clock-names = "0", "1";
137 phys = <&sata_phy0>, <&sata_phy1>;
138 phy-names = "port0", "port1";
120 status = "disabled"; 139 status = "disabled";
121 }; 140 };
122 141
@@ -133,23 +152,5 @@
133 cap-mmc-highspeed; 152 cap-mmc-highspeed;
134 status = "disabled"; 153 status = "disabled";
135 }; 154 };
136
137 thermal@10078 {
138 compatible = "marvell,kirkwood-thermal";
139 reg = <0x10078 0x4>;
140 status = "okay";
141 };
142
143 i2c@11100 {
144 compatible = "marvell,mv64xxx-i2c";
145 reg = <0x11100 0x20>;
146 #address-cells = <1>;
147 #size-cells = <0>;
148 interrupts = <32>;
149 clock-frequency = <100000>;
150 clocks = <&gate_clk 7>;
151 status = "disabled";
152 };
153
154 }; 155 };
155}; 156};
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
new file mode 100644
index 000000000000..c9e82eff9bf2
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -0,0 +1,175 @@
1/*
2 * Copyright (C) 2013 Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
3 *
4 * This file is licensed under the terms of the GNU General Public
5 * License version 2. This program is licensed "as is" without any
6 * warranty of any kind, whether express or implied.
7 */
8
9/dts-v1/;
10
11#include <dt-bindings/gpio/gpio.h>
12#include <dt-bindings/input/input.h>
13#include "kirkwood.dtsi"
14#include "kirkwood-6192.dtsi"
15
16/ {
17 model = "LaCie LaPlug";
18 compatible = "lacie,laplug", "marvell,kirkwood-88f6192", "marvell,kirkwood";
19
20 memory {
21 device_type = "memory";
22 reg = <0x00000000 0x8000000>; /* 128 MB */
23 };
24
25 chosen {
26 bootargs = "console=ttyS0,115200n8 earlyprintk";
27 };
28
29 mbus {
30 pcie-controller {
31 status = "okay";
32 pcie@1,0 {
33 status = "okay";
34 };
35 };
36 };
37
38 ocp@f1000000 {
39 serial@12000 {
40 pinctrl-0 = <&pmx_uart0>;
41 pinctrl-names = "default";
42 status = "okay";
43 };
44
45 i2c@11000 {
46 pinctrl-0 = <&pmx_twsi0>;
47 pinctrl-names = "default";
48 status = "okay";
49
50 eeprom@50 {
51 compatible = "at,24c04";
52 pagesize = <16>;
53 reg = <0x50>;
54 };
55 };
56
57 pinctrl: pinctrl@10000 {
58 pmx_usb_power_enable: pmx-usb-power-enable {
59 marvell,pins = "mpp14";
60 marvell,function = "gpio";
61 };
62 };
63 };
64
65 gpio_keys {
66 compatible = "gpio-keys";
67
68 button@1{
69 label = "Power push button";
70 linux,code = <KEY_POWER>;
71 gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
72 };
73 };
74
75 gpio-leds {
76 compatible = "gpio-leds";
77
78 red-fail {
79 label = "laplug_v2:red:power";
80 gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
81 };
82 blue-power {
83 label = "laplug_v2:blue:power";
84 gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
85 linux,default-trigger = "default-on";
86 };
87 };
88
89 gpio_poweroff {
90 compatible = "gpio-poweroff";
91 gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
92 };
93
94 regulators {
95 compatible = "simple-bus";
96 #address-cells = <1>;
97 #size-cells = <0>;
98 pinctrl-0 = <&pmx_usb_power_enable>;
99 pinctrl-names = "default";
100
101 usb_power_back1: regulator@1 {
102 compatible = "regulator-fixed";
103 reg = <1>;
104 regulator-name = "USB Power Back 1";
105 regulator-min-microvolt = <5000000>;
106 regulator-max-microvolt = <5000000>;
107 enable-active-high;
108 regulator-always-on;
109 regulator-boot-on;
110 gpio = <&gpio0 15 GPIO_ACTIVE_HIGH>;
111 };
112
113 usb_power_back2: regulator@2 {
114 compatible = "regulator-fixed";
115 reg = <2>;
116 regulator-name = "USB Power Back 2";
117 regulator-min-microvolt = <5000000>;
118 regulator-max-microvolt = <5000000>;
119 enable-active-high;
120 regulator-always-on;
121 regulator-boot-on;
122 gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>;
123 };
124
125 usb_power_front: regulator@3 {
126 compatible = "regulator-fixed";
127 reg = <3>;
128 regulator-name = "USB Power Front";
129 regulator-min-microvolt = <5000000>;
130 regulator-max-microvolt = <5000000>;
131 enable-active-high;
132 regulator-always-on;
133 regulator-boot-on;
134 gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>;
135 };
136 };
137};
138
139&nand {
140 /* Total size : 512MB */
141 status = "okay";
142 pinctrl-0 = <&pmx_nand>;
143
144 partition@0 {
145 label = "u-boot";
146 reg = <0x0 0x100000>; /* 1MB */
147 read-only;
148 };
149
150 partition@100000 {
151 label = "uImage";
152 reg = <0x100000 0x1000000>; /* 16MB */
153 };
154
155 partition@1100000 {
156 label = "rootfs";
157 reg = <0x1100000 0x1EF00000>; /* 495MB */
158 };
159};
160
161&mdio {
162 status = "okay";
163
164 ethphy0: ethernet-phy@0 {
165 device_type = "ethernet-phy";
166 reg = <0>;
167 };
168};
169
170&eth0 {
171 status = "okay";
172 ethernet0-port@0 {
173 phy-handle = <&ethphy0>;
174 };
175};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 1da94c187085..81e6c409284e 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -284,5 +284,23 @@
284 /* set phy-handle property in board file */ 284 /* set phy-handle property in board file */
285 }; 285 };
286 }; 286 };
287
288 sata_phy0: sata-phy@82000 {
289 compatible = "marvell,mvebu-sata-phy";
290 reg = <0x82000 0x0334>;
291 clocks = <&gate_clk 14>;
292 clock-names = "sata";
293 #phy-cells = <0>;
294 status = "ok";
295 };
296
297 sata_phy1: sata-phy@84000 {
298 compatible = "marvell,mvebu-sata-phy";
299 reg = <0x84000 0x0334>;
300 clocks = <&gate_clk 15>;
301 clock-names = "sata";
302 #phy-cells = <0>;
303 status = "ok";
304 };
287 }; 305 };
288}; 306};
generated by cgit v1.2.2 (git 2.25.0) at 2025-05-28 08:47:24 -0400