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

Commit 2142ac25 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: Add IPC ROUTER devices for msmtitanium"

parents 6f7ee06b df104488

arch/arm/boot/dts/qcom/msmtitanium-smp2p.dtsi

0 → 100644
+160 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, 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 {

	qcom,smp2p-modem@0x0b011008 {

		compatible = "qcom,smp2p";

		reg = <0x0b011008 0x4>;

		qcom,remote-pid = <1>;

		qcom,irq-bitmask = <0x4000>;

		interrupts = <0 27 1>;

	};



	qcom,smp2p-wcnss@0x0b011008 {

		compatible = "qcom,smp2p";

		reg = <0x0b011008 0x4>;

		qcom,remote-pid = <4>;

		qcom,irq-bitmask = <0x40000>;

		interrupts = <0 143 1>;

	};



	qcom,smp2p-adsp@0x0b011008 {

		compatible = "qcom,smp2p";

		reg = <0x0b011008 0x4>;

		qcom,remote-pid = <2>;

		qcom,irq-bitmask = <0x400>;

		interrupts = <0 291 1>;

	};



	smp2pgpio_smp2p_15_in: qcom,smp2pgpio-smp2p-15-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <15>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_15_in {

		compatible = "qcom,smp2pgpio_test_smp2p_15_in";

		gpios = <&smp2pgpio_smp2p_15_in 0 0>;

	};



	smp2pgpio_smp2p_15_out: qcom,smp2pgpio-smp2p-15-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <15>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_15_out {

		compatible = "qcom,smp2pgpio_test_smp2p_15_out";

		gpios = <&smp2pgpio_smp2p_15_out 0 0>;

	};



	smp2pgpio_smp2p_1_in: qcom,smp2pgpio-smp2p-1-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <1>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_1_in {

		compatible = "qcom,smp2pgpio_test_smp2p_1_in";

		gpios = <&smp2pgpio_smp2p_1_in 0 0>;

	};



	smp2pgpio_smp2p_1_out: qcom,smp2pgpio-smp2p-1-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <1>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_1_out {

		compatible = "qcom,smp2pgpio_test_smp2p_1_out";

		gpios = <&smp2pgpio_smp2p_1_out 0 0>;

	};



	smp2pgpio_smp2p_4_in: qcom,smp2pgpio-smp2p-4-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <4>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_4_in {

		compatible = "qcom,smp2pgpio_test_smp2p_4_in";

		gpios = <&smp2pgpio_smp2p_4_in 0 0>;

	};



	smp2pgpio_smp2p_4_out: qcom,smp2pgpio-smp2p-4-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <4>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_4_out {

		compatible = "qcom,smp2pgpio_test_smp2p_4_out";

		gpios = <&smp2pgpio_smp2p_4_out 0 0>;

	};



	smp2pgpio_smp2p_2_in: qcom,smp2pgpio-smp2p-2-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <2>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_2_in {

		compatible = "qcom,smp2pgpio_test_smp2p_2_in";

		gpios = <&smp2pgpio_smp2p_2_in 0 0>;

	};



	smp2pgpio_smp2p_2_out: qcom,smp2pgpio-smp2p-2-out {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "smp2p";

		qcom,remote-pid = <2>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	qcom,smp2pgpio_test_smp2p_2_out {

		compatible = "qcom,smp2pgpio_test_smp2p_2_out";

		gpios = <&smp2pgpio_smp2p_2_out 0 0>;

	};

};

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

+216 −0
Original line number Diff line number Diff line
@@ -63,6 +63,21 @@ 
		};

	};



	aliases {

		/* smdtty devices */

		smd1 = &smdtty_apps_fm;

		smd2 = &smdtty_apps_riva_bt_acl;

		smd3 = &smdtty_apps_riva_bt_cmd;

		smd4 = &smdtty_mbalbridge;

		smd5 = &smdtty_apps_riva_ant_cmd;

		smd6 = &smdtty_apps_riva_ant_data;

		smd7 = &smdtty_data1;

		smd8 = &smdtty_data4;

		smd11 = &smdtty_data11;

		smd21 = &smdtty_data21;

		smd36 = &smdtty_loopback;

	};



	soc: soc { };



};
@@ -70,6 +85,7 @@ 
#include "msmtitanium-pinctrl.dtsi"

#include "msmtitanium-cpu.dtsi"

#include "msmtitanium-ion.dtsi"

#include "msmtitanium-smp2p.dtsi"



&soc {

	#address-cells = <1>;
@@ -178,6 +194,206 @@ 
		reg = <0x1905000 0x8000>;

		qcom,num-locks = <8>;

	};



	qcom,smem@86300000 {

		compatible = "qcom,smem";

		reg = <0x86300000 0x100000>,

			<0x0b011008 0x4>,

			<0x60000 0x8000>,

			<0x193d000 0x8>;

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

				"aux-mem1", "smem_targ_info_reg";

		qcom,mpu-enabled;



		qcom,smd-modem {

			compatible = "qcom,smd";

			qcom,smd-edge = <0>;

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

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

			interrupts = <0 25 1>;

			label = "modem";

		};



		qcom,smsm-modem {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <0>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x2000>;

			interrupts = <0 26 1>;

		};



		qcom,smd-wcnss {

			compatible = "qcom,smd";

			qcom,smd-edge = <6>;

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

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

			interrupts = <0 142 1>;

			label = "wcnss";

		};



		qcom,smsm-wcnss {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <6>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x80000>;

			interrupts = <0 144 1>;

		};



		qcom,smd-adsp {

			compatible = "qcom,smd";

			qcom,smd-edge = <1>;

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

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

			interrupts = <0 289 1>;

			label = "adsp";

		};



		qcom,smsm-adsp {

			compatible = "qcom,smsm";

			qcom,smsm-edge = <1>;

			qcom,smsm-irq-offset = <0x0>;

			qcom,smsm-irq-bitmask = <0x200>;

			interrupts = <0 290 1>;

		};



		qcom,smd-rpm {

			compatible = "qcom,smd";

			qcom,smd-edge = <15>;

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

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

			interrupts = <0 168 1>;

			label = "rpm";

			qcom,irq-no-suspend;

			qcom,not-loadable;

		};

	};



	qcom,smdtty {

		compatible = "qcom,smdtty";



		smdtty_apps_fm: qcom,smdtty-apps-fm {

			qcom,smdtty-remote = "wcnss";

			qcom,smdtty-port-name = "APPS_FM";

		};



		smdtty_apps_riva_bt_acl: smdtty-apps-riva-bt-acl {

			qcom,smdtty-remote = "wcnss";

			qcom,smdtty-port-name = "APPS_RIVA_BT_ACL";

		};



		smdtty_apps_riva_bt_cmd: qcom,smdtty-apps-riva-bt-cmd {

			qcom,smdtty-remote = "wcnss";

			qcom,smdtty-port-name = "APPS_RIVA_BT_CMD";

		};



		smdtty_mbalbridge: qcom,smdtty-mbalbridge {

			qcom,smdtty-remote = "modem";

			qcom,smdtty-port-name = "MBALBRIDGE";

		};



		smdtty_apps_riva_ant_cmd: smdtty-apps-riva-ant-cmd {

			qcom,smdtty-remote = "wcnss";

			qcom,smdtty-port-name = "APPS_RIVA_ANT_CMD";

		};



		smdtty_apps_riva_ant_data: smdtty-apps-riva-ant-data {

			qcom,smdtty-remote = "wcnss";

			qcom,smdtty-port-name = "APPS_RIVA_ANT_DATA";

		};



		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,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 = "adsp";

			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,ipc_router {

		compatible = "qcom,ipc_router";

		qcom,node-id = <1>;

		qcom,default-peripheral = "modem";

	};



	qcom,ipc_router_modem_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "modem";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;

	};



	qcom,ipc_router_q6_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "adsp";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;

	};



	qcom,ipc_router_wcnss_xprt {

		compatible = "qcom,ipc_router_smd_xprt";

		qcom,ch-name = "IPCRTR";

		qcom,xprt-remote = "wcnss";

		qcom,xprt-linkid = <1>;

		qcom,xprt-version = <1>;

		qcom,fragmented-data;

	};

};



#include "msmtitanium-regulator.dtsi"