summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 23:38:00 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 23:38:00 +0100
commitf40788a6663267fc985a5871034f2638002f5bd6 (patch)
treeb465ccadd15cbc3698470b826192bfa7836ee3e4 /arch/arm/boot
parenta19aab5792e907175a0515388e3de4f27d107b9e (diff)
parent42db1215eeb1dc591ef5120bc2dbbeeee5ee41e1 (diff)
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
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/armada-370-db.dts2
-rw-r--r--arch/arm/boot/dts/armada-370-mirabox.dts2
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi2
-rw-r--r--arch/arm/boot/dts/armada-xp-db.dts4
-rw-r--r--arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts4
-rw-r--r--arch/arm/boot/dts/armada-xp.dtsi2
6 files changed, 4 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 63120569878a..00044026ef1f 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -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";
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 8554dbee2640..3b4071336599 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -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";
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 4c248e30fcb3..4ff108151278 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -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";
};
};
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 2673ac7a0fbe..8e53b25b5508 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -71,25 +71,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";
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index bb8d83cfbb50..638fb68d47b2 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -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";
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index fbe30f5e98a8..3744ea18be72 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -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";
};
};