| From 7f85e0827607d213c1ca13db0e34c212a39a2bc3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 3 Jul 2018 10:30:03 +0200 |
| Subject: ARM: dts: ux500: Fix LCDA clock line muxing |
| |
| From: Linus Walleij <linus.walleij@linaro.org> |
| |
| [ Upstream commit ecde29569e3484e1d0a032bf4074449bce4d4a03 ] |
| |
| The "lcdaclk_b_1" group is muxed with the function "lcd" |
| but needs a separate entry to be muxed in with "lcda" |
| rather than "lcd". |
| |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi |
| index 5c5cea232743d..1ec193b0c5065 100644 |
| --- a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi |
| +++ b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi |
| @@ -607,16 +607,20 @@ |
| |
| mcde { |
| lcd_default_mode: lcd_default { |
| - default_mux { |
| + default_mux1 { |
| /* Mux in VSI0 and all the data lines */ |
| function = "lcd"; |
| groups = |
| "lcdvsi0_a_1", /* VSI0 for LCD */ |
| "lcd_d0_d7_a_1", /* Data lines */ |
| "lcd_d8_d11_a_1", /* TV-out */ |
| - "lcdaclk_b_1", /* Clock line for TV-out */ |
| "lcdvsi1_a_1"; /* VSI1 for HDMI */ |
| }; |
| + default_mux2 { |
| + function = "lcda"; |
| + groups = |
| + "lcdaclk_b_1"; /* Clock line for TV-out */ |
| + }; |
| default_cfg1 { |
| pins = |
| "GPIO68_E1", /* VSI0 */ |
| -- |
| 2.20.1 |
| |