Merge "ARM: dts: msm: Add IPC Router devices for MSMCOBALT" (3932b994) · Commits · e / devices / android_kernel_xiaomi_markw

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

+100 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,106 @@
		qcom,xprt = "smem";
		};

		qcom,glink-smem-native-xprt-modem@86000000 {
		compatible = "qcom,glink-smem-native-xprt";
		reg = <0x86000000 0x200000>,
		<0x17820010 0x4>;
		reg-names = "smem", "irq-reg-base";
		qcom,irq-mask = <0x8000>;
		interrupts = <0 452 1>;
		label = "mpss";
		};

		qcom,glink-smem-native-xprt-adsp@86000000 {
		compatible = "qcom,glink-smem-native-xprt";
		reg = <0x86000000 0x200000>,
		<0x17820010 0x4>;
		reg-names = "smem", "irq-reg-base";
		qcom,irq-mask = <0x200>;
		interrupts = <0 157 1>;
		label = "lpass";
		};

		qcom,glink-smem-native-xprt-dsps@86000000 {
		compatible = "qcom,glink-smem-native-xprt";
		reg = <0x86000000 0x200000>,
		<0x17820010 0x4>;
		reg-names = "smem", "irq-reg-base";
		qcom,irq-mask = <0x8000000>;
		interrupts = <0 179 1>;
		label = "dsps";
		};

		qcom,glink-smem-native-xprt-rpm@778000 {
		compatible = "qcom,glink-rpm-native-xprt";
		reg = <0x778000 0x8000>,
		<0x17820010 0x4>;
		reg-names = "msgram", "irq-reg-base";
		qcom,irq-mask = <0x1>;
		interrupts = <0 168 1>;
		label = "rpm";
		};

		qcom,glink_pkt {
		compatible = "qcom,glinkpkt";

		qcom,glinkpkt-at-mdm0 {
		qcom,glinkpkt-transport = "smd_trans";
		qcom,glinkpkt-edge = "mpss";
		qcom,glinkpkt-ch-name = "DS";
		qcom,glinkpkt-dev-name = "at_mdm0";
		};

		qcom,glinkpkt-loopback_cntl {
		qcom,glinkpkt-transport = "lloop";
		qcom,glinkpkt-edge = "local";
		qcom,glinkpkt-ch-name = "LOCAL_LOOPBACK_CLNT";
		qcom,glinkpkt-dev-name = "glink_pkt_loopback_ctrl";
		};

		qcom,glinkpkt-loopback_data {
		qcom,glinkpkt-transport = "lloop";
		qcom,glinkpkt-edge = "local";
		qcom,glinkpkt-ch-name = "glink_pkt_lloop_CLNT";
		qcom,glinkpkt-dev-name = "glink_pkt_loopback";
		};
		};

		qcom,ipc_router {
		compatible = "qcom,ipc_router";
		qcom,node-id = <1>;
		};

		qcom,ipc_router_modem_xprt {
		compatible = "qcom,ipc_router_glink_xprt";
		qcom,ch-name = "IPCRTR";
		qcom,xprt-remote = "mpss";
		qcom,glink-xprt = "smem";
		qcom,xprt-linkid = <1>;
		qcom,xprt-version = <1>;
		qcom,fragmented-data;
		};

		qcom,ipc_router_q6_xprt {
		compatible = "qcom,ipc_router_glink_xprt";
		qcom,ch-name = "IPCRTR";
		qcom,xprt-remote = "lpass";
		qcom,glink-xprt = "smem";
		qcom,xprt-linkid = <1>;
		qcom,xprt-version = <1>;
		qcom,fragmented-data;
		};

		qcom,ipc_router_dsps_xprt {
		compatible = "qcom,ipc_router_glink_xprt";
		qcom,ch-name = "IPCRTR";
		qcom,xprt-remote = "dsps";
		qcom,glink-xprt = "smem";
		qcom,xprt-linkid = <1>;
		qcom,xprt-version = <1>;
		qcom,fragmented-data;
		};

		ufsphy1: ufsphy@1da7000 {
		compatible = "qcom,ufs-phy-qmp-v3";
		reg = <0x1da7000 0xda8>;

drivers/soc/qcom/glink_smem_native_xprt.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -2299,17 +2299,17 @@ static int glink_rpm_native_probe(struct platform_device *pdev)
		RPM_TOC_SIZE);
		tocp = (uint32_t *)toc;
		if (*tocp != RPM_TOC_ID) {
		rc = ENODEV;
		rc = -ENODEV;
		pr_err("%s: TOC id %d is not valid\n", __func__, *tocp);
		goto kthread_fail;
		goto toc_init_fail;
		}
		++tocp;
		num_toc_entries = *tocp;
		if (num_toc_entries > RPM_MAX_TOC_ENTRIES) {
		rc = ENODEV;
		rc = -ENODEV;
		pr_err("%s: %d is too many toc entries\n", __func__,
		num_toc_entries);
		goto kthread_fail;
		goto toc_init_fail;
		}
		++tocp;

		@@ -2339,9 +2339,9 @@ static int glink_rpm_native_probe(struct platform_device *pdev)
		break;
		}
		if (!einfo->tx_fifo) {
		rc = ENODEV;
		rc = -ENODEV;
		pr_err("%s: tx fifo not found\n", __func__);
		goto kthread_fail;
		goto toc_init_fail;
		}

		tocp = (uint32_t *)toc;
		@@ -2372,9 +2372,9 @@ static int glink_rpm_native_probe(struct platform_device *pdev)
		break;
		}
		if (!einfo->rx_fifo) {
		rc = ENODEV;
		rc = -ENODEV;
		pr_err("%s: rx fifo not found\n", __func__);
		goto kthread_fail;
		goto toc_init_fail;
		}

		einfo->tx_ch_desc->write_index = 0;
		@@ -2410,6 +2410,7 @@ static int glink_rpm_native_probe(struct platform_device *pdev)
		request_irq_fail:
		glink_core_unregister_transport(&einfo->xprt_if);
		reg_xprt_fail:
		toc_init_fail:
		flush_kthread_worker(&einfo->kworker);
		kthread_stop(einfo->task);
		einfo->task = NULL;