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

Commit 171aae99 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Disable Glink defconfig for msm8953"

parents 02fc2f83 99892768

Documentation/devicetree/bindings/arm/msm/smdpkt.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc Shared Memory Packet Driver (smdpkt)



[Root level node]

Required properties:

-compatible : should be "qcom,smdpkt"



[Second level nodes]

qcom,smdpkt-port-names

Required properties:

-qcom,smdpkt-remote : the remote subsystem name

-qcom,smdpkt-port-name : the smd channel name

-qcom,smdpkt-dev-name : the smdpkt device name



Example:



	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-data6-cntl {

			qcom,smdpkt-remote = "modem";

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

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

		};



		qcom,smdpkt-cxm-qmi-port-8064 {

			qcom,smdpkt-remote = "wcnss";

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

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

		};



		qcom,smdpkt-loopback {

			qcom,smdpkt-remote = "modem";

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

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

		};

	};

Documentation/devicetree/bindings/arm/msm/smdtty.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc Shared Memory TTY Driver (smdtty)



[Root level node]

Required properties:

-compatible : should be "qcom,smdtty"



[Second level nodes]

qcom,smdtty-port-names

Required properties:

-qcom,smdtty-remote: the remote subsystem name

-qcom,smdtty-port-name : the smd channel name



Optional properties:

-qcom,smdtty-dev-name : the smdtty device name



Required alias:

- The index into TTY subsystem is specified via an alias with the following format

         'smd{n}' where n is the tty device index.



Example:

	aliases {

		smd1 = &smdtty_apps_fm;

		smd36 = &smdtty_loopback;

	};



	qcom,smdtty {

		compatible = "qcom,smdtty";



		smdtty_apps_fm: qcom,smdtty-apps-fm {

			qcom,smdtty-remote = "wcnss";

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

		};



		smdtty_loopback: smdtty-loopback {

			qcom,smdtty-remote = "modem";

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

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

		};

	};

arch/arm64/configs/msm8953-perf_defconfig

+0 −7
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ CONFIG_SERIAL_MSM=y 
CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y
@@ -401,14 +400,8 @@ CONFIG_QCOM_MEMORY_DUMP_V2=y 
CONFIG_QCOM_SECURE_BUFFER=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_GLINK=y

CONFIG_MSM_GLINK_LOOPBACK_SERVER=y

CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y

CONFIG_MSM_GLINK_SPI_XPRT=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

arch/arm64/configs/msm8953_defconfig

+0 −7
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ CONFIG_SERIAL_MSM=y 
CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y
@@ -417,15 +416,9 @@ CONFIG_QCOM_MEMORY_DUMP_V2=y 
CONFIG_QCOM_SECURE_BUFFER=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_GLINK=y

CONFIG_MSM_GLINK_LOOPBACK_SERVER=y

CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y

CONFIG_MSM_GLINK_SPI_XPRT=y

CONFIG_TRACER_PKT=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

drivers/char/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -582,6 +582,16 @@ config DEVPORT 


source "drivers/s390/char/Kconfig"



config MSM_SMD_PKT

	bool "Enable device interface for some SMD packet ports"

	default n

	depends on MSM_SMD

	help

	  smd_pkt driver provides the interface for the userspace clients

	  to communicate over smd via device nodes. This enable the

	  usersapce clients to read and write to some smd packets channel

	  for MSM chipset.



config TILE_SROM

	bool "Character-device access via hypervisor to the Tilera SPI ROM"

	depends on TILE