Merge tag 'omap-for-v3.20/dt-pt3-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "omap device tree changes for v3.20, part 3" from Tony Lindgren:

Device tree related chages for omaps to fix dm816x syscon,
fix various devices for gta04, and add USB nodes for am57xx
and dra7.

* tag 'omap-for-v3.20/dt-pt3-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am57xx-beagle-x15: Fix USB2 mode
  ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB
  ARM: dts: dra72-evm: Add extcon nodes for USB
  ARM: dts: dra7-evm: Add extcon nodes for USB
  ARM: dts: Fix dm816x pinctrl and syscon so they are children of SCM
  ARM: dts: omap3-gta04: Disable keypad
  ARM: dts: omap3-gta04: only power DSS when necessary.
  ARM: dts: omap3-gta04: add gyroscope
  ARM: dts: omap3-gta04: enable power-off for wifi card.
  ARM: dts: omap3-gta04: add comments about gpios
  ARM: dts: omap3-gta04: Add ramp value for twl4030 audio
  ARM: dts: omap3-gta04: Enable power-off using twl4030
  ARM: dts: omap3-gta04: Fix a GPIO line for bma180 node
  ARM: dts: omap3-gta04: Enable twl audio vibra support
  ARM: dts: omap3-gta04: Enable mcbps2 necessary for audio
  ARM: dts: omap3-gta04: Fix audio node malformatting
  ARM: dts: omap3-gta04: Fix backup-battery charging in devicetree file.

Signed-off-by: Olof Johansson <olof@lixom.net>

5 files changed, 154 insertions, 30 deletions

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index c5d4ceabdd80..03750af3b49a 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -88,6 +88,20 @@
                 gpio-fan,speed-map = <0     0>,
                                      <13000 1>;
         };
+
+        extcon_usb1: extcon_usb1 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&gpio7 25 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&extcon_usb1_pins>;
+        };
+
+        extcon_usb2: extcon_usb2 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&gpio7 24 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&extcon_usb2_pins>;
+        };
 };
 
 &dra7_pmx_core {
@@ -252,6 +266,17 @@
                 >;
         };
 
+        extcon_usb1_pins: extcon_usb1_pins {
+                pinctrl-single,pins = <
+                        0x3ec (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_rtsn.gpio7_25 */
+                >;
+        };
+
+        extcon_usb2_pins: extcon_usb2_pins {
+                pinctrl-single,pins = <
+                        0x3e8 (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_ctsn.gpio7_24 */
+                >;
+        };
 };
 
 &i2c1 {
@@ -523,3 +548,15 @@
         pinctrl-names = "default";
         pinctrl-0 = <&usb1_pins>;
 };
+
+&omap_dwc3_1 {
+        extcon = <&extcon_usb1>;
+};
+
+&omap_dwc3_2 {
+        extcon = <&extcon_usb2>;
+};
+
+&usb2 {
+        dr_mode = "peripheral";
+};
diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index 7adac097a71c..d98d0f7de380 100644
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -50,15 +50,6 @@
                 };
         };
 
-        dm816x_pinmux: pinmux@44e10800 {
-                compatible = "pinctrl-single";
-                reg = <0x48140800 0x50a>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                pinctrl-single,register-width = <16>;
-                pinctrl-single,function-mask = <0xf>;
-        };
-
         /*
          * XXX: Use a flat representation of the dm816x interconnect.
          * The real dm816x interconnect network is quite complex. Since
@@ -89,12 +80,29 @@
                 };
 
                 scrm: scrm@48140000 {
-                        compatible = "ti,dm816-scrm";
+                        compatible = "ti,dm816-scrm", "simple-bus";
                         reg = <0x48140000 0x21000>;
                         #address-cells = <1>;
                         #size-cells = <1>;
                         ranges = <0 0x48140000 0x21000>;
 
+                        dm816x_pinmux: pinmux@800 {
+                                compatible = "pinctrl-single";
+                                reg = <0x800 0x50a>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                pinctrl-single,register-width = <16>;
+                                pinctrl-single,function-mask = <0xf>;
+                        };
+
+                        /* Device Configuration Registers */
+                        scm_conf: syscon@600 {
+                                compatible = "syscon";
+                                reg = <0x600 0x110>;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                        };
+
                         scrm_clocks: clocks {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
@@ -104,11 +112,6 @@
                         };
                 };
 
-                cm: syscon@44e10000 {
-                        compatible = "ti,am33xx-controlmodule", "syscon";
-                        reg = <0x44e10000 0x800>;
-                };
-
                 edma: edma@49000000 {
                         compatible = "ti,edma3";
                         ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2", "tptc3";
@@ -213,6 +216,7 @@
                         reg = <0x4a100000 0x800
                                0x4a100900 0x3700>;
                         clocks = <&sysclk24_ck>;
+                        syscon = <&scm_conf>;
                         ti,davinci-ctrl-reg-offset = <0>;
                         ti,davinci-ctrl-mod-reg-offset = <0x900>;
                         ti,davinci-ctrl-ram-offset = <0x2000>;
@@ -226,6 +230,7 @@
                         ti,hwmods = "emac1";
                         reg = <0x4a120000 0x4000>;
                         clocks = <&sysclk24_ck>;
+                        syscon = <&scm_conf>;
                         ti,davinci-ctrl-reg-offset = <0>;
                         ti,davinci-ctrl-mod-reg-offset = <0x900>;
                         ti,davinci-ctrl-ram-offset = <0x2000>;
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 10b725c7bfc0..c1d0ac7bd002 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -26,6 +26,16 @@
                 regulator-max-microvolt = <3300000>;
         };
 
+        extcon_usb1: extcon_usb1 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
+        };
+
+        extcon_usb2: extcon_usb2 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
+        };
+
         vtt_fixed: fixedregulator-vtt {
                 compatible = "regulator-fixed";
                 regulator-name = "vtt_fixed";
@@ -391,6 +401,19 @@
                         };
                 };
         };
+
+        pcf_gpio_21: gpio@21 {
+                compatible = "ti,pcf8575";
+                reg = <0x21>;
+                lines-initial-states = <0x1408>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
 };
 
 &i2c2 {
@@ -520,6 +543,14 @@
         };
 };
 
+&omap_dwc3_1 {
+        extcon = <&extcon_usb1>;
+};
+
+&omap_dwc3_2 {
+        extcon = <&extcon_usb2>;
+};
+
 &usb1 {
         dr_mode = "peripheral";
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index cacddd74c516..4d8711713610 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "dra72x.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
         model = "TI DRA722";
@@ -24,6 +25,16 @@
                 regulator-min-microvolt = <3300000>;
                 regulator-max-microvolt = <3300000>;
         };
+
+        extcon_usb1: extcon_usb1 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
+        };
+
+        extcon_usb2: extcon_usb2 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
+        };
 };
 
 &dra7_pmx_core {
@@ -255,6 +266,18 @@
                         ti,palmas-long-press-seconds = <6>;
                 };
         };
+
+        pcf_gpio_21: gpio@21 {
+                compatible = "ti,pcf8575";
+                reg = <0x21>;
+                lines-initial-states = <0x1408>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
 };
 
 &uart1 {
@@ -357,6 +380,14 @@
         phy-supply = <&ldo4_reg>;
 };
 
+&omap_dwc3_1 {
+        extcon = <&extcon_usb1>;
+};
+
+&omap_dwc3_2 {
+        extcon = <&extcon_usb2>;
+};
+
 &usb1 {
         dr_mode = "peripheral";
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index ee62d00bcbe6..fb3a69604ed5 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -237,11 +237,18 @@
                 reg = <0x48>;
                 interrupts = <7>; /* SYS_NIRQ cascaded to intc */
                 interrupt-parent = <&intc>;
-        };
 
-        twl_audio: audio {
-                compatible = "ti,twl4030-audio";
-                codec {
+                twl_audio: audio {
+                        compatible = "ti,twl4030-audio";
+                        ti,enable-vibra = <1>;
+                        codec {
+                                ti,ramp_delay_value = <3>;
+                        };
+                };
+
+                twl_power: power {
+                        compatible = "ti,twl4030-power";
+                        ti,use_poweroff;
                 };
         };
 };
@@ -257,15 +264,23 @@
                 compatible = "bosch,bmp085";
                 reg = <0x77>;
                 interrupt-parent = <&gpio4>;
-                interrupts = <17 IRQ_TYPE_EDGE_RISING>;
+                interrupts = <17 IRQ_TYPE_EDGE_RISING>; /* GPIO_113 */
         };
 
         /* accelerometer */
         bma180@41 {
                 compatible = "bosch,bma180";
                 reg = <0x41>;
-                interrupt-parent = <&gpio3>;
-                interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-parent = <&gpio4>;
+                interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
+        };
+
+        /* gyroscope */
+        itg3200@68 {
+                compatible = "invensense,itg3200";
+                reg = <0x68>;
+                interrupt-parent = <&gpio2>;
+                interrupts = <24 0>; /* GPIO_56 */
         };
 
         /* leds */
@@ -316,7 +331,7 @@
                 compatible = "ti,tsc2007";
                 reg = <0x48>;
                 interrupt-parent = <&gpio6>;
-                interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
+                interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */
                 gpios = <&gpio6 0 GPIO_ACTIVE_LOW>;
                 ti,x-plate-ohms = <600>;
         };
@@ -355,12 +370,17 @@
         vmmc-supply = <&vaux4>;
         bus-width = <4>;
         ti,non-removable;
+        cap-power-off-card;
 };
 
 &mmc3 {
         status = "disabled";
 };
 
+&twl_keypad {
+        status = "disabled";
+};
+
 &uart1 {
         pinctrl-names = "default";
         pinctrl-0 = <&uart1_pins>;
@@ -377,8 +397,8 @@
 };
 
 &charger {
-        bb_uvolt = <3200000>;
-        bb_uamp = <150>;
+        ti,bb-uvolt = <3200000>;
+        ti,bb-uamp = <150>;
 };
 
 /* spare */
@@ -412,16 +432,12 @@
         regulator-max-microvolt = <3150000>;
 };
 
-/* Needed to power the DPI pins */
-&vpll2 {
-        regulator-always-on;
-};
-
 &dss {
         pinctrl-names = "default";
         pinctrl-0 = < &dss_dpi_pins >;
 
         status = "okay";
+        vdds_dsi-supply = <&vpll2>;
 
         port {
                 dpi_out: endpoint {
@@ -498,3 +514,7 @@
                 };
         };
 };
+
+&mcbsp2 {
+        status = "okay";
+};