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

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>

13 files changed, 139 insertions, 26 deletions

diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index b01a5948cdd0..0e63b9dff6e7 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -60,10 +60,26 @@
 
                 tps659038_pmic {
                         compatible = "ti,tps659038-pmic";
+
+                        smps12-in-supply = <&vmain>;
+                        smps3-in-supply = <&vmain>;
+                        smps45-in-supply = <&vmain>;
+                        smps6-in-supply = <&vmain>;
+                        smps7-in-supply = <&vmain>;
+                        smps8-in-supply = <&vmain>;
+                        smps9-in-supply = <&vmain>;
+                        ldo1-in-supply = <&vmain>;
+                        ldo2-in-supply = <&vmain>;
+                        ldo3-in-supply = <&vmain>;
+                        ldo4-in-supply = <&vmain>;
+                        ldo9-in-supply = <&vmain>;
+                        ldoln-in-supply = <&vmain>;
+                        ldousb-in-supply = <&vmain>;
+                        ldortc-in-supply = <&vmain>;
+
                         regulators {
                                 smps12_reg: smps12 {
                                         /* VDD_MPU */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps12";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1250000>;
@@ -73,7 +89,6 @@
 
                                 smps3_reg: smps3 {
                                         /* VDD_DDR EMIF1 EMIF2 */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps3";
                                         regulator-min-microvolt = <1350000>;
                                         regulator-max-microvolt = <1350000>;
@@ -84,7 +99,6 @@
                                 smps45_reg: smps45 {
                                         /* VDD_DSPEVE on AM572 */
                                         /* VDD_IVA + VDD_DSP on AM571 */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps45";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1250000>;
@@ -94,7 +108,6 @@
 
                                 smps6_reg: smps6 {
                                         /* VDD_GPU */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps6";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1250000>;
@@ -104,7 +117,6 @@
 
                                 smps7_reg: smps7 {
                                         /* VDD_CORE */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps7";
                                         regulator-min-microvolt = <850000>;
                                         regulator-max-microvolt = <1150000>;
@@ -115,13 +127,11 @@
                                 smps8_reg: smps8 {
                                         /* 5728 - VDD_IVAHD */
                                         /* 5718 - N.C. test point */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps8";
                                 };
 
                                 smps9_reg: smps9 {
                                         /* VDD_3_3D */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "smps9";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
@@ -132,7 +142,6 @@
                                 ldo1_reg: ldo1 {
                                         /* VDDSHV8 - VSDMMC  */
                                         /* NOTE: on rev 1.3a, data supply */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo1";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <3300000>;
@@ -142,7 +151,6 @@
 
                                 ldo2_reg: ldo2 {
                                         /* VDDSH18V */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo2";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -152,7 +160,6 @@
 
                                 ldo3_reg: ldo3 {
                                         /* R1.3a 572x V1_8PHY_LDO3: USB, SATA */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo3";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -162,7 +169,6 @@
 
                                 ldo4_reg: ldo4 {
                                         /* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo4";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -174,7 +180,6 @@
 
                                 ldo9_reg: ldo9 {
                                         /* VDD_RTC  */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldo9";
                                         regulator-min-microvolt = <840000>;
                                         regulator-max-microvolt = <1160000>;
@@ -184,7 +189,6 @@
 
                                 ldoln_reg: ldoln {
                                         /* VDDA_1V8_PLL */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldoln";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -194,7 +198,6 @@
 
                                 ldousb_reg: ldousb {
                                         /* VDDA_3V_USB: VDDA_USBHS33 */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldousb";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
@@ -204,7 +207,6 @@
 
                                 ldortc_reg: ldortc {
                                         /* VDDA_RTC  */
-                                        vin-supply = <&vmain>;
                                         regulator-name = "ldortc";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index cbc17b0794b1..4128fa91823c 100644
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -93,6 +93,10 @@
         };
 };
 
+&mmc1 {
+        status = "disabled";
+};
+
 &mmc2 {
         pinctrl-names = "default";
         pinctrl-0 = <&sd1_pins>;
@@ -101,6 +105,10 @@
         cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
 };
 
+&mmc3 {
+        status = "disabled";
+};
+
 &pincntl {
         sd1_pins: pinmux_sd1_pins {
                 pinctrl-single,pins = <
diff --git a/arch/arm/boot/dts/dm8148-t410.dts b/arch/arm/boot/dts/dm8148-t410.dts
index 5d4313fd5a46..3f184863e0c5 100644
--- a/arch/arm/boot/dts/dm8148-t410.dts
+++ b/arch/arm/boot/dts/dm8148-t410.dts
@@ -45,6 +45,14 @@
         phy-mode = "rgmii";
 };
 
+&mmc1 {
+        status = "disabled";
+};
+
+&mmc2 {
+        status = "disabled";
+};
+
 &mmc3 {
         pinctrl-names = "default";
         pinctrl-0 = <&sd2_pins>;
@@ -53,6 +61,7 @@
         dmas = <&edma_xbar 8 0 1        /* use SDTXEVT1 instead of MCASP0TX */
                 &edma_xbar 9 0 2>;      /* use SDRXEVT1 instead of MCASP0RX */
         dma-names = "tx", "rx";
+        non-removable;
 };
 
 &pincntl {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index e0074014385a..3a8f3976f6f9 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1451,6 +1451,8 @@
                         ti,hwmods = "gpmc";
                         reg = <0x50000000 0x37c>;      /* device IO registers */
                         interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&edma_xbar 4 0>;
+                        dma-names = "rxtx";
                         gpmc,num-cs = <8>;
                         gpmc,num-waitpins = <2>;
                         #address-cells = <2>;
diff --git a/arch/arm/boot/dts/omap3-evm-37xx.dts b/arch/arm/boot/dts/omap3-evm-37xx.dts
index 76056ba92ced..ed449827c3d3 100644
--- a/arch/arm/boot/dts/omap3-evm-37xx.dts
+++ b/arch/arm/boot/dts/omap3-evm-37xx.dts
@@ -85,7 +85,7 @@
                         OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */
                         OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */
                         OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */
-                        OMAP3_CORE1_IOPAD(0x215e, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
+                        OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
                         OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */
                         OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */
                 >;
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index 41f5d386f21f..f4f2ce46d681 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -188,6 +188,7 @@
         vmmc-supply = <&vmmc1>;
         vmmc_aux-supply = <&vsim>;
         bus-width = <4>;
+        cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;
 };
 
 &mmc3 {
diff --git a/arch/arm/boot/dts/omap3-igep0020-common.dtsi b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
index d6f839cab649..b6971060648a 100644
--- a/arch/arm/boot/dts/omap3-igep0020-common.dtsi
+++ b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
@@ -194,6 +194,12 @@
                         OMAP3630_CORE2_IOPAD(0x25f8, PIN_OUTPUT | MUX_MODE4) /* etk_d14.gpio_28 */
                 >;
         };
+
+        mmc1_wp_pins: pinmux_mmc1_cd_pins {
+                pinctrl-single,pins = <
+                        OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT | MUX_MODE4)   /* etk_d15.gpio_29 */
+                >;
+        };
 };
 
 &i2c3 {
@@ -250,3 +256,8 @@
                 };
         };
 };
+
+&mmc1 {
+        pinctrl-0 = <&mmc1_pins &mmc1_wp_pins>;
+        wp-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; /* gpio_29 */
+};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index d9e2d9c6e999..2b74a81d1de2 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -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 @@
         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 */
diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index a00ca761675d..927b17fc4ed8 100644
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -97,7 +97,7 @@
                         OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1)            /* ssi1_dat_tx */
                         OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1)            /* ssi1_flag_tx */
                         OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1)      /* ssi1_rdy_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(0x2184, PIN_INPUT | MUX_MODE1)             /* ssi1_dat_rx */
                         OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1)             /* ssi1_flag_rx */
                         OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE1)            /* ssi1_rdy_rx */
@@ -110,7 +110,7 @@
                         OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE7)            /* ssi1_dat_tx */
                         OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE7)            /* ssi1_flag_tx */
                         OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLDOWN | MUX_MODE7)    /* ssi1_rdy_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(0x2184, PIN_INPUT | MUX_MODE7)             /* ssi1_dat_rx */
                         OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE7)             /* ssi1_flag_rx */
                         OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE4)            /* ssi1_rdy_rx */
@@ -120,7 +120,7 @@
 
         modem_pins1: pinmux_modem_core1_pins {
                 pinctrl-single,pins = <
-                        OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio_34 (ape_rst_rq) */
+                        OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | MUX_MODE4)        /* gpio_34 (ape_rst_rq) */
                         OMAP3_CORE1_IOPAD(0x2100, PIN_OUTPUT | MUX_MODE4)            /* gpio_88 (cmt_rst_rq) */
                         OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE4)            /* gpio_93 (cmt_apeslpx) */
                 >;
diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts
index f19170bdcc1f..c29b41dc7b95 100644
--- a/arch/arm/boot/dts/omap3-zoom3.dts
+++ b/arch/arm/boot/dts/omap3-zoom3.dts
@@ -98,7 +98,7 @@
                 pinctrl-single,pins = <
                         OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts */
                         OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0)               /* uart2_rts.uart2_rts */
-                        OMAP3_CORE1_IOPAD(0x217a, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
+                        OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)                /* uart2_rx.uart2_rx */
                         OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0)               /* uart2_tx.uart2_tx */
                 >;
         };
@@ -107,7 +107,7 @@
                 pinctrl-single,pins = <
                         OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLDOWN | MUX_MODE0)       /* uart3_cts_rctx.uart3_cts_rctx */
                         OMAP3_CORE1_IOPAD(0x219c, PIN_OUTPUT | MUX_MODE0)               /* uart3_rts_sd.uart3_rts_sd */
-                        OMAP3_CORE1_IOPAD(0x219e, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+                        OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)                /* uart3_rx_irrx.uart3_rx_irrx */
                         OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)               /* uart3_tx_irtx.uart3_tx_irtx */
                 >;
         };
@@ -125,7 +125,7 @@
                 pinctrl-single,pins = <
                         OMAP3630_CORE2_IOPAD(0x25d8, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_clk.sdmmc3_clk */
                         OMAP3630_CORE2_IOPAD(0x25e4, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d4.sdmmc3_dat0 */
-                        OMAP3630_CORE2_IOPAD(0x25e6, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE2) /* etk_d5.sdmmc3_dat1 */
+                        OMAP3630_CORE2_IOPAD(0x25e6, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d5.sdmmc3_dat1 */
                         OMAP3630_CORE2_IOPAD(0x25e8, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d6.sdmmc3_dat2 */
                         OMAP3630_CORE2_IOPAD(0x25e2, PIN_INPUT_PULLUP | MUX_MODE2)      /* etk_d3.sdmmc3_dat3 */
                 >;
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index dc759a3028b7..5d5b620b7d9b 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -14,6 +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 @@
 
         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 @@
 
                         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 */
@@ -600,7 +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>;
diff --git a/arch/arm/boot/dts/omap5-igep0050.dts b/arch/arm/boot/dts/omap5-igep0050.dts
index 46ecb1dd3b5c..f75ce02fb398 100644
--- a/arch/arm/boot/dts/omap5-igep0050.dts
+++ b/arch/arm/boot/dts/omap5-igep0050.dts
@@ -35,6 +35,22 @@
         };
 };
 
+/* LDO4 is VPP1 - ball AD9 */
+&ldo4_reg {
+        regulator-min-microvolt = <2000000>;
+        regulator-max-microvolt = <2000000>;
+};
+
+/*
+ * LDO7 is used for HDMI: VDDA_DSIPORTA - ball AA33, VDDA_DSIPORTC - ball AE33,
+ * VDDA_HDMI - ball AN25
+ */
+&ldo7_reg {
+        status = "okay";
+        regulator-min-microvolt = <1800000>;
+        regulator-max-microvolt = <1800000>;
+};
+
 &omap5_pmx_core {
         i2c4_pins: pinmux_i2c4_pins {
                 pinctrl-single,pins = <
@@ -52,3 +68,13 @@
                 <&gpio7 3 0>;           /* 195, SDA */
 };
 
+&twl6040 {
+        ti,audpwron-gpio = <&gpio5 16 GPIO_ACTIVE_HIGH>;  /* gpio line 144 */
+};
+
+&twl6040_pins {
+        pinctrl-single,pins = <
+                OMAP5_IOPAD(0x1c4, PIN_OUTPUT | MUX_MODE6)      /* mcspi1_somi.gpio5_144 */
+                OMAP5_IOPAD(0x1ca, PIN_OUTPUT | MUX_MODE6)      /* perslimbus2_clock.gpio5_145 */
+        >;
+};
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 60b3fbb3bf07..a51e60518eb6 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -51,3 +51,13 @@
                 <&gpio9 1 GPIO_ACTIVE_HIGH>,    /* TCA6424A P00, LS OE */
                 <&gpio7 1 GPIO_ACTIVE_HIGH>;    /* GPIO 193, HPD */
 };
+
+&twl6040 {
+        ti,audpwron-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>;  /* gpio line 141 */
+};
+
+&twl6040_pins {
+        pinctrl-single,pins = <
+                OMAP5_IOPAD(0x1be, PIN_OUTPUT | MUX_MODE6)      /* mcspi1_somi.gpio5_141 */
+        >;
+};