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

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

Merge changes I4ae78b0b,Idb56584f,If6f2b2de,Ic4137700 into msm-next 

* changes:
  defconfig: msm: Enable GLINK probe driver on sdm855
  ARM: dts: msm: Add GLINK entries for sdm855
  soc: qcom: glink: Add support for Glink Probe
  soc: qcom: smem: Add support to get physical addr
parents 8fe91863 4e712f42

Documentation/devicetree/bindings/soc/qcom/qcom,glink_probe.txt

0 → 100644
+38 −0
Original line number Original line Diff line number Diff line 
Qualcomm Technologies, Inc. GLINK Probe



This binding describes the GLINK Probe driver, a device

that initializes the GLINK edge pairs within the system.



- compatible :

	Usage: required

	Value type: <stringlist>

	Definition: must be "qcom,glink"



= SUBNODES

The GLINK probe node must contain subnodes that describes the

edge-pairs. See qcom,glink.txt for details on how to describe them.



In addition to the properties in qcom,glink.txt, The GLINK Probe driver

requires the remote-pid and transport type to be specified in the subnodes.



- transport :

	Usage: required

	Value type: <stringlist>

	Definition: must be "smem", "mbox", or "spi"



- qcom,remote-pid :

	Usage: required

	Value type: <prop-encoded-array>

	Definition: specifies the identifier of the remote proc of this edge.



= EXAMPLE

qcom,glink {

	compatible = "qcom,glink";

	modem {

		transport = "smem";

		qcom,remote-pid = <1>;

		mboxes = <&apcs_glb 8>;

		mbox-names = "mpss_smem";

		interrupts = <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>;

	};

};

arch/arm64/boot/dts/qcom/sdm855.dtsi

+42 −0
Original line number Original line Diff line number Diff line
@@ -913,6 +913,48 @@ 
				  <CONTROL_TCS 0>;

				  <CONTROL_TCS 0>;

		status = "disabled";

		status = "disabled";

	};

	};



	apcs_glb: mailbox@17c00000 {

		compatible = "qcom,sdm855-apcs-hmss-global";

		reg = <0x17c00000 0x1000>;



		#mbox-cells = <1>;

	};



	qcom,glink {

		compatible = "qcom,glink";

		modem {

			qcom,remote-pid = <1>;

			transport = "smem";

			mboxes = <&apcs_glb 12>;

			mbox-names = "mpss_smem";

			interrupts = <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>;

		};



		adsp {

			qcom,remote-pid = <2>;

			transport = "smem";

			mboxes = <&apcs_glb 8>;

			mbox-names = "adsp_smem";

			interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;

		};



		dsps {

			qcom,remote-pid = <3>;

			transport = "smem";

			mboxes = <&apcs_glb 24>;

			mbox-names = "dsps_smem";

			interrupts = <GIC_SPI 170 IRQ_TYPE_EDGE_RISING>;

		};



		cdsp {

			qcom,remote-pid = <5>;

			transport = "smem";

			mboxes = <&apcs_glb 5>;

			mbox-names = "cdsp_smem";

			interrupts = <GIC_SPI 574 IRQ_TYPE_EDGE_RISING>;

		};

	};

};

};





&emac_gdsc {

&emac_gdsc {

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -334,6 +334,7 @@ CONFIG_MSM_SUBSYSTEM_RESTART=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_QCOM_GLINK=y

CONFIG_IIO=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM=y

CONFIG_RAS=y

CONFIG_RAS=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -345,6 +345,7 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_ICNSS_DEBUG=y

CONFIG_ICNSS_DEBUG=y

CONFIG_QCOM_GLINK=y

CONFIG_IIO=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM=y

CONFIG_PHY_XGENE=y

CONFIG_PHY_XGENE=y

drivers/soc/qcom/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -332,3 +332,11 @@ config QTI_RPMH_API 




config QTI_SYSTEM_PM

config QTI_SYSTEM_PM

	bool

	bool



config QCOM_GLINK

	tristate "GLINK Probe Helper"

	depends on RPMSG_QCOM_GLINK_SMEM

	help

	  The GLINK RPMSG Plugin is currently designed to plugin with the

	  remote proc framework as a subdev. This module is responsible for

	  creating the glink transports when remote proc is disabled.