Merge "ARM: dts: msm: Enable audio support for sdm439 interposer" (513494c8) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/msm8937-interposer-sdm439.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@

		#include "msm8937.dtsi"
		#include "sdm439-pm8953.dtsi"
		#include "sdm439-audio.dtsi"
		#include "sdm439-pmi632.dtsi"

		&soc {

arch/arm64/boot/dts/qcom/sdm439-audio.dtsi

0 → 100644

+94 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 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
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		&soc {
		int_codec: sound {
		qcom,msm-hs-micbias-type = "internal";

		asoc-codec = <&stub_codec>, <&msm_digital_codec>,
		<&pmic_analog_codec>;
		asoc-codec-names = "msm-stub-codec.1", "msm-dig-codec",
		"analog-codec";
		msm-vdd-wsa-switch-supply = <&pm8953_l5>;
		qcom,msm-vdd-wsa-switch-voltage = <1800000>;
		qcom,msm-vdd-wsa-switch-current = <10000>;
		};
		};

		&pm8953_1 {
		pmic_analog_codec: analog-codec@f000 {
		status = "okay";
		compatible = "qcom,pmic-analog-codec";
		reg = <0xf000 0x200>;
		#address-cells = <2>;
		#size-cells = <0>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x1 0xf0 0x0 IRQ_TYPE_NONE>,
		<0x1 0xf0 0x1 IRQ_TYPE_NONE>,
		<0x1 0xf0 0x2 IRQ_TYPE_NONE>,
		<0x1 0xf0 0x3 IRQ_TYPE_NONE>,
		<0x1 0xf0 0x4 IRQ_TYPE_NONE>,
		<0x1 0xf0 0x5 IRQ_TYPE_NONE>,
		<0x1 0xf0 0x6 IRQ_TYPE_NONE>,
		<0x1 0xf0 0x7 IRQ_TYPE_NONE>,
		<0x1 0xf1 0x0 IRQ_TYPE_NONE>,
		<0x1 0xf1 0x1 IRQ_TYPE_NONE>,
		<0x1 0xf1 0x2 IRQ_TYPE_NONE>,
		<0x1 0xf1 0x3 IRQ_TYPE_NONE>,
		<0x1 0xf1 0x4 IRQ_TYPE_NONE>,
		<0x1 0xf1 0x5 IRQ_TYPE_NONE>;
		interrupt-names = "spk_cnp_int",
		"spk_clip_int",
		"spk_ocp_int",
		"ins_rem_det1",
		"but_rel_det",
		"but_press_det",
		"ins_rem_det",
		"mbhc_int",
		"ear_ocp_int",
		"hphr_ocp_int",
		"hphl_ocp_det",
		"ear_cnp_int",
		"hphr_cnp_int",
		"hphl_cnp_int";

		cdc-vdda-cp-supply = <&pm8953_s4>;
		qcom,cdc-vdda-cp-voltage = <1900000 2050000>;
		qcom,cdc-vdda-cp-current = <500000>;

		cdc-vdd-io-supply = <&pm8953_l5>;
		qcom,cdc-vdd-io-voltage = <1800000 1800000>;
		qcom,cdc-vdd-io-current = <5000>;

		cdc-vdd-pa-supply = <&pm8953_s4>;
		qcom,cdc-vdd-pa-voltage = <1900000 2050000>;
		qcom,cdc-vdd-pa-current = <260000>;

		cdc-vdd-mic-bias-supply = <&pm8953_l13>;
		qcom,cdc-vdd-mic-bias-voltage = <3125000 3125000>;
		qcom,cdc-vdd-mic-bias-current = <5000>;

		qcom,cdc-mclk-clk-rate = <9600000>;

		qcom,cdc-static-supplies = "cdc-vdd-io",
		"cdc-vdd-pa",
		"cdc-vdda-cp";

		qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias";

		msm_digital_codec: msm-dig-codec {
		compatible = "qcom,msm-digital-codec";
		reg = <0xc0f0000 0x0>;
		};
		};
		};

arch/arm64/boot/dts/qcom/sdm439-pm8953.dtsi

+19 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,25 @@
		/delete-node/ pa-therm0-adc;
		};

		&int_codec {
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		/delete-property/ msm-vdd-wsa-switch-supply;
		};

		&clock_audio {
		/delete-property/ qcom,audio-ref-clk-gpio;
		};

		&wcd9335 {
		/delete-property/ cdc-vdd-buck-supply;
		/delete-property/ cdc-buck-sido-supply;
		/delete-property/ cdc-vdd-tx-h-supply;
		/delete-property/ cdc-vdd-rx-h-supply;
		/delete-property/ cdc-vdd-px-supply;
		/delete-property/ cdc-vdd-mic-bias-supply;
		};

		&soc {
		/delete-node/ regulator@01946004;
		/delete-node/ regulator@b018000;