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

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

Merge changes I12455cb8,I87146c36 into msm-4.14 

* changes:
  defconfig: sm8150: enable spcom driver
  ARM: dts: msm: add spcom to sm8150
parents 947169fc f711e77b

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

+8 −0
Original line number Diff line number Diff line
@@ -731,6 +731,14 @@ 
		status = "ok";

	};



	qcom,spcom {

		compatible = "qcom,spcom";



		/* predefined channels, remote side is server */

		qcom,spcom-ch-names = "sp_kernel", "sp_ssr";

		status = "ok";

	};



	jtag_mm0: jtagmm@7040000 {

		compatible = "qcom,jtagv8-mm";

		reg = <0x7040000 0x1000>;

arch/arm64/configs/sm8150-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ CONFIG_QCOM_BUS_SCALING=y 
CONFIG_QCOM_BUS_CONFIG_RPMH=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_MSM_SPCOM=y

CONFIG_QTI_RPMH_API=y

CONFIG_QSEE_IPC_IRQ_BRIDGE=y

CONFIG_QCOM_GLINK=y

arch/arm64/configs/sm8150_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ CONFIG_QCOM_BUS_CONFIG_RPMH=y 
CONFIG_QCOM_COMMAND_DB=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_MSM_SPSS_UTILS=y

CONFIG_MSM_SPCOM=y

CONFIG_QTI_RPMH_API=y

CONFIG_QSEE_IPC_IRQ_BRIDGE=y

CONFIG_QCOM_GLINK=y