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

Commit 430ea012 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: use a corner regulator for wcnss VDD_CX on all boards"

parents a88f2060 412908b0

Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt

+3 −2
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ Required properties: 
- reg-names: "wcnss_mmio", "wcnss_fiq"

- interupts: Pronto to Apps interrupts for tx done and rx pending.

- qcom,pronto-vddmx-supply: regulator to supply pronto pll.

- qcom,pronto-vddcx-supply: regulator to supply WLAN/BT/FM digital module.

- qcom,pronto-vddcx-supply: voltage corner regulator to supply WLAN/BT/FM

                            digital module.

- qcom,pronto-vddpx-supply: regulator to supply WLAN DAC.

- qcom,iris-vddxo-supply  : regulator to supply RF XO.

- qcom,iris-vddrfa-supply : regulator to supply RFA digital.
@@ -39,7 +40,7 @@ Example: 
        interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";



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

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

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

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

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

        qcom,iris-vddrfa-supply = <&pm8941_l11>;

arch/arm/boot/dts/msm8226.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ 
		interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";



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

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

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

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

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

		qcom,iris-vddrfa-supply = <&pm8226_l24>;

arch/arm/boot/dts/msm8610.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ 
		interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";



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

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

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

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

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

		qcom,iris-vddrfa-supply = <&pm8110_l5>;

arch/arm/boot/dts/msm8974.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1928,7 +1928,7 @@ 
		interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";



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

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

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

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

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

		qcom,iris-vddrfa-supply = <&pm8941_l11>;

arch/arm/boot/dts/msm8974pro-ac.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 


	qcom,wcnss-wlan@fb000000 {

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

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

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

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

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

		qcom,iris-vddrfa-supply = <&pma8084_l11>;