Commit f40788a6 authored by Thomas Petazzoni's avatar Thomas Petazzoni

Merge tag 'marvell-neta-dt-clk-updates-3.8' of...

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
parents a19aab57 42db1215
...@@ -50,13 +50,11 @@ phy1: ethernet-phy@1 { ...@@ -50,13 +50,11 @@ phy1: ethernet-phy@1 {
}; };
ethernet@d0070000 { ethernet@d0070000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
phy = <&phy0>; phy = <&phy0>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
}; };
ethernet@d0074000 { ethernet@d0074000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
......
...@@ -43,13 +43,11 @@ phy1: ethernet-phy@1 { ...@@ -43,13 +43,11 @@ phy1: ethernet-phy@1 {
}; };
}; };
ethernet@d0070000 { ethernet@d0070000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
phy = <&phy0>; phy = <&phy0>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
}; };
ethernet@d0074000 { ethernet@d0074000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
......
...@@ -90,6 +90,7 @@ ethernet@d0070000 { ...@@ -90,6 +90,7 @@ ethernet@d0070000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0xd0070000 0x2500>; reg = <0xd0070000 0x2500>;
interrupts = <8>; interrupts = <8>;
clocks = <&gateclk 4>;
status = "disabled"; status = "disabled";
}; };
...@@ -97,6 +98,7 @@ ethernet@d0074000 { ...@@ -97,6 +98,7 @@ ethernet@d0074000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0xd0074000 0x2500>; reg = <0xd0074000 0x2500>;
interrupts = <10>; interrupts = <10>;
clocks = <&gateclk 3>;
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -71,25 +71,21 @@ phy3: ethernet-phy@3 { ...@@ -71,25 +71,21 @@ phy3: ethernet-phy@3 {
}; };
ethernet@d0070000 { ethernet@d0070000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy0>; phy = <&phy0>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
}; };
ethernet@d0074000 { ethernet@d0074000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
}; };
ethernet@d0030000 { ethernet@d0030000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy2>; phy = <&phy2>;
phy-mode = "sgmii"; phy-mode = "sgmii";
}; };
ethernet@d0034000 { ethernet@d0034000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy3>; phy = <&phy3>;
phy-mode = "sgmii"; phy-mode = "sgmii";
......
...@@ -85,25 +85,21 @@ phy3: ethernet-phy@3 { ...@@ -85,25 +85,21 @@ phy3: ethernet-phy@3 {
}; };
ethernet@d0070000 { ethernet@d0070000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy0>; phy = <&phy0>;
phy-mode = "sgmii"; phy-mode = "sgmii";
}; };
ethernet@d0074000 { ethernet@d0074000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy1>; phy = <&phy1>;
phy-mode = "sgmii"; phy-mode = "sgmii";
}; };
ethernet@d0030000 { ethernet@d0030000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy2>; phy = <&phy2>;
phy-mode = "sgmii"; phy-mode = "sgmii";
}; };
ethernet@d0034000 { ethernet@d0034000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
phy = <&phy3>; phy = <&phy3>;
phy-mode = "sgmii"; phy-mode = "sgmii";
......
...@@ -76,6 +76,7 @@ ethernet@d0030000 { ...@@ -76,6 +76,7 @@ ethernet@d0030000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0xd0030000 0x2500>; reg = <0xd0030000 0x2500>;
interrupts = <12>; interrupts = <12>;
clocks = <&gateclk 2>;
status = "disabled"; status = "disabled";
}; };
...@@ -83,6 +84,7 @@ ethernet@d0034000 { ...@@ -83,6 +84,7 @@ ethernet@d0034000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0xd0034000 0x2500>; reg = <0xd0034000 0x2500>;
interrupts = <14>; interrupts = <14>;
clocks = <&gateclk 1>;
status = "disabled"; status = "disabled";
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment