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

Commit d20b2d7d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: audio overlay changes to enable dp audio"

parents 2ca69d9a b5db7165

qcom/lito-audio-overlay.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 
	qcom,model = "lito-mtp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;

	qcom,wcn-btfm = <1>;

	qcom,ext-disp-audio-rx = <0>;

	qcom,ext-disp-audio-rx = <1>;

	qcom,audio-routing =

		"AMIC1", "MIC BIAS1",

		"MIC BIAS1", "Analog Mic1",
@@ -294,8 +294,9 @@ 
	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;

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

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

	asoc-codec  = <&stub_codec>, <&bolero>, <&ext_disp_audio_codec>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

			   "msm-ext-disp-audio-codec-rx";

	qcom,wsa-max-devs = <2>;

	qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,

			<&wsa881x_0213>, <&wsa881x_0214>;

qcom/lito-cdp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
		};

	};



	qmp_dp_phy_core_supply: qmp_dp_phy_core_supply {

	vdda_usb_ss_dp_core: vdda_usb_ss_dp_core {

		compatible = "regulator-fixed";

		regulator-name = "core_supply";

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

		regulator-name = "vdd_supply";

		regulator-min-microvolt = <880000>;

		regulator-max-microvolt = <880000>;

		enable-active-high;

		gpio = <&pm8150l_gpios 12 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";
@@ -37,11 +37,11 @@ 
};



&usb_qmp_dp_phy {

	core-supply = <&qmp_dp_phy_core_supply>;

	vdd-supply = <&vdda_usb_ss_dp_core>;

};



&sde_dp {

	vdda-0p9-supply = <&qmp_dp_phy_core_supply>;

	vdda-0p9-supply = <&vdda_usb_ss_dp_core>;

};



&pm7250b_vadc {

qcom/lito-mtp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
		};

	};



	qmp_dp_phy_core_supply: qmp_dp_phy_core_supply {

	vdda_usb_ss_dp_core: vdda_usb_ss_dp_core {

		compatible = "regulator-fixed";

		regulator-name = "core_supply";

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

		regulator-name = "vdd_supply";

		regulator-min-microvolt = <880000>;

		regulator-max-microvolt = <880000>;

		enable-active-high;

		gpio = <&pm8150l_gpios 12 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";
@@ -42,11 +42,11 @@ 
};



&usb_qmp_dp_phy {

	core-supply = <&qmp_dp_phy_core_supply>;

	vdd-supply = <&vdda_usb_ss_dp_core>;

};



&sde_dp {

	vdda-0p9-supply = <&qmp_dp_phy_core_supply>;

	vdda-0p9-supply = <&vdda_usb_ss_dp_core>;

};



&ufsphy_mem {

qcom/lito-qrd.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -28,6 +28,24 @@ 
		qcom,batt-id-range-pct = <15>;

		#include "qg-batterydata-atl466271_3300mAh.dtsi"

	};

	vdda_usb_ss_dp_core: vdda_usb_ss_dp_core {

		compatible = "regulator-fixed";

		regulator-name = "vdd_supply";

		regulator-min-microvolt = <880000>;

		regulator-max-microvolt = <880000>;

		enable-active-high;

		gpio = <&pm8150l_gpios 12 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb_eldo13>;

	};

};



&usb_qmp_dp_phy {

	vdd-supply = <&vdda_usb_ss_dp_core>;

};



&sde_dp {

	vdda-0p9-supply = <&vdda_usb_ss_dp_core>;

};



&qupv3_se7_i2c {

qcom/lito-sde.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -563,8 +563,8 @@ 
			qcom,phy-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda-0p9";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-min-voltage = <880000>;

				qcom,supply-max-voltage = <880000>;

				qcom,supply-enable-load = <36000>;

				qcom,supply-disable-load = <0>;

			};