Commit b4607572 authored Oct 28, 2014 by Thomas Petazzoni Committed by Jason Cooper Nov 07, 2014

ARM: mvebu: remove conflicting muxing on Armada 370 DB



Back when audio was enabled, the muxing of some MPP pins was causing
problems. However, since commit fea038ed ("ARM: mvebu: Add proper
pin muxing on the Armada 370 DB board"), those problematic MPP pins
have been assigned a proper muxing for the Ethernet interfaces. This
proper muxing is now conflicting with the hog pins muxing that had
been added as part of 249f3822 ("ARM: mvebu: add audio support to
Armada 370 DB").

Therefore, this commit simply removes the hog pins muxing, which
solves a warning a boot time due to the conflicting muxing
requirements.

Fixes: fea038ed ("ARM: mvebu: Add proper pin muxing on the Armada 370 DB board")
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1414512524-24466-5-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: Jason Cooper <jason@lakedaemon.net>

parent f5ed9ccc

arch/arm/boot/dts/armada-370-db.dts

+0 −24

Original line number	Diff line number	Diff line
		@@ -102,30 +102,6 @@
		broken-cd;
		};

		pinctrl {
		/*
		* These pins might be muxed as I2S by
		* the bootloader, but it conflicts
		* with the real I2S pins that are
		* muxed using i2s_pins. We must mux
		* those pins to a function other than
		* I2S.
		*/
		pinctrl-0 = <&hog_pins1 &hog_pins2>;
		pinctrl-names = "default";

		hog_pins1: hog-pins1 {
		marvell,pins = "mpp6", "mpp8", "mpp10",
		"mpp12", "mpp13";
		marvell,function = "gpio";
		};

		hog_pins2: hog-pins2 {
		marvell,pins = "mpp5", "mpp7", "mpp9";
		marvell,function = "gpo";
		};
		};

		usb@50000 {
		status = "okay";
		};