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

Commit ab4bc4b9 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: Decouple mproc and subsys in fsm9900"

parents 903c7290 e54a897c

arch/arm/boot/dts/qti/fsm9900.dtsi

+44 −38
Original line number Diff line number Diff line
@@ -93,49 +93,55 @@ 
			<0xf9011000 0x1000>;

		reg-names = "smem", "irq-reg-base";



		qcom,smd-modem {

		qcom,smd-hex0 {

			compatible = "qcom,smd";

			qcom,smd-edge = <0>;

			qcom,smd-irq-offset = <0x8>;

			qcom,smd-irq-bitmask = <0x100>;

			qcom,pil-string = "modem";

			interrupts = <0 72 1>;

			label = "hex0";

			qcom,not-loadable;

		};



		qcom,smd-adsp {

		qcom,smd-hex1 {

			compatible = "qcom,smd";

			qcom,smd-edge = <6>;

			qcom,smd-irq-offset = <0x8>;

			qcom,smd-irq-bitmask = <0x1000>;

			interrupts = <0 68 1>;

			label = "hex1";

			qcom,not-loadable;

		};



		qcom,smd-hex2 {

			compatible = "qcom,smd";

			qcom,smd-edge = <1>;

			qcom,smd-irq-offset = <0x8>;

			qcom,smd-irq-bitmask = <0x10000>;

			qcom,pil-string = "adsp";

			interrupts = <0 64 1>;

			label = "hex2";

			qcom,not-loadable;

		};



		qcom,smd-dsps {

		qcom,smd-hex3 {

			compatible = "qcom,smd";

			qcom,smd-edge = <3>;

			qcom,smd-irq-offset = <0x8>;

			qcom,smd-irq-bitmask = <0x100000>;

			qcom,pil-string = "dsps";

			interrupts = <0 60 1>;

			label = "hex3";

			qcom,not-loadable;

		};



		qcom,smd-wcnss {

			compatible = "qcom,smd";

			qcom,smd-edge = <6>;

			qcom,smd-irq-offset = <0x8>;

			qcom,smd-irq-bitmask = <0x1000>;

			qcom,pil-string = "wcnss";

			interrupts = <0 68 1>;

		};



		qcom,smd-rpm {

		qcom,smd-tenx {

			compatible = "qcom,smd";

			qcom,smd-edge = <15>;

			qcom,smd-irq-offset = <0x8>;

			qcom,smd-irq-bitmask = <0x10>;

			qcom,pil-string = "rpm";

			interrupts = <0 26 1>;

			label = "tenx";

			qcom,not-loadable;

		};

	};
@@ -143,79 +149,79 @@ 
		compatible = "qcom,smdpkt";



		qcom,smdpkt-logging_1 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-remote = "hex0";

			qcom,smdpkt-port-name = "LOGGING_1";

			qcom,smdpkt-dev-name = "smd_logging_1";

		};



		qcom,smdpkt-cdm_logging_1 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-remote = "hex0";

			qcom,smdpkt-port-name = "CDM LOGGING_1";

			qcom,smdpkt-dev-name = "smd_cdm_logging_1";

		};



		qcom,smdpkt-logging_2 {

			qcom,smdpkt-remote = "wcnss";

			qcom,smdpkt-remote = "hex1";

			qcom,smdpkt-port-name = "LOGGING_2";

			qcom,smdpkt-dev-name = "smd_logging_2";

		};



		qcom,smdpkt-cdm_logging_2 {

			qcom,smdpkt-remote = "wcnss";

			qcom,smdpkt-remote = "hex1";

			qcom,smdpkt-port-name = "CDM LOGGING_2";

			qcom,smdpkt-dev-name = "smd_cdm_logging_2";

		};



		qcom,smdpkt-mnr {

			qcom,smdpkt-remote = "wcnss";

			qcom,smdpkt-remote = "hex1";

			qcom,smdpkt-port-name = "MNR_DATA";

			qcom,smdpkt-dev-name = "smd_mnr_data";

		};



		qcom,smdpkt-data_2 {

			qcom,smdpkt-remote = "wcnss";

			qcom,smdpkt-remote = "hex1";

			qcom,smdpkt-port-name = "DATA_2";

			qcom,smdpkt-dev-name = "smd_data_2";

		};



		qcom,smdpkt-logging_0 {

			qcom,smdpkt-remote = "adsp";

			qcom,smdpkt-remote = "hex2";

			qcom,smdpkt-port-name = "LOGGING";

			qcom,smdpkt-dev-name = "smd_logging_0";

		};



		qcom,smdpkt-data_0 {

			qcom,smdpkt-remote = "adsp";

			qcom,smdpkt-remote = "hex2";

			qcom,smdpkt-port-name = "DATA";

			qcom,smdpkt-dev-name = "smd_data_0";

		};



		qcom,smdpkt-tf_0 {

			qcom,smdpkt-remote = "adsp";

			qcom,smdpkt-remote = "hex2";

			qcom,smdpkt-port-name = "TESTFRAMEWORK";

			qcom,smdpkt-dev-name = "smd_tf_0";

		};



		qcom,smdpkt-logging_3 {

			qcom,smdpkt-remote = "dsps";

			qcom,smdpkt-remote = "hex3";

			qcom,smdpkt-port-name = "LOGGING_3";

			qcom,smdpkt-dev-name = "smd_logging_3";

		};



		qcom,smdpkt-data_3 {

			qcom,smdpkt-remote = "dsps";

			qcom,smdpkt-remote = "hex3";

			qcom,smdpkt-port-name = "DATA_3";

			qcom,smdpkt-dev-name = "smd_data_3";

		};



		qcom,smdpkt-tf_3 {

			qcom,smdpkt-remote = "dsps";

			qcom,smdpkt-remote = "hex3";

			qcom,smdpkt-port-name = "TESTFRAMEWORK_3";

			qcom,smdpkt-dev-name = "smd_tf_3";

		};



		qcom,smdpkt-logging_4 {

			qcom,smdpkt-remote = "rpm";

			qcom,smdpkt-remote = "tenx";

			qcom,smdpkt-port-name = "LOGGING_4";

			qcom,smdpkt-dev-name = "smd_logging_4";

		};
@@ -226,37 +232,37 @@ 
		qcom,node-id = <1>;

	};



	qcom,ipc_router_modem_xprt {

	qcom,ipc_router_hex0_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "modem";

		qcom,xprt-remote = "hex0";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;

	};



	qcom,ipc_router_adsp_xprt {

	qcom,ipc_router_hex1_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "adsp";

		qcom,xprt-remote = "hex1";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;

	};



	qcom,ipc_router_dsps_xprt {

	qcom,ipc_router_hex2_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "dsps";

		qcom,xprt-remote = "hex2";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;

	};



	qcom,ipc_router_wcnss_xprt {

	qcom,ipc_router_hex3_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "wcnss";

		qcom,xprt-remote = "hex3";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;
@@ -265,7 +271,7 @@ 
	qcom,ipc_router_q6fs_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "rpm";

		qcom,xprt-remote = "tenx";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;