From 299b122e6c23f547a99a89fd8e98971111d25c40 Mon Sep 17 00:00:00 2001 From: Laxminath Kasam Date: Sun, 5 Apr 2015 18:38:28 +0530 Subject: [PATCH] ARM: dts: msm: fix audio gpio conflict with uart in 8909 cdp As UART is default enabled in CDP, request for audio boost that uses same gpio as uart result in failure. Remove the gpio4 request from audio pinctrl request to fix conflict in gpio requests. Change-Id: I4f44718b27860f4cf3d30eb5deb3063e46b75237 Signed-off-by: Laxminath Kasam --- arch/arm/boot/dts/qcom/msm8909-cdp.dtsi | 8 +++----- arch/arm/boot/dts/qcom/msm8909-pm8909-cdp.dtsi | 12 ------------ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/qcom/msm8909-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8909-cdp.dtsi index 7db31bb9af01..26929c4d34c2 100644 --- a/arch/arm/boot/dts/qcom/msm8909-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8909-cdp.dtsi @@ -242,11 +242,9 @@ "cdc_lines_sec_ext_act", "cdc_lines_sec_ext_sus", "cdc_lines_quat_ext_act", - "cdc_lines_quat_ext_sus", - "vdd_spkdrv_act", - "vdd_spkdrv_sus"; - pinctrl-0 = <&cdc_pdm_lines_act &vdd_spkdrv_act>; - pinctrl-1 = <&cdc_pdm_lines_sus &vdd_spkdrv_sus>; + "cdc_lines_quat_ext_sus"; + pinctrl-0 = <&cdc_pdm_lines_act>; + pinctrl-1 = <&cdc_pdm_lines_sus>; pinctrl-2 = <&cross_conn_det_act>; pinctrl-3 = <&cross_conn_det_sus>; pinctrl-4 = <&cdc_pdm_lines_act &cdc_ext_pa_act diff --git a/arch/arm/boot/dts/qcom/msm8909-pm8909-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8909-pm8909-cdp.dtsi index 732a49298c2d..4dd9dd547df3 100644 --- a/arch/arm/boot/dts/qcom/msm8909-pm8909-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8909-pm8909-cdp.dtsi @@ -106,18 +106,6 @@ qcom,msm-micbias2-ext-cap; }; -&spk_vreg { - status = "okay"; -}; - -&pm8909_conga_dig { - cdc-vdd-spkdrv-supply = <&spk_vreg>; - qcom,cdc-vdd-spkdrv-voltage = <5000000 5000000>; - qcom,cdc-vdd-spkdrv-current = <20000>; - qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias", - "cdc-vdd-spkdrv"; -}; - &wcnss { qcom,wcnss-vadc = <&pm8909_vadc>; };