Skip to content

Commit dee4bd4

Browse files
committed
Merge tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper: mvebu DT changes for v3.14 (incremental #5) - mvebu - add rtc chip isl12057 node to ReadyNAS boards - fix register length in Armada XP pmsu - kirkwood - sort ocp nodes by address in 6282 dtsi file - add 6192 dtsi file - add LaPlug board - add sata phy node - dove - add sata phy node * tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu: ARM: Kirkwood: DT board setup for LaPlug ARM: Kirkwood: Add 6192 DTSI file ARM: mvebu: fix register length for Armada XP PMSU ARM: kirkwood: 6282: sort DT nodes by address Phy: Add DT nodes on kirkwood and Dove for the SATA PHY ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 2120 .dts file ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 104 .dts file ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 102 .dts file Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents c56569b + 2cc64b5 commit dee4bd4

11 files changed

Lines changed: 349 additions & 19 deletions

arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
8888
kirkwood-iomega_ix2_200.dtb \
8989
kirkwood-is2.dtb \
9090
kirkwood-km_kirkwood.dtb \
91+
kirkwood-laplug.dtb \
9192
kirkwood-lschlv2.dtb \
9293
kirkwood-lsxhl.dtb \
9394
kirkwood-mplcec4.dtb \

arch/arm/boot/dts/armada-370-netgear-rn102.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@
122122
clock-frequency = <100000>;
123123
status = "okay";
124124

125+
isl12057: isl12057@68 {
126+
compatible = "isl,isl12057";
127+
reg = <0x68>;
128+
};
129+
125130
g762: g762@3e {
126131
compatible = "gmt,g762";
127132
reg = <0x3e>;

arch/arm/boot/dts/armada-370-netgear-rn104.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@
117117
clock-frequency = <100000>;
118118
status = "okay";
119119

120+
isl12057: isl12057@68 {
121+
compatible = "isl,isl12057";
122+
reg = <0x68>;
123+
};
124+
120125
g762: g762@3e {
121126
compatible = "gmt,g762";
122127
reg = <0x3e>;

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@
174174
clock-frequency = <400000>;
175175
status = "okay";
176176

177+
isl12057: isl12057@68 {
178+
compatible = "isl,isl12057";
179+
reg = <0x68>;
180+
};
181+
177182
/* Controller for rear fan #1 of 3 (Protechnic
178183
* MGT4012XB-O20, 8000RPM) near eSATA port */
179184
g762_fan1: g762@3e {

arch/arm/boot/dts/armada-xp.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113

114114
armada-370-xp-pmsu@22000 {
115115
compatible = "marvell,armada-370-xp-pmsu";
116-
reg = <0x22100 0x430>, <0x20800 0x20>;
116+
reg = <0x22100 0x400>, <0x20800 0x20>;
117117
};
118118

119119
eth2: ethernet@30000 {

arch/arm/boot/dts/dove.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,21 @@
336336
reg = <0xa0000 0x2400>;
337337
interrupts = <62>;
338338
clocks = <&gate_clk 3>;
339+
phys = <&sata_phy0>;
340+
phy-names = "port0";
339341
nr-ports = <1>;
340342
status = "disabled";
341343
};
342344

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+
343354
audio0: audio-controller@b0000 {
344355
compatible = "marvell,dove-audio";
345356
reg = <0xb0000 0x2210>;
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
};

arch/arm/boot/dts/kirkwood-6281.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
interrupts = <21>;
9090
clocks = <&gate_clk 14>, <&gate_clk 15>;
9191
clock-names = "0", "1";
92+
phys = <&sata_phy0>, <&sata_phy1>;
93+
phy-names = "port0", "port1";
9294
status = "disabled";
9395
};
9496

arch/arm/boot/dts/kirkwood-6282.dtsi

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,38 @@
104104
};
105105
};
106106

107+
thermal@10078 {
108+
compatible = "marvell,kirkwood-thermal";
109+
reg = <0x10078 0x4>;
110+
status = "okay";
111+
};
112+
107113
rtc@10300 {
108114
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
109115
reg = <0x10300 0x20>;
110116
interrupts = <53>;
111117
clocks = <&gate_clk 7>;
112118
};
113119

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+
114131
sata@80000 {
115132
compatible = "marvell,orion-sata";
116133
reg = <0x80000 0x5000>;
117134
interrupts = <21>;
118135
clocks = <&gate_clk 14>, <&gate_clk 15>;
119136
clock-names = "0", "1";
137+
phys = <&sata_phy0>, <&sata_phy1>;
138+
phy-names = "port0", "port1";
120139
status = "disabled";
121140
};
122141

@@ -133,23 +152,5 @@
133152
cap-mmc-highspeed;
134153
status = "disabled";
135154
};
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-
154155
};
155156
};

0 commit comments

Comments
 (0)