AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Marvell Ethernet DT update for clk support

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAlCsAS4ACgkQ9lPLMJjT96eiRACgiaH1oX0V6DRuSUT29OSqOaSa
 S/QAoKl9x/4EL8Vm+/2GXNmjCczc9ofX
 =SF8H
 -----END PGP SIGNATURE-----

Merge tag 'marvell-neta-dt-clk-updates-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

Marvell Ethernet DT update for clk support
This commit is contained in:
Thomas Petazzoni 2012-11-20 23:38:00 +01:00
commit f40788a666
6 changed files with 4 additions and 12 deletions
Show Stats 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 @@ phy1: ethernet-phy@1 {
};
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 @@ phy1: ethernet-phy@1 {
};
};
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 @@ ethernet@d0070000 {
compatible = "marvell,armada-370-neta";
reg = <0xd0070000 0x2500>;
interrupts = <8>;
clocks = <&gateclk 4>;
status = "disabled";
};
@ -97,6 +98,7 @@ ethernet@d0074000 {
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

@ -71,25 +71,21 @@ phy3: ethernet-phy@3 {
};
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 @@ phy3: ethernet-phy@3 {
};
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 @@ ethernet@d0030000 {
compatible = "marvell,armada-370-neta";
reg = <0xd0030000 0x2500>;
interrupts = <12>;
clocks = <&gateclk 2>;
status = "disabled";
};
@ -83,6 +84,7 @@ ethernet@d0034000 {
compatible = "marvell,armada-370-neta";
reg = <0xd0034000 0x2500>;
interrupts = <14>;
clocks = <&gateclk 1>;
status = "disabled";
};
};