Skip to content

Commit

Permalink
Merge tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu in…
Browse files Browse the repository at this point in the history 
…to 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>
  • Loading branch information
Olof Johansson committed Jan 2, 2014
2 parents c56569b + 2cc64b5 commit dee4bd4
Show file tree
Hide file tree
Showing 11 changed files with 349 additions and 19 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/dts/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
kirkwood-iomega_ix2_200.dtb \
kirkwood-is2.dtb \
kirkwood-km_kirkwood.dtb \
kirkwood-laplug.dtb \
kirkwood-lschlv2.dtb \
kirkwood-lsxhl.dtb \
kirkwood-mplcec4.dtb \
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/armada-370-netgear-rn102.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@
clock-frequency = <100000>;
status = "okay";

isl12057: isl12057@68 {
compatible = "isl,isl12057";
reg = <0x68>;
};

g762: g762@3e {
compatible = "gmt,g762";
reg = <0x3e>;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/armada-370-netgear-rn104.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@
clock-frequency = <100000>;
status = "okay";

isl12057: isl12057@68 {
compatible = "isl,isl12057";
reg = <0x68>;
};

g762: g762@3e {
compatible = "gmt,g762";
reg = <0x3e>;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@
clock-frequency = <400000>;
status = "okay";

isl12057: isl12057@68 {
compatible = "isl,isl12057";
reg = <0x68>;
};

/* Controller for rear fan #1 of 3 (Protechnic
* MGT4012XB-O20, 8000RPM) near eSATA port */
g762_fan1: g762@3e {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-xp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

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

eth2: ethernet@30000 {
Expand Down
11 changes: 11 additions & 0 deletions arch/arm/boot/dts/dove.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,10 +336,21 @@
reg = <0xa0000 0x2400>;
interrupts = <62>;
clocks = <&gate_clk 3>;
phys = <&sata_phy0>;
phy-names = "port0";
nr-ports = <1>;
status = "disabled";
};

sata_phy0: sata-phy@a2000 {
compatible = "marvell,mvebu-sata-phy";
reg = <0xa2000 0x0334>;
clocks = <&gate_clk 3>;
clock-names = "sata";
#phy-cells = <0>;
status = "ok";
};

audio0: audio-controller@b0000 {
compatible = "marvell,dove-audio";
reg = <0xb0000 0x2210>;
Expand Down
107 changes: 107 additions & 0 deletions arch/arm/boot/dts/kirkwood-6192.dtsi
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/ {
mbus {
pcie-controller {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

#address-cells = <3>;
#size-cells = <2>;

bus-range = <0x00 0xff>;

ranges =
<0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000
0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;

pcie@1,0 {
device_type = "pci";
assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
reg = <0x0800 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
0x81000000 0 0 0x81000000 0x1 0 1 0>;
interrupt-map-mask = <0 0 0 0>;
interrupt-map = <0 0 0 0 &intc 9>;
marvell,pcie-port = <0>;
marvell,pcie-lane = <0>;
clocks = <&gate_clk 2>;
status = "disabled";
};
};
};

ocp@f1000000 {
pinctrl: pinctrl@10000 {
compatible = "marvell,88f6192-pinctrl";
reg = <0x10000 0x20>;

pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp18",
"mpp19";
marvell,function = "nand";
};
pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0";
};
pmx_sata1: pmx-sata1 {
marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1";
};
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};
pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
pmx_sdio: pmx-sdio {
marvell,pins = "mpp12", "mpp13", "mpp14",
"mpp15", "mpp16", "mpp17";
marvell,function = "sdio";
};
};

rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};

sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
clocks = <&gate_clk 14>, <&gate_clk 15>;
clock-names = "0", "1";
status = "disabled";
};

mvsdio@90000 {
compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>;
interrupts = <28>;
clocks = <&gate_clk 4>;
bus-width = <4>;
cap-sdio-irq;
cap-sd-highspeed;
cap-mmc-highspeed;
status = "disabled";
};
};
};
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/kirkwood-6281.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@
interrupts = <21>;
clocks = <&gate_clk 14>, <&gate_clk 15>;
clock-names = "0", "1";
phys = <&sata_phy0>, <&sata_phy1>;
phy-names = "port0", "port1";
status = "disabled";
};

Expand Down
37 changes: 19 additions & 18 deletions arch/arm/boot/dts/kirkwood-6282.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,38 @@
};
};

thermal@10078 {
compatible = "marvell,kirkwood-thermal";
reg = <0x10078 0x4>;
status = "okay";
};

rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};

i2c@11100 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11100 0x20>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <32>;
clock-frequency = <100000>;
clocks = <&gate_clk 7>;
status = "disabled";
};

sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
clocks = <&gate_clk 14>, <&gate_clk 15>;
clock-names = "0", "1";
phys = <&sata_phy0>, <&sata_phy1>;
phy-names = "port0", "port1";
status = "disabled";
};

Expand All @@ -133,23 +152,5 @@
cap-mmc-highspeed;
status = "disabled";
};

thermal@10078 {
compatible = "marvell,kirkwood-thermal";
reg = <0x10078 0x4>;
status = "okay";
};

i2c@11100 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11100 0x20>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <32>;
clock-frequency = <100000>;
clocks = <&gate_clk 7>;
status = "disabled";
};

};
};
Loading

0 comments on commit dee4bd4

Please sign in to comment.