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

Commit fdb43836 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable modem subsystem"

parents 4c79b77d 56f3d47c
Loading
Loading
Loading
Loading
+1497 −0

File added.

Preview size limit exceeded, changes collapsed.

+72 −5
Original line number Diff line number Diff line
@@ -289,6 +289,14 @@
			size = <0x0 0x1000000>;
		};

		memshare_mem: memshare_region {
			compatible = "shared-dma-pool";
			no-map;
			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
			alignment = <0x0 0x100000>;
			size = <0x0 0x800000>;
		};

		/* global autoconfigured region for contiguous allocations */
		linux,cma {
			compatible = "shared-dma-pool";
@@ -337,6 +345,20 @@
		#interrupt-cells = <2>;
	};

	bluetooth: bt_wcn3990 {
		compatible = "qcom,wcn3990";
		qcom,bt-sw-ctrl-gpio = <&tlmm 87 0>; /* SW_CTRL */
		qcom,bt-vdd-io-supply =   <&L15A>;  /* IO */
		qcom,bt-vdd-core-supply = <&L10A>; /* RFA */
		qcom,bt-vdd-pa-supply =   <&L22A>; /* CH0 */
		qcom,bt-vdd-xtal-supply = <&L13A>; /* XO */

		qcom,bt-vdd-io-config = <1700000 1900000 1 0>;
		qcom,bt-vdd-core-config = <1304000 1304000 1 0>;
		qcom,bt-vdd-pa-config = <3000000 3312000 1 0>;
		qcom,bt-vdd-xtal-config = <1700000 1900000 1 0>;
	};

	timer {
		compatible = "arm,armv8-timer";
		interrupts = <1 1 0xf08>,
@@ -486,7 +508,7 @@
		reg = <0x0 0x280000>;
		reg-names = "rmtfs";
		qcom,client-id = <0x00000001>;
		qcom,guard-memory;
		qcom,vm-nav-path;
	};

	thermal_zones: thermal-zones { };
@@ -821,8 +843,11 @@
		reg = <0x1400000 0x1f0000>;
		reg-names = "cc_base";
		vdd_cx-supply = <&VDD_CX_LEVEL>;
		vdd_cx_ao-supply = <&VDD_CX_LEVEL_AO>;
		vdd_mx-supply = <&VDD_MX_LEVEL>;
		clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
			 <&rpmcc RPM_SMD_XO_A_CLK_SRC>,
			 <&sleep_clk>;
		clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk";
		#clock-cells = <1>;
		#reset-cells = <1>;
	};
@@ -1047,6 +1072,14 @@
		qcom,smem-state-names = "qcom,force-stop";
	};

	qcom,ipa_fws {
		compatible = "qcom,pil-tz-generic";
		qcom,pas-id = <0xf>;
		qcom,firmware-name = "ipa_fws";
		qcom,pil-force-shutdown;
		memory-region = <&pil_ipa_fw_mem>;
	};

	pil_modem: qcom,mss@6080000 {
		compatible = "qcom,pil-tz-generic";
		reg = <0x6080000 0x100>;
@@ -1304,8 +1337,8 @@
		vdd-1.8-xo-supply = <&L13A>;
		vdd-1.3-rfa-supply = <&L10A>;
		vdd-3.3-ch0-supply = <&L22A>;
		qcom,vdd-cx-mx-config = <640000 640000>;
		qcom,vdd-3.3-ch0-config = <3000000 3312000>;
		qcom,vdd-cx-mx-config = <640000 640000 0 0 1>;
		qcom,vdd-3.3-ch0-config = <3000000 3312000 0 0 0>;
		qcom,smp2p_map_wlan_1_in {
			interrupts-extended = <&smp2p_wlan_1_in 0 0>,
					      <&smp2p_wlan_1_in 1 0>;
@@ -1330,7 +1363,7 @@
	};

	system_noc: interconnect@1880000 {
		reg = <0x01880000 0x60200>;
		reg = <0x01880000 0x5e080>;
		compatible = "qcom,scuba-system_noc";
		#interconnect-cells = <1>;
	};
@@ -1347,6 +1380,35 @@
		#interconnect-cells = <1>;
	};

	qcom,memshare {
		compatible = "qcom,memshare";

		qcom,client_1 {
			compatible = "qcom,memshare-peripheral";
			qcom,peripheral-size = <0x0>;
			qcom,client-id = <0>;
			qcom,allocate-boot-time;
			label = "modem";
		};

		qcom,client_2 {
			compatible = "qcom,memshare-peripheral";
			qcom,peripheral-size = <0x0>;
			qcom,client-id = <2>;
			label = "modem";
		};

		qcom,client_3 {
			compatible = "qcom,memshare-peripheral";
			qcom,peripheral-size = <0x500000>;
			memory-region = <&memshare_mem>;
			qcom,client-id = <1>;
			qcom,allocate-on-request;
			label = "modem";
		};
	};


	qcom-secure-buffer {
		compatible = "qcom,secure-buffer";
	};
@@ -1362,6 +1424,7 @@
#include "qrb2210-rb1-qupv3.dtsi"
#include "qrb2210-rb1-gdsc.dtsi"
#include "qrb2210-rb1-usb.dtsi"
#include "qrb2210-rb1-coresight.dtsi"

&qupv3_se1_i2c {
	#address-cells = <1>;
@@ -1562,3 +1625,7 @@
&qupv3_se4_2uart {
	status = "ok";
};

&qupv3_se3_4uart {
	status = "ok";
};