diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2016-09-24 11:52:02 +0200 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2016-09-26 13:03:51 +0200 |
| commit | f2102b484ba17bcfcf3f1cff4f19c077431c25cf (patch) | |
| tree | 3825b946633d4f0c2f7c10b84658479541189866 /target/linux/mvebu/patches-4.4/055-ARM-dts-armada-388-clearfog-remove-duplicate-mdio-en.patch | |
| parent | c4f4d65835edc2631e10524e078d73f675e00dca (diff) | |
| download | upstream-f2102b484ba17bcfcf3f1cff4f19c077431c25cf.tar.gz upstream-f2102b484ba17bcfcf3f1cff4f19c077431c25cf.tar.bz2 upstream-f2102b484ba17bcfcf3f1cff4f19c077431c25cf.zip | |
mvebu: replace ClearFog dts files with patches from upstream
Make the dts file match with what is upstream, to ensure it has the
latest changes and switching to newer kernels is easier.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/055-ARM-dts-armada-388-clearfog-remove-duplicate-mdio-en.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/055-ARM-dts-armada-388-clearfog-remove-duplicate-mdio-en.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-4.4/055-ARM-dts-armada-388-clearfog-remove-duplicate-mdio-en.patch b/target/linux/mvebu/patches-4.4/055-ARM-dts-armada-388-clearfog-remove-duplicate-mdio-en.patch new file mode 100644 index 0000000000..823d514dfa --- /dev/null +++ b/target/linux/mvebu/patches-4.4/055-ARM-dts-armada-388-clearfog-remove-duplicate-mdio-en.patch @@ -0,0 +1,41 @@ +From d261861ab52623e34a25fe6ae76714456edda033 Mon Sep 17 00:00:00 2001 +From: Russell King <rmk+kernel@armlinux.org.uk> +Date: Sun, 10 Jul 2016 16:27:38 +0100 +Subject: [PATCH] ARM: dts: armada-388-clearfog: remove duplicate mdio entry + +The clearfog DTS should not be defining the on-board phy, this device +is located on the microsom. Remove the duplicated definition. + +Reported-by: Jon Nettleton <jon@solid-run.com> +Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> +Reviewed-by: Andrew Lunn <andrew@lunn.ch> +Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> +--- + arch/arm/boot/dts/armada-388-clearfog.dts | 16 ---------------- + 1 file changed, 16 deletions(-) + +--- 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"; |