Merge "ARM: dts: msm: Add device tree support for apq8009 IoT refboard" (3ffbad59) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/apq8009-audio-external_codec.dtsi

+26 −10

Original line number	Diff line number	Diff line
		@@ -19,6 +19,12 @@
		};

		&soc {
		qcom,msm-audio-apr {
		compatible = "qcom,msm-audio-apr";
		msm_audio_apr_dummy {
		compatible = "qcom,msm-audio-apr-dummy";
		};
		};
		sound-9335 {
		compatible = "qcom,apq8009-audio-i2s-codec";
		qcom,model = "apq8009-tashalite-snd-card";
		@@ -234,16 +240,17 @@
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36864>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-sec-port-enable;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36864>;
		qcom,msm-cpudai-tdm-clk-internal = <1>;
		qcom,msm-cpudai-tdm-sync-mode = <0>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <0>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-sec-port-enable;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36864>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};
		@@ -254,17 +261,26 @@
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36865>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-sec-port-enable;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36865>;
		qcom,msm-cpudai-tdm-clk-internal = <1>;
		qcom,msm-cpudai-tdm-sync-mode = <0>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <0>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-sec-port-enable;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36865>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};
		};

		&wcd9xxx_intc {
		status = "okay";
		};

		&clock_audio {
		status = "okay";
		};

arch/arm64/boot/dts/qcom/apq8009-mtp-wcd9326-refboard.dts

+58 −6

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@
		};

		&soc {
		sound-9335 {
		ext_codec: sound-9335 {
		qcom,audio-routing =
		"AIF4 VI", "MCLK",
		"RX_BIAS", "MCLK",
		@@ -112,12 +112,22 @@
		"MIC BIAS3", "Digital Mic3",
		"SpkrLeft IN", "SPK1 OUT",
		"SpkrRight IN", "SPK2 OUT";
		};

		i2c@78b8000 {
		wcd9xxx_codec@d {
		qcom,cdc-reset-gpio = <&msm_gpio 27 0>;
		};
		qcom,msm-gpios =
		"us_eu_gpio";
		qcom,pinctrl-names =
		"all_off",
		"us_eu_gpio_act";
		pinctrl-names =
		"all_off",
		"us_eu_gpio_act";
		pinctrl-0 = <&cross_conn_det_sus>;
		pinctrl-1 = <&cross_conn_det_act>;
		qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;
		qcom,quat-mi2s-gpios = <&cdc_quat_mi2s_gpios>;

		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
		"SpkrLeft", "SpkrRight";
		};

		i2c@78b9000 {
		@@ -205,6 +215,36 @@
		qcom,id-det-gpio = <&msm_gpio 110 0>;
		qcom,dpdm_switch_gpio = <&pm8916_gpios 3 0>;
		};

		i2c@78b8000 {
		wcd9xxx_codec@d {
		status = "okay";
		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;
		};
		};

		cdc_pri_mi2s_gpios: msm_cdc_pinctrl_pri {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&pri_mi2s_active &pri_mi2s_ws_active
		&pri_mi2s_dout_active &pri_mi2s_din_active>;
		pinctrl-1 = <&pri_mi2s_sleep &pri_mi2s_ws_sleep
		&pri_mi2s_dout_sleep &pri_mi2s_din_sleep>;
		};

		cdc_quat_mi2s_gpios: msm_cdc_pinctrl_quat {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&quat_mi2s_active &quat_mi2s_din_active>;
		pinctrl-1 = <&quat_mi2s_sleep &quat_mi2s_din_sleep>;
		};

		wcd_rst_gpio: wcd_gpio_ctrl {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&cdc_reset_active>;
		pinctrl-1 = <&cdc_reset_sleep>;
		};
		};

		&wcnss {
		@@ -327,4 +367,16 @@
		status = "disabled";
		};

		&wcd_rst_gpio {
		status = "okay";
		};

		&ext_codec {
		status = "okay";
		};

		&blsp1_uart2_hs {
		status = "disabled";
		};

		/delete-node/ &cont_splash_mem;

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

+28 −0

Original line number	Diff line number	Diff line
		@@ -1890,6 +1890,34 @@
		};
		};

		cdc_reset_ctrl {
		cdc_reset_sleep: cdc_reset_sleep {
		mux {
		pins = "gpio27";
		function = "gpio";
		};
		config {
		pins = "gpio27";
		drive-strength = <16>;
		bias-disable;
		output-low;
		};
		};
		cdc_reset_active:cdc_reset_active {
		mux {
		pins = "gpio27";
		function = "gpio";
		};
		config {
		pins = "gpio27"; /* gpio67 old */
		drive-strength = <16>;
		bias-pull-down;
		output-high;
		};
		};
		};


		cdc-dmic-lines {
		cdc_dmic0_clk_act: dmic0_clk_on {
		mux {