Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97fbac83 authored by Meng Wang's avatar Meng Wang Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: change sound card config for msm8909w 



DMIC0_CLK/DATA are connected to GPIO4/5, add pinctrl setting
to enable DMIC0.
As msm8909w wtp has different hardware design with msm8909 mtp,
update digital codec and sound card config for msm8909w wtp device.

Change-Id: I74e814052c61effca00580f27ef70880397b542d
Signed-off-by: default avatarMeng Wang <mwang@codeaurora.org>
parent cdc2029e

arch/arm/boot/dts/qcom/msm8909-pinctrl.dtsi

+55 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1888,6 +1888,60 @@ 
			};

		};



		cdc-dmic-lines {

			cdc_dmic0_clk_act: dmic0_clk_on {

				mux {

					pins = "gpio4";

					function = "dmic0_clk";

				};



				config {

					pins = "gpio4";

					drive-strength = <8>;

					bias-pull-none;

				};

			};



			cdc_dmic0_clk_sus: dmic0_clk_off {

				mux {

					pins = "gpio4";

					function = "gpio";

				};



				config {

					pins = "gpio4";

					drive-strength = <2>;

					bias-disable;

				};

			};



			cdc_dmic0_data_act: dmic0_data_on {

				mux {

					pins = "gpio5";

					function = "dmic0_data";

				};



				config {

					pins = "gpio5";

					drive-strength = <8>;

					bias-pull-none;

				};

			};



			cdc_dmic0_data_sus: dmic0_data_off {

				mux {

					pins = "gpio5";

					function = "gpio";

				};



				config {

					pins = "gpio5";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		cdc-pdm-lines {

			cdc_pdm_lines_act: pdm_lines_on {

				mux {

arch/arm/boot/dts/qcom/msm8909w-wtp-v1.dts

+54 −3
Original line number Diff line number Diff line
@@ -105,10 +105,18 @@ 
			qcom,thermal-handle = <&msm_thermal_freq>;

		};

	};

};



&audio_codec_mtp {

	 /delete-property/ asoc-codec;

	msm_digital_codec: msm-dig-codec@771c000 {

		compatible = "qcom,msm-digital-codec";

		reg = <0x0771c000 0x0>;



		cdc-vdd-digital-supply = <&pm660_l11>;

		qcom,cdc-vdd-digital-voltage = <1800000 1800000>;

		qcom,cdc-vdd-digital-current = <5000>;

		qcom,cdc-on-demand-supplies = "cdc-vdd-digital";



		qcom,subsys-name = "modem";

	};

};



&qcom_seecom {
@@ -239,3 +247,46 @@ 
	qcom,dsi-pref-prim-pan = <&dsi_auo_390p_cmd>;

	qcom,platform-bklight-en-gpio = <&msm_gpio 37 0>;

};



&dai_mi2s3 {

	qcom,msm-mi2s-rx-lines = <1>;

	qcom,msm-mi2s-tx-lines = <2>;

};



&audio_codec_mtp {

	compatible = "qcom,msm8909-audio-codec";

	qcom,model = "msm8909w-wtp-snd-card";

	qcom,msm-ext-pa = "quaternary";

	/delete-property/qcom,split-a2dp;

	qcom,audio-routing =

		"CDC_CONN", "MCLK",

		"QUAT_MI2S_RX", "DIGIT_REGULATOR",

		"TX_I2S_CLK", "DIGIT_REGULATOR",

		"DMIC1", "Digital Mic1",

		"DMIC2", "Digital Mic2";

	qcom,msm-gpios =

		"quat_i2s",

		"dmic";

	qcom,pinctrl-names =

		"all_off",

		"quat_i2s_act",

		"dmic_act",

		"quat_i2s_dmic_act";

	pinctrl-names =

		"all_off",

		"quat_i2s_act",

		"dmic_act",

		"quat_i2s_dmic_act";

	pinctrl-0 = <&quat_mi2s_sleep &quat_mi2s_din_sleep

			&cdc_dmic0_clk_sus &cdc_dmic0_data_sus>;

	pinctrl-1 = <&quat_mi2s_active &quat_mi2s_din_active

			&cdc_dmic0_clk_sus &cdc_dmic0_data_sus>;

	pinctrl-2 = <&quat_mi2s_sleep &quat_mi2s_din_sleep

			&cdc_dmic0_clk_act &cdc_dmic0_data_act>;

	pinctrl-3 = <&quat_mi2s_active &quat_mi2s_din_active

			&cdc_dmic0_clk_act &cdc_dmic0_data_act>;

	/delete-property/qcom,cdc-us-euro-gpios;



	asoc-codec = <&stub_codec>, <&msm_digital_codec>;

	asoc-codec-names = "msm-stub-codec.1", "msm-dig-codec";

};