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

Commit feceaa56 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: vote for corner for vddmx for msm8909"

parents ad05c19f 48ea7e3e

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

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
	};



	qcom,wcnss-wlan@a000000 {

		qcom,pronto-vddmx-supply = <&pm8916_l3>;

		qcom,pronto-vddmx-supply = <&pm8916_l3_corner_ao>;

		qcom,pronto-vddcx-supply = <&pm8916_s1_corner>;

		qcom,pronto-vddpx-supply = <&pm8916_l7>;

		qcom,iris-vddxo-supply   = <&pm8916_l7>;

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

+1 −2
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ 
		interrupts = <0 145 0 0 146 0>;

		interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";



		qcom,pronto-vddmx-supply = <&pm8909_l3>;

		qcom,pronto-vddmx-supply = <&pm8909_l3_corner_ao>;

		qcom,pronto-vddcx-supply = <&pm8909_s1_corner>;

		qcom,pronto-vddpx-supply = <&pm8909_l7>;

		qcom,iris-vddxo-supply   = <&pm8909_l7>;
@@ -745,7 +745,6 @@ 


		qcom,wlan-rx-buff-count = <512>;

		qcom,has-autodetect-xo;

		qcom,is-pronto-vt;

		qcom,is-pronto-v3;

		qcom,has-pronto-hw;

		qcom,wcnss-adc_tm = <&pm8909_adc_tm>;