Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-apq8064-asus-nexus7-flo.dts

diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index 7b05f072bfc28b168d5c30e776d4d0879f6add84..b72e09506448d40da5f46cc6beee4109bde4def7 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -253,6 +253,7 @@
                        vddcx-supply    = <&pm8921_s3>;
                        v3p3-supply     = <&pm8921_l3>;
                        v1p8-supply     = <&pm8921_l4>;
+                       dr_mode         = "otg";
                };
 
                gadget@12500000 {
@@ -272,5 +273,19 @@
                                vqmmc-supply = <&pm8921_s4>;
                        };
                };
+
+               imem@2a03f000 {
+                       compatible = "syscon", "simple-mfd";
+                       reg = <0x2a03f000 0x1000>;
+
+                       reboot-mode {
+                               compatible = "syscon-reboot-mode";
+                               offset = <0x65c>;
+
+                               mode-normal     = <0x77665501>;
+                               mode-bootloader = <0x77665500>;
+                               mode-recovery   = <0x77665502>;
+                       };
+               };
        };
 };