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

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

Merge "ARM: dts: msm: Add smdpacket dts entry for SDM429/439/QM215"

parents 553e2a7c 4a7e3c96

qcom/msm8917.dtsi

+64 −80
Original line number Original line Diff line number Diff line
@@ -20,18 +20,6 @@ 
	};

	};





	aliases {

	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;

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc2 = &sdhc_2; /* SDC2 for SD card */

		sdhc2 = &sdhc_2; /* SDC2 for SD card */

		spi3 = &spi_3;

		spi3 = &spi_3;
@@ -1276,103 +1264,99 @@ 




	};

	};





	qcom,smdtty {

	qcom,smdpkt {

		compatible = "qcom,smdtty";

		compatible = "qcom,smdpkt";



		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,smdpkt-data5-cntl {

			qcom,smdtty-remote = "wcnss";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA5_CNTL";

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

		};

		};





		smdtty_mbalbridge: qcom,smdtty-mbalbridge {

		qcom,smdpkt-data22 {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA22";

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

		};

		};





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

		qcom,smdpkt-data40-cntl {

			qcom,smdtty-remote = "wcnss";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA40_CNTL";

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

		};

		};





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

		qcom,smdpkt-data2 {

			qcom,smdtty-remote = "wcnss";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA2";

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

		};

		};





		smdtty_data1: qcom,smdtty-data1 {

		qcom,smdpkt-apr-apps2 {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "adsp";

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

			qcom,smdpkt-ch-name = "apr_apps2";

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

		};

		};





		smdtty_data4: qcom,smdtty-data4 {

		qcom,smdpkt-apps-fm {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_FM";

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

		};

		};





		smdtty_data11: qcom,smdtty-data11 {

		qcom,smdpkt-apps-riva-bt-acl {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_RIVA_BT_ACL";

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

			qcom,smdpkt-fragmented-read;

		};

		};





		smdtty_data21: qcom,smdtty-data21 {

		qcom,smdpkt-apps-riva-bt-cmd {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_RIVA_BT_CMD";

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

			qcom,smdpkt-fragmented-read;

		};

		};





		smdtty_loopback: smdtty-loopback {

		qcom,smdpkt-mbalbridge {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "MBALBRIDGE";

			qcom,smdtty-dev-name = "LOOPBACK_TTY";

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

		};

		};

		};





	qcom,smdpkt {

		qcom,smdpkt-apps-riva-ant-cmd {

		compatible = "qcom,smdpkt";

			qcom,smdpkt-edge = "wcnss";



			qcom,smdpkt-ch-name = "APPS_RIVA_ANT_CMD";

		qcom,smdpkt-data5-cntl {

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

			qcom,smdpkt-remote = "modem";

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

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

		};

		};





		qcom,smdpkt-data22 {

		qcom,smdpkt-apps-riva-ant-data {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_RIVA_ANT_DATA";

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

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

		};

		};





		qcom,smdpkt-data40-cntl {

		qcom,smdpkt-data1 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA1";

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

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

		};

		};





		qcom,smdpkt-data2 {

		qcom,smdpkt-data4 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA4";

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

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

		};

		};





		qcom,smdpkt-apr-apps2 {

		qcom,smdpkt-data11 {

			qcom,smdpkt-remote = "adsp";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA11";

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

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

		};

		};





		qcom,smdpkt-loopback {

		qcom,smdpkt-data21 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA21";

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

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

		};

		};

	};

	};

qcom/msm8937.dtsi

+64 −80
Original line number Original line Diff line number Diff line
@@ -122,18 +122,6 @@ 
	};

	};





	aliases {

	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;

		i2c2 = &i2c_2;

		i2c2 = &i2c_2;

		i2c5 = &i2c_5;

		i2c5 = &i2c_5;

		spi3 = &spi_3;

		spi3 = &spi_3;
@@ -1555,103 +1543,99 @@ 
		};

		};

	};

	};





	qcom,smdtty {

	qcom,smdpkt {

		compatible = "qcom,smdtty";

		compatible = "qcom,smdpkt";



		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,smdpkt-data5-cntl {

			qcom,smdtty-remote = "wcnss";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA5_CNTL";

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

		};

		};





		smdtty_mbalbridge: qcom,smdtty-mbalbridge {

		qcom,smdpkt-data22 {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA22";

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

		};

		};





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

		qcom,smdpkt-data40-cntl {

			qcom,smdtty-remote = "wcnss";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA40_CNTL";

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

		};

		};





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

		qcom,smdpkt-data2 {

			qcom,smdtty-remote = "wcnss";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA2";

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

		};

		};





		smdtty_data1: qcom,smdtty-data1 {

		qcom,smdpkt-apr-apps2 {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "adsp";

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

			qcom,smdpkt-ch-name = "apr_apps2";

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

		};

		};





		smdtty_data4: qcom,smdtty-data4 {

		qcom,smdpkt-apps-fm {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_FM";

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

		};

		};





		smdtty_data11: qcom,smdtty-data11 {

		qcom,smdpkt-apps-riva-bt-acl {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_RIVA_BT_ACL";

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

			qcom,smdpkt-fragmented-read;

		};

		};





		smdtty_data21: qcom,smdtty-data21 {

		qcom,smdpkt-apps-riva-bt-cmd {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_RIVA_BT_CMD";

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

			qcom,smdpkt-fragmented-read;

		};

		};





		smdtty_loopback: smdtty-loopback {

		qcom,smdpkt-mbalbridge {

			qcom,smdtty-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "MBALBRIDGE";

			qcom,smdtty-dev-name = "LOOPBACK_TTY";

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

		};

		};

		};





	qcom,smdpkt {

		qcom,smdpkt-apps-riva-ant-cmd {

		compatible = "qcom,smdpkt";

			qcom,smdpkt-edge = "wcnss";



			qcom,smdpkt-ch-name = "APPS_RIVA_ANT_CMD";

		qcom,smdpkt-data5-cntl {

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

			qcom,smdpkt-remote = "modem";

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

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

		};

		};





		qcom,smdpkt-data22 {

		qcom,smdpkt-apps-riva-ant-data {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "wcnss";

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

			qcom,smdpkt-ch-name = "APPS_RIVA_ANT_DATA";

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

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

		};

		};





		qcom,smdpkt-data40-cntl {

		qcom,smdpkt-data1 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA1";

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

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

		};

		};





		qcom,smdpkt-data2 {

		qcom,smdpkt-data4 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA4";

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

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

		};

		};





		qcom,smdpkt-apr-apps2 {

		qcom,smdpkt-data11 {

			qcom,smdpkt-remote = "adsp";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA11";

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

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

		};

		};





		qcom,smdpkt-loopback {

		qcom,smdpkt-data21 {

			qcom,smdpkt-remote = "modem";

			qcom,smdpkt-edge = "modem";

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

			qcom,smdpkt-ch-name = "DATA21";

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

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

		};

		};

	};

	};