linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] mailbox: Add QCM2290 APCS IPC support
@ 2021-09-14  1:40 Shawn Guo
  2021-09-14  1:40 ` [PATCH 1/3] mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data Shawn Guo
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Shawn Guo @ 2021-09-14  1:40 UTC (permalink / raw)
  To: Jassi Brar
  Cc: Rob Herring, Sivaprakash Murugesan, Bjorn Andersson,
	Loic Poulain, devicetree, linux-arm-msm, linux-kernel, Shawn Guo

The first patch cleans up msm8994 type apcs_data, and the other two add
QCM2290 APCS IPC support.

Shawn Guo (3):
  mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data
  dt-bindings: mailbox: qcom: Add QCM2290 APCS compatible
  mailbox: qcom-apcs-ipc: Add QCM2290 APCS IPC support

 .../mailbox/qcom,apcs-kpss-global.yaml        |  1 +
 drivers/mailbox/qcom-apcs-ipc-mailbox.c       | 27 +++++--------------
 2 files changed, 7 insertions(+), 21 deletions(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data
  2021-09-14  1:40 [PATCH 0/3] mailbox: Add QCM2290 APCS IPC support Shawn Guo
@ 2021-09-14  1:40 ` Shawn Guo
  2021-09-14  1:40 ` [PATCH 2/3] dt-bindings: mailbox: qcom: Add QCM2290 APCS compatible Shawn Guo
  2021-09-14  1:40 ` [PATCH 3/3] mailbox: qcom-apcs-ipc: Add QCM2290 APCS IPC support Shawn Guo
  2 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2021-09-14  1:40 UTC (permalink / raw)
  To: Jassi Brar
  Cc: Rob Herring, Sivaprakash Murugesan, Bjorn Andersson,
	Loic Poulain, devicetree, linux-arm-msm, linux-kernel, Shawn Guo

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>
---
 drivers/mailbox/qcom-apcs-ipc-mailbox.c | 26 +++++--------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index 82ccfaf14b24..ac42cdae638d 100644
--- 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 ipq6018_apcs_data = {
 	.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 msm8996_apcs_data = {
 	.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 platform_device *pdev)
 /* .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 },
 	{}
 };
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/3] dt-bindings: mailbox: qcom: Add QCM2290 APCS compatible
  2021-09-14  1:40 [PATCH 0/3] mailbox: Add QCM2290 APCS IPC support Shawn Guo
  2021-09-14  1:40 ` [PATCH 1/3] mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data Shawn Guo
@ 2021-09-14  1:40 ` Shawn Guo
  2021-09-21 20:22   ` Rob Herring
  2021-09-14  1:40 ` [PATCH 3/3] mailbox: qcom-apcs-ipc: Add QCM2290 APCS IPC support Shawn Guo
  2 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2021-09-14  1:40 UTC (permalink / raw)
  To: Jassi Brar
  Cc: Rob Herring, Sivaprakash Murugesan, Bjorn Andersson,
	Loic Poulain, devicetree, linux-arm-msm, linux-kernel, Shawn Guo

Add compatible for the Qualcomm QCM2290 APCS block.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
index 6395281b0cec..a6c5c66b7804 100644
--- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
@@ -24,6 +24,7 @@ properties:
       - qcom,msm8994-apcs-kpss-global
       - qcom,msm8996-apcs-hmss-global
       - qcom,msm8998-apcs-hmss-global
+      - qcom,qcm2290-apcs-hmss-global
       - qcom,qcs404-apcs-apps-global
       - qcom,sc7180-apss-shared
       - qcom,sc8180x-apss-shared
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] mailbox: qcom-apcs-ipc: Add QCM2290 APCS IPC support
  2021-09-14  1:40 [PATCH 0/3] mailbox: Add QCM2290 APCS IPC support Shawn Guo
  2021-09-14  1:40 ` [PATCH 1/3] mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data Shawn Guo
  2021-09-14  1:40 ` [PATCH 2/3] dt-bindings: mailbox: qcom: Add QCM2290 APCS compatible Shawn Guo
@ 2021-09-14  1:40 ` Shawn Guo
  2 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2021-09-14  1:40 UTC (permalink / raw)
  To: Jassi Brar
  Cc: Rob Herring, Sivaprakash Murugesan, Bjorn Andersson,
	Loic Poulain, devicetree, linux-arm-msm, linux-kernel, Shawn Guo

Enable QCM2290 APCS IPC support by adding the compatible.  It reuses
msm8994_apcs_data.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 drivers/mailbox/qcom-apcs-ipc-mailbox.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index ac42cdae638d..2092dfb5de00 100644
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -151,6 +151,7 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
 	{ .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 = &msm8994_apcs_data },
+	{ .compatible = "qcom,qcm2290-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 },
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/3] dt-bindings: mailbox: qcom: Add QCM2290 APCS compatible
  2021-09-14  1:40 ` [PATCH 2/3] dt-bindings: mailbox: qcom: Add QCM2290 APCS compatible Shawn Guo
@ 2021-09-21 20:22   ` Rob Herring
  0 siblings, 0 replies; 5+ messages in thread
From: Rob Herring @ 2021-09-21 20:22 UTC (permalink / raw)
  To: Shawn Guo
  Cc: Sivaprakash Murugesan, devicetree, linux-kernel, Bjorn Andersson,
	Loic Poulain, linux-arm-msm, Jassi Brar, Rob Herring

On Tue, 14 Sep 2021 09:40:49 +0800, Shawn Guo wrote:
> Add compatible for the Qualcomm QCM2290 APCS block.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
>  .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml       | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-09-21 20:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-14  1:40 [PATCH 0/3] mailbox: Add QCM2290 APCS IPC support Shawn Guo
2021-09-14  1:40 ` [PATCH 1/3] mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data Shawn Guo
2021-09-14  1:40 ` [PATCH 2/3] dt-bindings: mailbox: qcom: Add QCM2290 APCS compatible Shawn Guo
2021-09-21 20:22   ` Rob Herring
2021-09-14  1:40 ` [PATCH 3/3] mailbox: qcom-apcs-ipc: Add QCM2290 APCS IPC support Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).