Merge tag 'mvebu-dt-4.8-1' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu dt for 4.8 (part 1)" from Gregory CLEMENT:

Fix dts for the clearfog board (Armada 388 SoC based)

* tag 'mvebu-dt-4.8-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada-388-clearfog: remove duplicate mdio entry

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index c60206efb583d264d254ec25f20f3c4c3905f888..2e0556af6e5eef508fe29f7ec9cdc91452253455 100644 (file)
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -239,22 +239,6 @@
                                status = "okay";
                        };
 
-                       mdio@72004 {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-
-                               phy_dedicated: ethernet-phy@0 {
-                                       /*
-                                        * Annoyingly, the marvell phy driver
-                                        * configures the LED register, rather
-                                        * than preserving reset-loaded setting.
-                                        * We undo that rubbish here.
-                                        */
-                                       marvell,reg-init = <3 16 0 0x101e>;
-                                       reg = <0>;
-                               };
-                       };
-
                        pinctrl@18000 {
                                clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {
                                        marvell,pins = "mpp46";