diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-21 14:36:51 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-21 14:36:51 +0200 |
| commit | 1b2d8b94c8781adfb1eeb9cd1cbe23fab601519a (patch) | |
| tree | 6a9f2a7bc4578073f5457d1129d9c471c9c0c2ab /arch/arm/boot | |
| parent | 262a5d84b2aea8deb67eca813dc3008836330596 (diff) | |
| parent | d261861ab52623e34a25fe6ae76714456edda033 (diff) | |
| download | linux-1b2d8b94c8781adfb1eeb9cd1cbe23fab601519a.tar.bz2 | |
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
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-388-clearfog.dts | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts index c60206efb583..2e0556af6e5e 100644 --- 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"; |