aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2016-11-13 08:57:56 +0100
committerMathias Kresin <dev@kresin.me>2016-11-13 09:03:52 +0100
commit5640986001ecaa673f7f97a40d0418f7e926da93 (patch)
tree743d31b5d8cef9edcd1155a29a35c34cf1812371 /target
parent2b55c83e68068887db9e49de8e81b1b4a267a4f2 (diff)
downloadupstream-5640986001ecaa673f7f97a40d0418f7e926da93.tar.gz
upstream-5640986001ecaa673f7f97a40d0418f7e926da93.tar.bz2
upstream-5640986001ecaa673f7f97a40d0418f7e926da93.zip
mvebu: revert remove of mvsw61xx device tree nodes
The marvell,88e6352 and marvell,88e6172 compatible strings are used in target/linux/generic/files/drivers/net/phy/mvsw61xx.c. No idea why grep missed them when I searched for them. Thanks to Syrone Wong for noticing and reporting my mistake. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target')
-rw-r--r--target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts13
-rw-r--r--target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch40
2 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
index eeb179999f..0046125529 100644
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -408,6 +408,19 @@
label = "rango:white:sata";
};
};
+
+ mvsw61xx {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "marvell,88e6352";
+ status = "okay";
+ reg = <0x10>;
+
+ mii-bus = <&mdio>;
+ cpu-port-0 = <5>;
+ cpu-port-1 = <6>;
+ };
+
};
&pinctrl {
diff --git a/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch b/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
new file mode 100644
index 0000000000..1502b6b142
--- /dev/null
+++ b/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
@@ -0,0 +1,40 @@
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -467,6 +467,16 @@
+ };
+ };
+ };
++
++ mvsw61xx {
++ compatible = "marvell,88e6172";
++ status = "okay";
++ reg = <0x10>;
++
++ mii-bus = <&mdio>;
++ cpu-port-0 = <5>;
++ cpu-port-1 = <6>;
++ };
+ };
+
+ &pinctrl {
+--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
++++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
+@@ -309,6 +309,18 @@
+ };
+ };
+ };
++
++ mvsw61xx {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "marvell,88e6176";
++ status = "okay";
++ reg = <0x10>;
++
++ mii-bus = <&mdio>;
++ cpu-port-0 = <5>;
++ cpu-port-1 = <6>;
++ };
+ };
+
+ &pinctrl {