Merge "ARM: dts: msm: Move SMD packet node to GLINK packet for mdmcalifornium" (e5237f8d) · Commits · e / devices / android_kernel_xiaomi_markw

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

+57 −70

Original line number	Diff line number	Diff line
		@@ -48,11 +48,6 @@
		};

		aliases {
		smd7 = &smdtty_data1;
		smd8 = &smdtty_data4;
		smd11 = &smdtty_data11;
		smd21 = &smdtty_data21;
		smd36 = &smdtty_loopback;
		qpic_nand1 = &qnand_1;
		sdhc1 = &sdhc_1; /* SDC1 eMMC/SD slot */
		};
		@@ -682,70 +677,6 @@
		};
		};

		qcom,smdpkt {
		compatible = "qcom,smdpkt";

		qcom,smdpkt-data5-cntl {
		qcom,smdpkt-remote = "modem";
		qcom,smdpkt-port-name = "DATA5_CNTL";
		qcom,smdpkt-dev-name = "smdcntl0";
		};

		qcom,smdpkt-data22 {
		qcom,smdpkt-remote = "modem";
		qcom,smdpkt-port-name = "DATA22";
		qcom,smdpkt-dev-name = "smd22";
		};

		qcom,smdpkt-data40-cntl {
		qcom,smdpkt-remote = "modem";
		qcom,smdpkt-port-name = "DATA40_CNTL";
		qcom,smdpkt-dev-name = "smdcntl8";
		};

		qcom,smdpkt-apr-apps2 {
		qcom,smdpkt-remote = "modem";
		qcom,smdpkt-port-name = "apr_apps2";
		qcom,smdpkt-dev-name = "apr_apps2";
		};

		qcom,smdpkt-loopback {
		qcom,smdpkt-remote = "modem";
		qcom,smdpkt-port-name = "LOOPBACK";
		qcom,smdpkt-dev-name = "smd_pkt_loopback";
		};
		};

		qcom,smdtty {
		compatible = "qcom,smdtty";

		smdtty_data1: qcom,smdtty-data1 {
		qcom,smdtty-remote = "modem";
		qcom,smdtty-port-name = "DATA1";
		};

		smdtty_data4: qcom,smdtty-data4 {
		qcom,smdtty-remote = "modem";
		qcom,smdtty-port-name = "DATA4";
		};

		smdtty_data11: qcom,smdtty-data11 {
		qcom,smdtty-remote = "modem";
		qcom,smdtty-port-name = "DATA11";
		};

		smdtty_data21: qcom,smdtty-data21 {
		qcom,smdtty-remote = "modem";
		qcom,smdtty-port-name = "DATA21";
		};

		smdtty_loopback: smdtty-loopback {
		qcom,smdtty-remote = "modem";
		qcom,smdtty-port-name = "LOOPBACK";
		qcom,smdtty-dev-name = "LOOPBACK_TTY";
		};
		};

		qcom,glink-smem-native-xprt-modem@87e80000 {
		compatible = "qcom,glink-smem-native-xprt";
		reg = <0x87e80000 0xc0000>,
		@@ -786,7 +717,7 @@
		compatible = "qcom,glinkpkt";

		qcom,glinkpkt-at-mdm0 {
		qcom,glinkpkt-transport = "smd_trans";
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DS";
		qcom,glinkpkt-dev-name = "at_mdm0";
		@@ -805,6 +736,62 @@
		qcom,glinkpkt-ch-name = "glink_pkt_lloop_CLNT";
		qcom,glinkpkt-dev-name = "glink_pkt_loopback";
		};

		qcom,glinkpkt-data5-cntl {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DATA5_CNTL";
		qcom,glinkpkt-dev-name = "smdcntl0";
		};

		qcom,glinkpkt-apr-apps2 {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "apr_apps2";
		qcom,glinkpkt-dev-name = "apr_apps2";
		};

		qcom,glinkpkt-data22 {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DATA22";
		qcom,glinkpkt-dev-name = "smd22";
		};

		qcom,glinkpkt-data40-cntl {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DATA40_CNTL";
		qcom,glinkpkt-dev-name = "smdcntl8";
		};

		qcom,glinkpkt-data1 {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DATA1";
		qcom,glinkpkt-dev-name = "smd1";
		};

		qcom,glinkpkt-data4 {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DATA4";
		qcom,glinkpkt-dev-name = "smd4";
		};

		qcom,glinkpkt-data11 {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DATA11";
		qcom,glinkpkt-dev-name = "smd11";
		};

		qcom,glinkpkt-data21 {
		qcom,glinkpkt-transport = "smem";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DATA21";
		qcom,glinkpkt-dev-name = "smd21";
		};
		};

		qcom,ipc_router {