ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
The commitb4607572ef
(ARM: mvebu: remove conflicting muxing on Armada 370 DB) removes the hog pins muxing. As it is explained in the commit log it solves a warning a boot time, but more important it also allows using the Giga port 0 of the board. Unfortunately in the same time the commit4904a82a93
(arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi) was merged and it introduced again the hog pins muxing. Because of it, the Giga port 0 of the board is no more usable. This commit remove again the conflicting muxing (hopefully for the last time). Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> [andrew@lunn.ch: Correct commit IDs] Signed-off-by: Andrew Lunn <andrew@lunn.ch> Fixes:4904a82a93
("arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi")
This commit is contained in:
Родитель
97bf6af1f9
Коммит
d4b0833a65
|
@ -203,27 +203,3 @@
|
||||||
compatible = "linux,spdif-dir";
|
compatible = "linux,spdif-dir";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче