Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / boot / dts / qcom-apq8064.dtsi

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 6089c8d56cd549c6476a519bb5efe82f29258315..3ca96e3618787be4931ed1c22b3192547ac0ac13 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -591,6 +591,7 @@
                                clocks = <&gcc GSBI6_QUP_CLK>,
                                         <&gcc GSBI6_H_CLK>;
                                clock-names = "core", "iface";
+                               status = "disabled";
                        };
                };
 
@@ -907,11 +908,11 @@
                                usb_hs1_phy: phy {
                                        compatible = "qcom,usb-hs-phy-apq8064",
                                                     "qcom,usb-hs-phy";
-                                       #phy-cells = <0>;
                                        clocks = <&sleep_clk>, <&cxo_board>;
                                        clock-names = "sleep", "ref";
                                        resets = <&usb1 0>;
                                        reset-names = "por";
+                                       #phy-cells = <0>;
                                };
                        };
                };
@@ -1264,6 +1265,7 @@
                dsi0_phy: dsi-phy@4700200 {
                        compatible = "qcom,dsi-phy-28nm-8960";
                        #clock-cells = <1>;
+                       #phy-cells = <0>;
 
                        reg = <0x04700200 0x100>,
                                <0x04700300 0x200>,
@@ -1418,6 +1420,7 @@
 
                        clocks = <&mmcc HDMI_S_AHB_CLK>;
                        clock-names = "slave_iface_clk";
+                       #phy-cells = <0>;
                };
 
                mdp: mdp@5100000 {