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

Commit aee16947 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Configure spkdrv supply for APQ8084"

parents e8cb1718 d361be98

arch/arm/boot/dts/apq8084-cdp.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -446,6 +446,12 @@ 
		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;



		cdc-vdd-spkdrv-supply = <&hdmi_vreg>;

		qcom,cdc-vdd-spkdrv-voltage = <5000000 5000000>;

		qcom,cdc-vdd-spkdrv-current = <1250000>;



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

	};

};

arch/arm/boot/dts/apq8084-liquid.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -264,12 +264,26 @@ 
	status = "ok";

};



&vph_pwr_vreg {

	status = "ok";

};



&slim_msm {

	taiko_codec {

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias2-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;



		/*

		 * Liquid has external spkrdrv supply. Give a dummy supply

		 * to make codec driver happy.

		 */

		cdc-vdd-spkdrv-supply = <&vph_pwr_vreg>;

		qcom,cdc-vdd-spkdrv-voltage = <0 0>;

		qcom,cdc-vdd-spkdrv-current = <0>;



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

	};

};

arch/arm/boot/dts/apq8084-mtp.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -254,11 +254,25 @@ 
	status = "ok";

};



&vph_pwr_vreg {

	status = "ok";

};



&slim_msm {

	taiko_codec {

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias2-ext-cap;

		qcom,cdc-micbias3-ext-cap;



		/*

		 * spkrdrv supply in MTP device is from VPH_PWR which is

		 * always ON. Give a dummy supply to make codec driver happy.

		 */

		cdc-vdd-spkdrv-supply = <&vph_pwr_vreg>;

		qcom,cdc-vdd-spkdrv-voltage = <0 0>;

		qcom,cdc-vdd-spkdrv-current = <0>;



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

	};

};

arch/arm/boot/dts/apq8084-regulator.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -533,4 +533,15 @@ 
		enable-active-high;

		gpio = <&pma8084_gpios 9 0>;

	};



	/*

	 * vph_pwr_vreg represents the unregulated battery voltage supply

	 * VPH_PWR that is present whenever the device is powered on.

	 */

	vph_pwr_vreg: vph_pwr_vreg {

		compatible = "regulator-fixed";

		regulator-name = "vph_pwr";

		status = "disabled";

		regulator-always-on;

	};

};