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

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

Merge changes I5bbff9d4,Ia3074f75 into msm-next 

* changes:
  mailbox: apcs-ipc: Add support for sdm855
  defconfig: arm64: sdm855: Enable RPMSG over GLINK
parents 377b9aa0 6ee56886

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ platforms. 
	Value type: <string>

	Definition: must be one of:

		    "qcom,msm8916-apcs-kpss-global",

		    "qcom,msm8996-apcs-hmss-global"

		    "qcom,msm8996-apcs-hmss-global",

		    "qcom,sdm855-apcs-hmss-global"



- reg:

	Usage: required

arch/arm64/configs/sdm855-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -313,7 +313,11 @@ CONFIG_ION=y 
CONFIG_ION_MSM=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

CONFIG_QCOM_APCS_IPC=y

CONFIG_ARM_SMMU=y

CONFIG_RPMSG_CHAR=y

CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_QCOM_LLCC=y

CONFIG_QCOM_SDM855_LLCC=y

CONFIG_QCOM_SMEM=y

arch/arm64/configs/sdm855_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -323,7 +323,11 @@ CONFIG_ION=y 
CONFIG_ION_MSM=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

CONFIG_QCOM_APCS_IPC=y

CONFIG_ARM_SMMU=y

CONFIG_RPMSG_CHAR=y

CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_QCOM_LLCC=y

CONFIG_QCOM_SDM855_LLCC=y

CONFIG_QCOM_SMEM=y

drivers/mailbox/qcom-apcs-ipc-mailbox.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev) 
static const struct of_device_id qcom_apcs_ipc_of_match[] = {

	{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = (void *)8 },

	{ .compatible = "qcom,msm8996-apcs-hmss-global", .data = (void *)16 },

	{ .compatible = "qcom,sdm855-apcs-hmss-global", .data = (void *) 12 },

	{}

};

MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);