Merge tag 'pci-v4.5-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[deliverable/linux.git] / arch / arm / boot / dts / qcom-apq8064-ifc6410.dts

diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index 955c697b4dd4fba88d7c2dd39e1186c9b3a1f3ba..fd4d49ef9ef250f45a4b04553c633b17d6a4c8d4 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -76,7 +76,7 @@
 
 
                                /* Buck SMPS */
-                               pm8921_s1: s1 {
+                               s1 {
                                        regulator-always-on;
                                        regulator-min-microvolt = <1225000>;
                                        regulator-max-microvolt = <1225000>;
@@ -84,55 +84,55 @@
                                        bias-pull-down;
                                };
 
-                               pm8921_s3: s3 {
+                               s3 {
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1400000>;
                                        qcom,switch-mode-frequency = <4800000>;
                                };
 
-                               pm8921_s4: s4 {
+                               s4 {
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                        qcom,switch-mode-frequency = <3200000>;
                                };
 
-                               pm8921_s7: s7 {
+                               s7 {
                                        regulator-min-microvolt = <1300000>;
                                        regulator-max-microvolt = <1300000>;
                                        qcom,switch-mode-frequency = <3200000>;
                                };
 
-                               pm8921_l3: l3 {
+                               l3 {
                                        regulator-min-microvolt = <3050000>;
                                        regulator-max-microvolt = <3300000>;
                                        bias-pull-down;
                                };
 
-                               pm8921_l4: l4 {
+                               l4 {
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1800000>;
                                        bias-pull-down;
                                };
 
-                               pm8921_l5: l5 {
+                               l5 {
                                        regulator-min-microvolt = <2750000>;
                                        regulator-max-microvolt = <3000000>;
                                        bias-pull-down;
                                };
 
-                               pm8921_l6: l6 {
+                               l6 {
                                        regulator-min-microvolt = <2950000>;
                                        regulator-max-microvolt = <2950000>;
                                        bias-pull-down;
                                };
 
-                               pm8921_l23: l23 {
+                               l23 {
                                        regulator-min-microvolt = <1700000>;
                                        regulator-max-microvolt = <1900000>;
                                        bias-pull-down;
                                };
 
-                               pm8921_lvs1: lvs1 {
+                               lvs1 {
                                        bias-pull-down;
                                };
 
@@ -180,7 +180,7 @@
 
                gsbi@16500000 {
                        status = "ok";
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
+                       qcom,mode = <GSBI_PROT_UART_W_FC>;
 
                        serial@16540000 {
                                status = "ok";