summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
diff options
context:
space:
mode:
authorLinus Walleij2018-07-03 10:30:03 +0200
committerLinus Walleij2018-09-20 23:55:55 +0200
commitecde29569e3484e1d0a032bf4074449bce4d4a03 (patch)
treee80e4876609d42311fe63081aff2fad1230025a8 /arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
parentdt-bindings: arm: scu: Correct example SCU unit addresses (diff)
downloadkernel-qcow2-linux-ecde29569e3484e1d0a032bf4074449bce4d4a03.tar.gz
kernel-qcow2-linux-ecde29569e3484e1d0a032bf4074449bce4d4a03.tar.xz
kernel-qcow2-linux-ecde29569e3484e1d0a032bf4074449bce4d4a03.zip
ARM: dts: ux500: Fix LCDA clock line muxing
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>
Diffstat (limited to 'arch/arm/boot/dts/ste-href-family-pinctrl.dtsi')
-rw-r--r--arch/arm/boot/dts/ste-href-family-pinctrl.dtsi8
1 files 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 5c5cea232743..1ec193b0c506 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 */