Add compatible for the Qualcomm SM6115 and SM4250 APCS block to the
Qualcomm APCS binding.
Signed-off-by: Iskren Chernev <[email protected]>
---
.../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
index 5dc1173d03fd..f56897156d66 100644
--- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
@@ -27,6 +27,8 @@ properties:
- qcom,sc8180x-apss-shared
- qcom,sdm660-apcs-hmss-global
- qcom,sdm845-apss-shared
+ - qcom,sm4250-apcs-hmss-global
+ - qcom,sm6115-apcs-hmss-global
- qcom,sm8150-apss-shared
reg:
base-commit: e71e3a48a7e89fa71fb70bf4602367528864d2ff
prerequisite-patch-id: 0949ba2e2f20cd3acfeff8be80dc78c7a02962fc
prerequisite-patch-id: f72aa823fffe9b245a924a6da8a14a473fffa5a2
prerequisite-patch-id: f4548f3471a407e62555c12da5d17bd5fd70f73f
prerequisite-patch-id: 4fa7457c334f5ac3d43b733478494d74aa23b9ee
prerequisite-patch-id: dfc565680fb8e8cfa7fc32556efe00a2c329cd33
prerequisite-patch-id: 541c755a0068730e30e1d2e8a29b8c952aef0a7e
prerequisite-patch-id: ce568b048e54d44e241813ef0e2d5ce302cb06a5
prerequisite-patch-id: 83a519082ea76dd4d8579b48e203a38796042fef
prerequisite-patch-id: 43005c6a296706a18e5e5decb77935442cb63451
--
2.31.1
SM4125 and SM6115, codename bengal, have APCS mailbox setup similar to
msm8998 and msm8916.
Signed-off-by: Iskren Chernev <[email protected]>
---
drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index f25324d03842..1a4d8cca5881 100644
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -166,6 +166,8 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
{ .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
{ .compatible = "qcom,sdm660-apcs-hmss-global", .data = &sdm660_apcs_data },
{ .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
+ { .compatible = "qcom,sm4250-apcs-hmss-global", .data = &sdm660_apcs_data },
+ { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &sdm660_apcs_data },
{ .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
{ .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
{}
--
2.31.1
On Tue, 22 Jun 2021 23:37:58 +0300, Iskren Chernev wrote:
> Add compatible for the Qualcomm SM6115 and SM4250 APCS block to the
> Qualcomm APCS binding.
>
> Signed-off-by: Iskren Chernev <[email protected]>
> ---
> .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
Acked-by: Rob Herring <[email protected]>
On 7/14/21 9:05 PM, Rob Herring wrote:
> On Tue, 22 Jun 2021 23:37:58 +0300, Iskren Chernev wrote:
>> Add compatible for the Qualcomm SM6115 and SM4250 APCS block to the
>> Qualcomm APCS binding.
>>
>> Signed-off-by: Iskren Chernev <[email protected]>
>> ---
>> .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>
> Acked-by: Rob Herring <[email protected]>
>
As was discussed in the pinctrl series [1], the two compatibles are actually
different bins of the same SoC (codename bengal), so there would be only one
SoC dtsi, so I made v2 of all of my series, the v2 for this one is here [2]
Let me know what the right thing to do is (keep just sm6115 or have both around).
[1] https://lkml.org/lkml/2021/6/25/918
[2] https://lkml.org/lkml/2021/6/27/167
On Tue, Jun 22, 2021 at 10:38 PM Iskren Chernev
<[email protected]> wrote:
>
> SM4125 and SM6115, codename bengal, have APCS mailbox setup similar to
> msm8998 and msm8916.
subject and commit refer to SM4125/SM6115, but the diff below is about
4250/6115. I suppose it's a typo here, since 6115 is similar to 4250,
not 4125, right?
>
> Signed-off-by: Iskren Chernev <[email protected]>
> ---
> drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
> index f25324d03842..1a4d8cca5881 100644
> --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
> +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
> @@ -166,6 +166,8 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
> { .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
> { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &sdm660_apcs_data },
> { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
> + { .compatible = "qcom,sm4250-apcs-hmss-global", .data = &sdm660_apcs_data },
> + { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &sdm660_apcs_data },
> { .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
> { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
> {}
> --
> 2.31.1
>
On 8/27/21 6:42 PM, Nicolas Dechesne wrote:
> On Tue, Jun 22, 2021 at 10:38 PM Iskren Chernev
> <[email protected]> wrote:
>>
>> SM4125 and SM6115, codename bengal, have APCS mailbox setup similar to
>> msm8998 and msm8916.
>
> subject and commit refer to SM4125/SM6115, but the diff below is about
> 4250/6115. I suppose it's a typo here, since 6115 is similar to 4250,
> not 4125, right?
Yes, you're correct. The issue was resolved in v2 submitted shorty after:
https://lkml.org/lkml/2021/6/27/167
>>
>> Signed-off-by: Iskren Chernev <[email protected]>
>> ---
>> drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
>> index f25324d03842..1a4d8cca5881 100644
>> --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
>> +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
>> @@ -166,6 +166,8 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
>> { .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
>> { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &sdm660_apcs_data },
>> { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
>> + { .compatible = "qcom,sm4250-apcs-hmss-global", .data = &sdm660_apcs_data },
>> + { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &sdm660_apcs_data },
>> { .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
>> { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
>> {}
>> --
>> 2.31.1
>>