Merge tag 'mips_fixes_5.1_1' into mips-next

[mirror_ubuntu-eoan-kernel.git] / arch / arm / boot / dts / omap3-gta04.dtsi

diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index 93b420934e8ee96115b41b80c9f78b842cae0d8b..04f2b53d4d3d0a161d60e6ab4ff774a2dcb0fe01 100644 (file)
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -32,6 +32,14 @@
                display1 = &tv0;
        };
 
+       ldo_3v3: fixedregulator {
+               compatible = "regulator-fixed";
+               regulator-name = "ldo_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
        /* fixed 26MHz oscillator */
        hfclk_26m: oscillator {
                #clock-cells = <0>;
@@ -116,6 +124,7 @@
                        spi-cpol;
                        spi-cpha;
 
+                       backlight= <&backlight>;
                        label = "lcd";
                        port {
                                lcd_in: endpoint {
@@ -125,7 +134,7 @@
                };
        };
 
-       backlight {
+       backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm11 0 12000000 0>;
                pwm-names = "backlight";
@@ -224,6 +233,15 @@
        };
 };
 
+&omap3_pmx_wkup {
+       gpio1_pins: pinmux_gpio1_pins {
+               pinctrl-single,pins = <
+                       OMAP3_WKUP_IOPAD(0x2a14, PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE4) /* sys_boot5.gpio_7 */
+                       OMAP3_WKUP_IOPAD(0x2a1a, PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE4) /* sys_clkout.gpio_10 */
+               >;
+       };
+};
+
 &omap3_pmx_core {
        pinctrl-names = "default";
        pinctrl-0 = <
@@ -312,6 +330,12 @@
                >;
        };
 
+       gps_pins: pinmux_gps_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* gpio145 */
+               >;
+       };
+
        hdq_pins: hdq_pins {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x21c6, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda.hdq */
@@ -636,6 +660,11 @@
        status = "disabled";
 };
 
+&gpio1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&gpio1_pins>;
+};
+
 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart1_pins>;
@@ -644,6 +673,14 @@
 &uart2 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart2_pins>;
+       gnss: gnss {
+               compatible = "wi2wi,w2sg0004";
+               pinctrl-names = "default";
+               pinctrl-0 = <&gps_pins>;
+               sirf,onoff-gpios = <&gpio5 17 GPIO_ACTIVE_HIGH>;
+               lna-supply = <&vsim>;
+               vcc-supply = <&ldo_3v3>;
+       };
 };
 
 &uart3 {