Merge tag 'asoc-v4.19-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6sl-evk.dts

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 92ad01f676e345f4f7e97f602026c50135c97039..679b4482ab13aca4bcaa0506f73b3c3a04233134 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -12,6 +12,10 @@
        model = "Freescale i.MX6 SoloLite EVK Board";
        compatible = "fsl,imx6sl-evk", "fsl,imx6sl";
 
+       chosen {
+               stdout-path = &uart1;
+       };
+
        memory@80000000 {
                reg = <0x80000000 0x40000000>;
        };
@@ -73,6 +77,8 @@
 
        reg_lcd_3v3: regulator-lcd-3v3 {
                compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_reg_lcd_3v3>;
                regulator-name = "lcd-3v3";
                gpio = <&gpio4 3 GPIO_ACTIVE_HIGH>;
                enable-active-high;
@@ -195,6 +201,7 @@
                        sw4_reg: sw4 {
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
                        };
 
                        swbst_reg: swbst {
@@ -406,6 +413,12 @@
                        >;
                };
 
+               pinctrl_reg_lcd_3v3: reglcd3v3grp {
+                       fsl,pins = <
+                               MX6SL_PAD_KEY_ROW5__GPIO4_IO03    0x17059
+                       >;
+               };
+
                pinctrl_uart1: uart1grp {
                        fsl,pins = <
                                MX6SL_PAD_UART1_RXD__UART1_RX_DATA      0x1b0b1