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

Commit 8f2bcb7b authored by Yu Wang's avatar Yu Wang
Browse files

ARM: dts: msm: move cnss related nodes to board device tree for sa6155 



The configurations for external BT/WLAN devices are
NOT SoC specific, but board specific.
Therefore, move them from SoC device tree to board
device tree.

Change-Id: Ifd7be297d6477e5d94564106218c41e0b2fae726
Signed-off-by: default avatarYu Wang <yyuwang@codeaurora.org>
parent 12e2085e

arch/arm64/boot/dts/qcom/sa6155-adp-air.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ 
 */

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/qcom,gcc-sm6150.h>

#include "sa6155-cnss.dtsi"



&bluetooth_ext {

	status = "ok";

};



&qupv3_se6_spi {

	status = "ok";
@@ -120,9 +124,6 @@ 
		};

	};



	bluetooth_ext: bt_qca6174 {

		status = "ok";

	};

};



&ufsphy_mem {

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ 
 */

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/qcom,gcc-sm6150.h>

#include "sa6155-cnss.dtsi"



&bluetooth_ext {

	status = "ok";

};



&qupv3_se6_spi {

	status = "ok";
@@ -120,9 +124,6 @@ 
		};

	};



	bluetooth_ext: bt_qca6174 {

		status = "ok";

	};

};



&ufsphy_mem {

arch/arm64/boot/dts/qcom/sa6155-cnss.dtsi

0 → 100644
+223 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	/* PWR_CTR1_VDD_1P8 supply */

	vreg_conn_1p8: vreg_conn_1p8 {

		compatible = "regulator-fixed";

		regulator-name = "vreg_conn_1p8";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm6155_1_gpios 1 0>;

	};



	/* PWR_CTR2_VDD_PA supply */

	vreg_conn_pa: vreg_conn_pa {

		compatible = "regulator-fixed";

		regulator-name = "vreg_conn_pa";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm6155_1_gpios 6 0>;

	};



	vreg_wlan: vreg_wlan {

		compatible = "qcom,stub-regulator";

		regulator-name = "vreg_wlan";

	};



	bluetooth_ext: bt_qca6174 {

		compatible = "qca,qca6174";

		/* BT_EN */

		pinctrl-names = "default";

		pinctrl-0 = <&bt_en_active>;

		qca,bt-reset-gpio = <&tlmm 85 0>;

		/* PWR_CTR1_VDD_PA */

		qca,bt-vdd-pa-supply = <&vreg_conn_pa>;

		qca,bt-chip-pwd-supply = <&vreg_conn_1p8>;

		qca,bt-vdd-vm-supply = <&pm6155_1_s6>;

		qca,bt-vdd-5a-supply = <&pm6155_1_s5>;

		qca,bt-vdd-vh-supply = <&pm6155_1_l15>;



		qca,bt-vdd-vm-voltage-level = <1370000 1370000>;

		qca,bt-vdd-5a-voltage-level = <2040000 2040000>;

		qca,bt-vdd-vh-voltage-level = <1904000 1904000>;



		qca,bt-vdd-vm-current-level = <0>;

		qca,bt-vdd-5a-current-level = <0>;

		qca,bt-vdd-vh-current-level = <450000>;



		status = "disabled";

	};



	cnss_pcie: qcom,cnss-qca-converged {

		compatible = "qcom,cnss-qca-converged";



		qcom,converged-dt;

		qcom,wlan-rc-num = <0>;

		qcom,bus-type=<0>;

		qcom,notify-modem-status;

		qcom,msm-bus,name = "msm-cnss";

		qcom,msm-bus,num-cases = <4>;

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-KBps =

			<45 512 0 0>, <1 512 0 0>,

			/* Upto 200 Mbps */

			<45 512 41421 655360>, <1 512 41421 655360>,

			/* Upto 400 Mbps */

			<45 512 98572 655360>, <1 512 98572 1600000>,

			/* Upto 800 Mbps */

			<45 512 207108 1146880>, <1 512 207108 3124992>;



		#address-cells=<1>;

		#size-cells=<1>;

		ranges = <0x10000000 0x10000000 0x10000000>,

		      <0x20000000 0x20000000 0x10000>,

		      <0xa0000000 0xa0000000 0x10000000>,

		      <0xb0000000 0xb0000000 0x10000>;



		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

		vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-rfa1-supply = <&pm6155_1_s6>;

		vdd-wlan-rfa2-supply = <&pm6155_1_s5>;

		vdd-wlan-rfa3-supply = <&pm6155_1_l15>;



		wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2";

		qcom,vdd-wlan-ctrl1-info = <0 0 0 0>;

		qcom,vdd-wlan-ctrl2-info = <0 0 0 0>;



		wlan-en-gpio = <&tlmm 98 0>;

		pinctrl-names = "wlan_en_active", "wlan_en_sleep";

		pinctrl-0 = <&cnss_wlan_en_active>;

		pinctrl-1 = <&cnss_wlan_en_sleep>;



		chip_cfg@0 {

			reg = <0x10000000 0x10000000>,

			    <0x20000000 0x10000>;

			reg-names = "smmu_iova_base", "smmu_iova_ipa";



			supported-ids = <0x003e>;

			wlan_vregs = "vdd-wlan";

			qcom,vdd-wlan-info = <0 0 0 10>;



			qcom,smmu-s1-enable;

			qcom,wlan-ramdump-dynamic = <0x200000>;

		};



		chip_cfg@1 {

			reg = <0xa0000000 0x10000000>,

			    <0xb0000000 0x10000>;

			reg-names = "smmu_iova_base", "smmu_iova_ipa";



			supported-ids = <0x1101>;

			wlan_vregs = "vdd-wlan-rfa1", "vdd-wlan-rfa2",

				   "vdd-wlan-rfa3";

			qcom,vdd-wlan-rfa1-info = <1350000 1350000 0 0>;

			qcom,vdd-wlan-rfa2-info = <2040000 2040000 0 0>;

			qcom,vdd-wlan-rfa3-info = <1904000 1904000 0 0>;



			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;

			mhi,timeout = <10000>;



			mhi_channels {

				mhi_chan@0 {

					reg = <0>;

					label = "LOOPBACK";

					mhi,num-elements = <32>;

					mhi,event-ring = <1>;

					mhi,chan-dir = <1>;

					mhi,data-type = <0>;

					mhi,doorbell-mode = <2>;

					mhi,ee = <0x14>;

				};



				mhi_chan@1 {

					reg = <1>;

					label = "LOOPBACK";

					mhi,num-elements = <32>;

					mhi,event-ring = <1>;

					mhi,chan-dir = <2>;

					mhi,data-type = <0>;

					mhi,doorbell-mode = <2>;

					mhi,ee = <0x14>;

				};



				mhi_chan@4 {

					reg = <4>;

					label = "DIAG";

					mhi,num-elements = <32>;

					mhi,event-ring = <1>;

					mhi,chan-dir = <1>;

					mhi,data-type = <0>;

					mhi,doorbell-mode = <2>;

					mhi,ee = <0x14>;

				};



				mhi_chan@5 {

					reg = <5>;

					label = "DIAG";

					mhi,num-elements = <32>;

					mhi,event-ring = <1>;

					mhi,chan-dir = <2>;

					mhi,data-type = <0>;

					mhi,doorbell-mode = <2>;

					mhi,ee = <0x14>;

				};



				mhi_chan@20 {

					reg = <20>;

					label = "IPCR";

					mhi,num-elements = <32>;

					mhi,event-ring = <1>;

					mhi,chan-dir = <1>;

					mhi,data-type = <1>;

					mhi,doorbell-mode = <2>;

					mhi,ee = <0x14>;

					mhi,auto-start;

				};



				mhi_chan@21 {

					reg = <21>;

					label = "IPCR";

					mhi,num-elements = <32>;

					mhi,event-ring = <1>;

					mhi,chan-dir = <2>;

					mhi,data-type = <0>;

					mhi,doorbell-mode = <2>;

					mhi,ee = <0x14>;

					mhi,auto-queue;

					mhi,auto-start;

				};

			};



			mhi_events {

				mhi_event@0 {

					mhi,num-elements = <32>;

					mhi,intmod = <1>;

					mhi,msi = <1>;

					mhi,priority = <1>;

					mhi,brstmode = <2>;

					mhi,data-type = <1>;

				};



				mhi_event@1 {

					mhi,num-elements = <256>;

					mhi,intmod = <1>;

					mhi,msi = <2>;

					mhi,priority = <1>;

					mhi,brstmode = <2>;

				};

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sa6155-regulator.dtsi

+0 −23
Original line number Diff line number Diff line
@@ -533,28 +533,5 @@ 
			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	/* PWR_CTR1_VDD_1P8 supply */

	vreg_conn_1p8: vreg_conn_1p8 {

		compatible = "regulator-fixed";

		regulator-name = "vreg_conn_1p8";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm6155_1_gpios 1 0>;

	};



	/* PWR_CTR2_VDD_PA supply */

	vreg_conn_pa: vreg_conn_pa {

		compatible = "regulator-fixed";

		regulator-name = "vreg_conn_pa";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm6155_1_gpios 6 0>;

	};



	vreg_wlan: vreg_wlan {

		compatible = "qcom,stub-regulator";

		regulator-name = "vreg_wlan";

	};

};

arch/arm64/boot/dts/qcom/sa6155.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -13,6 +13,7 @@ 
/dts-v1/;



#include "sa6155.dtsi"

#include "sa6155-cnss.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155 SoC";