Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / arch / arm / boot / dts / dbx5x0.dtsi

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index aaa63d0a80968b20abd4660492fb2af1ed463072..b6bc4ff17f26481be92cff13ab9d2e46880ead41 100644 (file)
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -191,7 +191,7 @@
 
                prcmu: prcmu@80157000 {
                        compatible = "stericsson,db8500-prcmu";
-                       reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
+                       reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
                        reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
                        interrupts = <0 47 0x4>;
                        #address-cells = <1>;
@@ -674,10 +674,13 @@
                        compatible = "regulator-gpio";
 
                        regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <2600000>;
+                       regulator-max-microvolt = <2900000>;
                        regulator-name = "mmci-reg";
                        regulator-type = "voltage";
 
+                       startup-delay-us = <100>;
+                       enable-active-high;
+
                        states = <1800000 0x1
                                  2900000 0x0>;