Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b2d8b94 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 262a5d84 d261861a

arch/arm/boot/dts/armada-388-clearfog.dts

+0 −16
Original line number Diff line number Diff line
@@ -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";