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

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

Merge "wcnss: Memory map change for wcnss subsystem"

parents 048c6ef4 b209209a

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

+5 −1
Original line number Diff line number Diff line
@@ -8,7 +8,11 @@ connectivity subsystem. 
Required properties:

- compatible: "wcnss_wlan"

- reg: physical address and length of the register set for the device.

- reg-names: "wcnss_mmio", "wcnss_fiq"

- reg-names: "wcnss_mmio", "wcnss_fiq", "pronto_phy_base", "riva_phy_base",

             "riva_ccu_base", "pronto_a2xb_base", "pronto_ccpu_base",

             "pronto_saw2_base", "wlan_tx_phy_aborts","wlan_brdg_err_source",

             "wlan_tx_status", "alarms_txctl", "alarms_tactl",

             "pronto_mcu_base".

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

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

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

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

+22 −2
Original line number Diff line number Diff line
@@ -724,8 +724,28 @@ 
	qcom,wcnss-wlan@fb000000 {

		compatible = "qcom,wcnss_wlan";

		reg = <0xfb000000 0x280000>,

			<0xf9011008 0x04>;

		reg-names = "wcnss_mmio", "wcnss_fiq";

			<0xf9011008 0x04>,

			<0xfb21b000 0x3000>,

			<0x03204000 0x00000100>,

			<0x03200800 0x00000200>,

			<0xfb100400 0x00000200>,

			<0xfb205050 0x00000200>,

			<0xfb219000 0x00000020>,

			<0xfb080488 0x00000008>,

			<0xfb080fb0 0x00000008>,

			<0xfb08040c 0x00000008>,

			<0xfb0120a8 0x00000008>,

			<0xfb012448 0x00000008>,

			<0xfb080c00 0x00000001>;



		reg-names = "wcnss_mmio", "wcnss_fiq",

			    "pronto_phy_base", "riva_phy_base",

			    "riva_ccu_base", "pronto_a2xb_base",

			    "pronto_ccpu_base", "pronto_saw2_base",

			    "wlan_tx_phy_aborts","wlan_brdg_err_source",

			    "wlan_tx_status", "alarms_txctl",

			    "alarms_tactl", "pronto_mcu_base";



		interrupts = <0 145 0 0 146 0>;

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

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

+22 −2
Original line number Diff line number Diff line
@@ -873,8 +873,28 @@ 
	qcom,wcnss-wlan@fb000000 {

		compatible = "qcom,wcnss_wlan";

		reg = <0xfb000000 0x280000>,

			<0xf9011008 0x04>;

		reg-names = "wcnss_mmio", "wcnss_fiq";

			<0xf9011008 0x04>,

			<0xfb21b000 0x3000>,

			<0x03204000 0x00000100>,

			<0x03200800 0x00000200>,

			<0xfb100400 0x00000200>,

			<0xfb205050 0x00000200>,

			<0xfb219000 0x00000020>,

			<0xfb080488 0x00000008>,

			<0xfb080fb0 0x00000008>,

			<0xfb08040c 0x00000008>,

			<0xfb0120a8 0x00000008>,

			<0xfb012448 0x00000008>,

			<0xfb080c00 0x00000001>;



		reg-names = "wcnss_mmio", "wcnss_fiq",

			    "pronto_phy_base", "riva_phy_base",

			    "riva_ccu_base", "pronto_a2xb_base",

			    "pronto_ccpu_base", "pronto_saw2_base",

			    "wlan_tx_phy_aborts","wlan_brdg_err_source",

			    "wlan_tx_status", "alarms_txctl",

			    "alarms_tactl", "pronto_mcu_base";



		interrupts = <0 145 0>, <0 146 0>;

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

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

+40 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,46 @@ 
		compatible = "qcom,iris_fm";

	};



	qcom,wcnss-wlan@0a000000 {

		compatible = "qcom,wcnss_wlan";

		reg = <0x0a000000 0x280000>,

			<0xb011008 0x04>,

			<0x0a21b000 0x3000>,

			<0x03204000 0x00000100>,

			<0x03200800 0x00000200>,

			<0x0A100400 0x00000200>,

			<0x0A205050 0x00000200>,

			<0x0A219000 0x00000020>,

			<0x0A080488 0x00000008>,

			<0x0A080fb0 0x00000008>,

			<0x0A08040c 0x00000008>,

			<0x0A0120a8 0x00000008>,

			<0x0A012448 0x00000008>,

			<0x0A080c00 0x00000001>;



		reg-names = "wcnss_mmio", "wcnss_fiq",

			    "pronto_phy_base", "riva_phy_base",

			    "riva_ccu_base", "pronto_a2xb_base",

			    "pronto_ccpu_base", "pronto_saw2_base",

			    "wlan_tx_phy_aborts","wlan_brdg_err_source",

			    "wlan_tx_status", "alarms_txctl",

			    "alarms_tactl", "pronto_mcu_base";



		interrupts = <0 145 0 0 146 0>;

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



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

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

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

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

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

		qcom,iris-vddpa-supply   = <&pm8916_l9>;

		qcom,iris-vdddig-supply  = <&pm8916_l5>;



		qcom,has-autodetect-xo;

		qcom,has-pronto-hw;

	};



	spi_0: spi@78b7000 { /* BLSP1 QUP3 */

		compatible = "qcom,spi-qup-v2";

                #address-cells = <1>;

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

+22 −2
Original line number Diff line number Diff line
@@ -2059,8 +2059,28 @@ 
	qcom,wcnss-wlan@fb000000 {

		compatible = "qcom,wcnss_wlan";

		reg = <0xfb000000 0x280000>,

			<0xf9011008 0x04>;

		reg-names = "wcnss_mmio", "wcnss_fiq";

			<0xf9011008 0x04>,

			<0xfb21b000 0x3000>,

			<0x03204000 0x00000100>,

			<0x03200800 0x00000200>,

			<0xfb100400 0x00000200>,

			<0xfb205050 0x00000200>,

			<0xfb219000 0x00000020>,

			<0xfb080488 0x00000008>,

			<0xfb080fb0 0x00000008>,

			<0xfb08040c 0x00000008>,

			<0xfb0120a8 0x00000008>,

			<0xfb012448 0x00000008>,

			<0xfb080c00 0x00000001>;



		reg-names = "wcnss_mmio", "wcnss_fiq",

			    "pronto_phy_base", "riva_phy_base",

			    "riva_ccu_base", "pronto_a2xb_base",

			    "pronto_ccpu_base", "pronto_saw2_base",

			    "wlan_tx_phy_aborts","wlan_brdg_err_source",

			    "wlan_tx_status", "alarms_txctl",

			    "alarms_tactl", "pronto_mcu_base";



		interrupts = <0 145 0 0 146 0>;

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