Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-apq8064-arrow-sd-600eval.dts

diff --git a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
index 39ae2bc8cb084a288873812c9530cff7e402a959..8f5de029bca9eae93ae957ce525ba1550f2a7d0c 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
@@ -39,6 +39,17 @@
 
        };
 
+       hdmi-out {
+               compatible = "hdmi-connector";
+               type = "a";
+
+               port {
+                       hdmi_con: endpoint {
+                               remote-endpoint = <&hdmi_out>;
+                       };
+               };
+       };
+
        soc {
                rpm@108000 {
                        regulators {
@@ -74,6 +85,14 @@
                                        bias-pull-down;
                                };
 
+                               s2 {
+                                       regulator-min-microvolt = <1300000>;
+                                       regulator-max-microvolt = <1300000>;
+                                       qcom,switch-mode-frequency = <1600000>;
+                                       bias-pull-down;
+                                       regulator-always-on;
+                               };
+
                                s3 {
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1400000>;
@@ -121,6 +140,16 @@
                                        bias-pull-down;
                                };
 
+                               /**
+                                * 1.8v required on LS expansion
+                                * for mezzanine boards
+                                */
+                               l15 {
+                                       regulator-min-microvolt = <1800000>;
+                                       regulator-max-microvolt = <1800000>;
+                                       regulator-always-on;
+                               };
+
                                l23 {
                                        regulator-min-microvolt = <1700000>;
                                        regulator-max-microvolt = <1900000>;
@@ -347,5 +376,45 @@
                                cd-gpios        = <&tlmm_pinmux 26 GPIO_ACTIVE_HIGH>;
                        };
                };
+
+               riva-pil@3204000 {
+                       status = "okay";
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;
+               };
+
+               hdmi-tx@4a00000 {
+                       status = "okay";
+                       core-vdda-supply = <&pm8921_hdmi_switch>;
+                       hdmi-mux-supply = <&vcc3v3>;
+
+                       hpd-gpio = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;
+
+                       ports {
+                               port@1 {
+                                       endpoint {
+                                               remote-endpoint = <&hdmi_con>;
+                                       };
+                               };
+                       };
+               };
+
+               hdmi-phy@4a00400 {
+                       status = "okay";
+                       core-vdda-supply = <&pm8921_hdmi_switch>;
+               };
+
+               mdp@5100000 {
+                       status = "okay";
+
+                       ports {
+                               port@3 {
+                                       endpoint {
+                                               remote-endpoint = <&hdmi_in>;
+                                       };
+                               };
+                       };
+               };
        };
 };