Merge tag 'omap-for-v4.7-dts-fixes1' of git://git.kernel.org/pub/scm/linux/kernel...

DTS fixes for omaps for v4.7 merge window for issues noted
with patches in Linux next:

- Fix omap5 and am57xx-idk input voltages to fix micro-sd
  probing at least for some omap5-uevm configurations

- Fix unhandled fault for igepv5 audio

- Fix UART wakeirqs for omap5 by removing WAKUP_EN flags,
  those are managed by the wakeirq and can currently confuse
  the wakeirqs as there is no handler necessarily registered

- Fix LDO7 source for igepv5

Also included are few minor changes not strictly fixes
are good to have merged:

- Fix HP T410 boot time warnings for eMMC and disable the
  unused MMC interfaces while at it

- Add dra7 gpmc dma channel

- Add igep00x0 SD card detect and write protect GPIOs

* tag 'omap-for-v4.7-dts-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: igep0020: Add SD card write-protect pin.
  ARM: dts: igep00x0: Add SD card-detect.
  ARM: dts: am57xx-idk-common: Fix input supply names
  ARM: dts: dra7: Add gpmc dma channel
  ARM: dts: disable mmc by default and enable when needed for dm814x
  ARM: dts: Add non-removable to hsmmc on hp-t410
  ARM: dts: Fix ldo7 source for HDMI on igepv5
  ARM: dts: Fix uart wakeirq on omap5 by removing WAKEUP_EN for omaps
  ARM: dts: Fix igepv5 audiopwon-gpio
  ARM: dts: omap5-board-common: Describe the voltage supply mapping accurately

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

diff --combined arch/arm/boot/dts/omap3-n900.dts
index d9e2d9c6e999e4aa6f3a4c8f582fe9caf74953f4,9c9e2ae6d6aa11c2b92ced019dd06108cb234836..2b74a81d1de266e360c558f5bf5b29b248c400bc
--- 1/arch/arm/boot/dts/omap3-n900.dts
--- 2/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@@ -288,7 -288,7 +288,7 @@@
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1) /* ssi1_rdy_tx */
                        OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1)               /* ssi1_flag_tx */
-                       OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+                       OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE4)                /* ssi1_wake_tx (cawake) */
                        OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1)               /* ssi1_dat_tx */
                        OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE1)                /* ssi1_dat_rx */
                        OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1)                /* ssi1_flag_rx */
@@@ -300,7 -300,7 +300,7 @@@
        modem_pins: pinmux_modem {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE4)               /* gpio 70 => cmt_apeslpx */
-                       OMAP3_CORE1_IOPAD(0x20e0, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio 72 => ape_rst_rq */
+                       OMAP3_CORE1_IOPAD(0x20e0, PIN_INPUT | MUX_MODE4)                /* gpio 72 => ape_rst_rq */
                        OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE4)               /* gpio 73 => cmt_rst_rq */
                        OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE4)               /* gpio 74 => cmt_en */
                        OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE4)               /* gpio 75 => cmt_rst */
@@@ -329,7 -329,6 +329,7 @@@
        regulator-name = "V28";
        regulator-min-microvolt = <2800000>;
        regulator-max-microvolt = <2800000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
        regulator-always-on; /* due to battery cover sensor */
  };
  
@@@ -337,35 -336,30 +337,35 @@@
        regulator-name = "VCSI";
        regulator-min-microvolt = <1800000>;
        regulator-max-microvolt = <1800000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
  };
  
  &vaux3 {
        regulator-name = "VMMC2_30";
        regulator-min-microvolt = <2800000>;
        regulator-max-microvolt = <3000000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
  };
  
  &vaux4 {
        regulator-name = "VCAM_ANA_28";
        regulator-min-microvolt = <2800000>;
        regulator-max-microvolt = <2800000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
  };
  
  &vmmc1 {
        regulator-name = "VMMC1";
        regulator-min-microvolt = <1850000>;
        regulator-max-microvolt = <3150000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
  };
  
  &vmmc2 {
        regulator-name = "V28_A";
        regulator-min-microvolt = <2800000>;
        regulator-max-microvolt = <3000000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
        regulator-always-on; /* due VIO leak to AIC34 VDDs */
  };
  
@@@ -373,7 -367,6 +373,7 @@@
        regulator-name = "VPLL";
        regulator-min-microvolt = <1800000>;
        regulator-max-microvolt = <1800000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
        regulator-always-on;
  };
  
@@@ -381,7 -374,6 +381,7 @@@
        regulator-name = "VSDI_CSI";
        regulator-min-microvolt = <1800000>;
        regulator-max-microvolt = <1800000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
        regulator-always-on;
  };
  
@@@ -389,7 -381,6 +389,7 @@@
        regulator-name = "VMMC2_IO_18";
        regulator-min-microvolt = <1800000>;
        regulator-max-microvolt = <1800000>;
 +      regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */
  };
  
  &vio {

diff --combined arch/arm/boot/dts/omap5-board-common.dtsi
index dc759a3028b790d1b525ee889077c5cca0ce2b8d,9851b5767ec4595e1ff6768ad049169faf3245d1..5d5b620b7d9b70b6529e4b657641fd4434c88bc5
--- 1/arch/arm/boot/dts/omap5-board-common.dtsi
--- 2/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@@ -14,6 -14,29 +14,29 @@@
                display0 = &hdmi0;
        };
  
+       vmain: fixedregulator-vmain {
+               compatible = "regulator-fixed";
+               regulator-name = "vmain";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+       };
+ 
+       vsys_cobra: fixedregulator-vsys_cobra {
+               compatible = "regulator-fixed";
+               regulator-name = "vsys_cobra";
+               vin-supply = <&vmain>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+       };
+ 
+       vdds_1v8_main: fixedregulator-vdds_1v8_main {
+               compatible = "regulator-fixed";
+               regulator-name = "vdds_1v8_main";
+               vin-supply = <&smps7_reg>;
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+       };
+ 
        vmmcsd_fixed: fixedregulator-mmcsd {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
@@@ -309,7 -332,7 +332,7 @@@
  
        wlcore_irq_pin: pinmux_wlcore_irq_pin {
                pinctrl-single,pins = <
-                       OMAP5_IOPAD(0x40, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE6)     /* llia_wakereqin.gpio1_wk14 */
+                       OMAP5_IOPAD(0x40, PIN_INPUT_PULLUP | MUX_MODE6) /* llia_wakereqin.gpio1_wk14 */
                >;
        };
  };
@@@ -409,6 -432,26 +432,26 @@@
  
                        ti,ldo6-vibrator;
  
+                       smps123-in-supply = <&vsys_cobra>;
+                       smps45-in-supply = <&vsys_cobra>;
+                       smps6-in-supply = <&vsys_cobra>;
+                       smps7-in-supply = <&vsys_cobra>;
+                       smps8-in-supply = <&vsys_cobra>;
+                       smps9-in-supply = <&vsys_cobra>;
+                       smps10_out2-in-supply = <&vsys_cobra>;
+                       smps10_out1-in-supply = <&vsys_cobra>;
+                       ldo1-in-supply = <&vsys_cobra>;
+                       ldo2-in-supply = <&vsys_cobra>;
+                       ldo3-in-supply = <&vdds_1v8_main>;
+                       ldo4-in-supply = <&vdds_1v8_main>;
+                       ldo5-in-supply = <&vsys_cobra>;
+                       ldo6-in-supply = <&vdds_1v8_main>;
+                       ldo7-in-supply = <&vsys_cobra>;
+                       ldo8-in-supply = <&vsys_cobra>;
+                       ldo9-in-supply = <&vmmcsd_fixed>;
+                       ldoln-in-supply = <&vsys_cobra>;
+                       ldousb-in-supply = <&vsys_cobra>;
+ 
                        regulators {
                                smps123_reg: smps123 {
                                        /* VDD_OPP_MPU */
@@@ -482,7 -525,7 +525,7 @@@
                                ldo1_reg: ldo1 {
                                        /* VDDAPHY_CAM: vdda_csiport */
                                        regulator-name = "ldo1";
 -                                      regulator-min-microvolt = <1500000>;
 +                                      regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                };
  
@@@ -508,7 -551,7 +551,7 @@@
                                ldo4_reg: ldo4 {
                                        /* VDDAPHY_DISP: vdda_dsiport/hdmi */
                                        regulator-name = "ldo4";
 -                                      regulator-min-microvolt = <1500000>;
 +                                      regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                };
  
@@@ -600,7 -643,8 +643,8 @@@
                pinctrl-0 = <&twl6040_pins>;
  
                interrupts = <GIC_SPI 119 IRQ_TYPE_NONE>; /* IRQ_SYS_2N cascaded to gic */
-               ti,audpwron-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>;  /* gpio line 141 */
+ 
+               /* audpwron gpio defined in the board specific dts */
  
                vio-supply = <&smps7_reg>;
                v2v1-supply = <&smps9_reg>;