ARM: dts: stm32: fix dma controller node name on stm32f743

[linux-2.6-microblaze.git] / arch / arm / boot / dts / qcom-msm8974-fairphone-fp2.dts

diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
index bf402ae..2616039 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
@@ -221,6 +221,8 @@
                                                regulator-max-microvolt = <2950000>;
 
                                                regulator-boot-on;
+                                               regulator-system-load = <200000>;
+                                               regulator-allow-set-load;
                                        };
 
                                        l21 {
@@ -272,14 +274,6 @@
                        };
                };
 
-               sdhc2_cd_pin_a: sdhc2-cd-pin-active {
-                       pins = "gpio62";
-                       function = "gpio";
-
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-
                sdhc2_pin_a: sdhc2-pin-active {
                        clk {
                                pins = "sdc2_clk";
@@ -317,7 +311,7 @@
                bus-width = <4>;
 
                pinctrl-names = "default";
-               pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;
+               pinctrl-0 = <&sdhc2_pin_a>;
        };
 
        usb@f9a55000 {
@@ -344,6 +338,16 @@
                        };
                };
        };
+
+       imem@fe805000 {
+               status = "okay";
+
+               reboot-mode {
+                       mode-normal     = <0x77665501>;
+                       mode-bootloader = <0x77665500>;
+                       mode-recovery   = <0x77665502>;
+               };
+       };
 };
 
 &spmi_bus {