]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: ux500: Fix LCDA clock line muxing
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 3 Jul 2018 08:30:03 +0000 (10:30 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 20 Sep 2018 21:55:55 +0000 (14:55 -0700)
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>
arch/arm/boot/dts/ste-href-family-pinctrl.dtsi

index 5c5cea232743d111f154cd0faa0517b44f6a70ab..1ec193b0c5065b794838705702a99bd48c95586c 100644 (file)
@@ -607,16 +607,20 @@ sleep_cfg3 {
 
                        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 */