From: Thomas Petazzoni Date: Tue, 28 Oct 2014 16:08:42 +0000 (+0100) Subject: ARM: mvebu: remove conflicting muxing on Armada 370 DB X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~12^2~7^2~18 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4607572ef86b288a856b9df410ea593c5371dec;p=pandora-kernel.git 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 fea038ed55ae ("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 249f3822509b ("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: fea038ed55ae ("ARM: mvebu: Add proper pin muxing on the Armada 370 DB board") Cc: Ezequiel Garcia Signed-off-by: Thomas Petazzoni Acked-by: Andrew Lunn Link: https://lkml.kernel.org/r/1414512524-24466-5-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper --- Reading git-diff-tree failed