5 files changed, 15 insertions, 6 deletions

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index b3c26a96a726..d9e2d9c6e999 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -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 */
 };
 
@@ -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 */
 };
 
@@ -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;
 };
 
@@ -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;
 };
 
@@ -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 --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index 387dc31822fe..96f8ce7bd2af 100644
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -46,7 +46,7 @@
                                0x480bd800 0x017c>;
                         interrupts = <24>;
                         iommus = <&mmu_isp>;
-                        syscon = <&scm_conf 0xdc>;
+                        syscon = <&scm_conf 0x6c>;
                         ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
                         #clock-cells = <1>;
                         ports {
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 902657d6713b..914bf4c47404 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -472,7 +472,7 @@
                                 ldo1_reg: ldo1 {
                                         /* VDDAPHY_CAM: vdda_csiport */
                                         regulator-name = "ldo1";
-                                        regulator-min-microvolt = <1500000>;
+                                        regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
                                 };
 
@@ -498,7 +498,7 @@
                                 ldo4_reg: ldo4 {
                                         /* VDDAPHY_DISP: vdda_dsiport/hdmi */
                                         regulator-name = "ldo4";
-                                        regulator-min-microvolt = <1500000>;
+                                        regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
                                 };
 
diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index ecc591dc0778..4d87d9c6c86d 100644
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -513,7 +513,7 @@
                                 ldo1_reg: ldo1 {
                                         /* VDDAPHY_CAM: vdda_csiport */
                                         regulator-name = "ldo1";
-                                        regulator-min-microvolt = <1500000>;
+                                        regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
                                 };
 
@@ -537,7 +537,7 @@
                                 ldo4_reg: ldo4 {
                                         /* VDDAPHY_DISP: vdda_dsiport/hdmi */
                                         regulator-name = "ldo4";
-                                        regulator-min-microvolt = <1500000>;
+                                        regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
                                 };
 
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 38805ebbe2ba..120b6b80cd39 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -269,7 +269,7 @@
                         omap5_pmx_wkup: pinmux@c840 {
                                 compatible = "ti,omap5-padconf",
                                              "pinctrl-single";
-                                reg = <0xc840 0x0038>;
+                                reg = <0xc840 0x003c>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 #interrupt-cells = <1>;