sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'marvell-neta-dt-clk-updates-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

Browse Source 
Marvell Ethernet DT update for clk support
This commit is contained in:
Jason Cooper
2012-11-21 19:54:35 +00:00
parent 23f4f6020e 42db1215ee
commit 61528f4e92
6 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/armada-370-db.dts
View File

@@ -50,13 +50,11 @@
};
ethernet@d0070000 {
clock-frequency = <200000000>;
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet@d0074000 {
clock-frequency = <200000000>;
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";

2
arch/arm/boot/dts/armada-370-mirabox.dts
View File

@@ -43,13 +43,11 @@
};
};
ethernet@d0070000 {
clock-frequency = <200000000>;
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet@d0074000 {
clock-frequency = <200000000>;
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";

2
arch/arm/boot/dts/armada-370-xp.dtsi
View File

@@ -90,6 +90,7 @@
compatible = "marvell,armada-370-neta";
reg = <0xd0070000 0x2500>;
interrupts = <8>;
clocks = <&gateclk 4>;
status = "disabled";
};
@@ -97,6 +98,7 @@
compatible = "marvell,armada-370-neta";
reg = <0xd0074000 0x2500>;
interrupts = <10>;
clocks = <&gateclk 3>;
status = "disabled";
};
};

4
arch/arm/boot/dts/armada-xp-db.dts
View File

@@ -70,25 +70,21 @@
};
ethernet@d0070000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet@d0074000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
};
ethernet@d0030000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy2>;
phy-mode = "sgmii";
};
ethernet@d0034000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy3>;
phy-mode = "sgmii";

4
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
View File

@@ -85,25 +85,21 @@
};
ethernet@d0070000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy0>;
phy-mode = "sgmii";
};
ethernet@d0074000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy1>;
phy-mode = "sgmii";
};
ethernet@d0030000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy2>;
phy-mode = "sgmii";
};
ethernet@d0034000 {
clock-frequency = <250000000>;
status = "okay";
phy = <&phy3>;
phy-mode = "sgmii";

2
arch/arm/boot/dts/armada-xp.dtsi
View File

@@ -76,6 +76,7 @@
compatible = "marvell,armada-370-neta";
reg = <0xd0030000 0x2500>;
interrupts = <12>;
clocks = <&gateclk 2>;
status = "disabled";
};
@@ -83,6 +84,7 @@
compatible = "marvell,armada-370-neta";
reg = <0xd0034000 0x2500>;
interrupts = <14>;
clocks = <&gateclk 1>;
status = "disabled";
};
};