1 files changed, 74 insertions, 0 deletions
diff --git a/target/linux/ipq807x/patches-5.15/0028-v5.16-mailbox-qcom-apcs-ipc-Consolidate-msm8994-type-apcs_.patch b/target/linux/ipq807x/patches-5.15/0028-v5.16-mailbox-qcom-apcs-ipc-Consolidate-msm8994-type-apcs_.patch
new file mode 100644
index 0000000000..e50c66f531
--- /dev/null
+++ b/target/linux/ipq807x/patches-5.15/0028-v5.16-mailbox-qcom-apcs-ipc-Consolidate-msm8994-type-apcs_.patch
@@ -0,0 +1,74 @@
+From a6e1d17fbfd41113bf47345e65953873e717ca63 Mon Sep 17 00:00:00 2001
+From: Shawn Guo <shawn.guo@linaro.org>
+Date: Tue, 14 Sep 2021 09:40:48 +0800
+Subject: [PATCH] mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data
+
+The msm8994 type of apcs_data is defined multiple times with different
+SoC name encoded.  Consolidate them on msm8994 and remove the data
+duplication.
+
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
+---
+ drivers/mailbox/qcom-apcs-ipc-mailbox.c | 26 +++++--------------------
+ 1 file changed, 5 insertions(+), 21 deletions(-)
+
+--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
++++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+@@ -33,10 +33,6 @@ static const struct qcom_apcs_ipc_data i
+ 	.offset = 8, .clk_name = "qcom,apss-ipq6018-clk"
+ };
+ 
+-static const struct qcom_apcs_ipc_data ipq8074_apcs_data = {
+-	.offset = 8, .clk_name = NULL
+-};
+-
+ static const struct qcom_apcs_ipc_data msm8916_apcs_data = {
+ 	.offset = 8, .clk_name = "qcom-apcs-msm8916-clk"
+ };
+@@ -49,18 +45,6 @@ static const struct qcom_apcs_ipc_data m
+ 	.offset = 16, .clk_name = NULL
+ };
+ 
+-static const struct qcom_apcs_ipc_data msm8998_apcs_data = {
+-	.offset = 8, .clk_name = NULL
+-};
+-
+-static const struct qcom_apcs_ipc_data sdm660_apcs_data = {
+-	.offset = 8, .clk_name = NULL
+-};
+-
+-static const struct qcom_apcs_ipc_data sm6125_apcs_data = {
+-	.offset = 8, .clk_name = NULL
+-};
+-
+ static const struct qcom_apcs_ipc_data apps_shared_apcs_data = {
+ 	.offset = 12, .clk_name = NULL
+ };
+@@ -160,21 +144,21 @@ static int qcom_apcs_ipc_remove(struct p
+ /* .data is the offset of the ipc register within the global block */
+ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
+ 	{ .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data },
+-	{ .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq8074_apcs_data },
++	{ .compatible = "qcom,ipq8074-apcs-apps-global", .data = &msm8994_apcs_data },
+ 	{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
+ 	{ .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
+ 	{ .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
+ 	{ .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data },
+ 	{ .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data },
+-	{ .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8998_apcs_data },
++	{ .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
+ 	{ .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
+ 	{ .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },
+ 	{ .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
+-	{ .compatible = "qcom,sdm660-apcs-hmss-global", .data = &sdm660_apcs_data },
++	{ .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data },
+ 	{ .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
+-	{ .compatible = "qcom,sm6125-apcs-hmss-global", .data = &sm6125_apcs_data },
++	{ .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data },
+ 	{ .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
+-	{ .compatible = "qcom,sm6115-apcs-hmss-global", .data = &sdm660_apcs_data },
++	{ .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data },
+ 	{ .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
+ 	{}
+ };