Merge tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-apq8064-pins.dtsi

diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
index 6b801e7e57a2103f8cfb9f00a21bf071d25c71a7..173ab7c299cea326055e1fa6cc9da27018895b89 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
@@ -284,4 +284,41 @@
                        bias-disable = <0>;
                };
        };
+
+       riva_fm_pin_a: riva-fm-active {
+               pins = "gpio14", "gpio15";
+               function = "riva_fm";
+       };
+
+       riva_bt_pin_a: riva-bt-active {
+               pins = "gpio16", "gpio17";
+               function = "riva_bt";
+       };
+
+       riva_wlan_pin_a: riva-wlan-active {
+               pins = "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";
+               function = "riva_wlan";
+
+               drive-strength = <6>;
+               bias-pull-down;
+       };
+
+       hdmi_pinctrl: hdmi-pinctrl {
+               mux {
+                       pins = "gpio70", "gpio71", "gpio72";
+                       function = "hdmi";
+               };
+
+               pinconf_ddc {
+                       pins = "gpio70", "gpio71";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf_hpd {
+                       pins = "gpio72";
+                       bias-pull-down;
+                       drive-strength = <16>;
+               };
+       };
 };