| Message ID | 20200624150107.76234-6-konradybcio@gmail.com |
|---|---|
| State | Accepted |
| Commit | dde6805690cd8f156e93b0ed4cf1172a5ffbefdd |
| Headers | show |
| Series | [v3,1/8] firmware: qcom_scm: Add msm8994 compatible | expand |
On Wed, 24 Jun 2020 17:01:03 +0200, Konrad Dybcio wrote: > MSM8994 has an APCS block similar to 8916, but > with a different clock driver due to the former > one having 2 clusters. > > Signed-off-by: Konrad Dybcio <konradybcio@gmail.com> > --- > .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + > drivers/mailbox/qcom-apcs-ipc-mailbox.c | 5 +++++ > 2 files changed, 6 insertions(+) > Acked-by: Rob Herring <robh@kernel.org>
On Wed 24 Jun 08:01 PDT 2020, Konrad Dybcio wrote: > MSM8994 has an APCS block similar to 8916, but > with a different clock driver due to the former > one having 2 clusters. > > Signed-off-by: Konrad Dybcio <konradybcio@gmail.com> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + > drivers/mailbox/qcom-apcs-ipc-mailbox.c | 5 +++++ > 2 files changed, 6 insertions(+) > > diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml > index 12eff942708d..5125ca3533d2 100644 > --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml > +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml > @@ -18,6 +18,7 @@ properties: > enum: > - qcom,ipq8074-apcs-apps-global > - qcom,msm8916-apcs-kpss-global > + - qcom,msm8994-apcs-kpss-global > - qcom,msm8996-apcs-hmss-global > - qcom,msm8998-apcs-hmss-global > - qcom,qcs404-apcs-apps-global > diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c > index cec34f0af6ce..6d892136e0e6 100644 > --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c > +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c > @@ -41,6 +41,10 @@ static const struct qcom_apcs_ipc_data msm8916_apcs_data = { > .offset = 8, .clk_name = "qcom-apcs-msm8916-clk" > }; > > +static const struct qcom_apcs_ipc_data msm8994_apcs_data = { > + .offset = 8, .clk_name = NULL > +}; > + > static const struct qcom_apcs_ipc_data msm8996_apcs_data = { > .offset = 16, .clk_name = NULL > }; > @@ -146,6 +150,7 @@ 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,msm8916-apcs-kpss-global", .data = &msm8916_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,qcs404-apcs-apps-global", .data = &msm8916_apcs_data }, > -- > 2.27.0 >
diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml index 12eff942708d..5125ca3533d2 100644 --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml @@ -18,6 +18,7 @@ properties: enum: - qcom,ipq8074-apcs-apps-global - qcom,msm8916-apcs-kpss-global + - qcom,msm8994-apcs-kpss-global - qcom,msm8996-apcs-hmss-global - qcom,msm8998-apcs-hmss-global - qcom,qcs404-apcs-apps-global diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index cec34f0af6ce..6d892136e0e6 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -41,6 +41,10 @@ static const struct qcom_apcs_ipc_data msm8916_apcs_data = { .offset = 8, .clk_name = "qcom-apcs-msm8916-clk" }; +static const struct qcom_apcs_ipc_data msm8994_apcs_data = { + .offset = 8, .clk_name = NULL +}; + static const struct qcom_apcs_ipc_data msm8996_apcs_data = { .offset = 16, .clk_name = NULL }; @@ -146,6 +150,7 @@ 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,msm8916-apcs-kpss-global", .data = &msm8916_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,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
MSM8994 has an APCS block similar to 8916, but with a different clock driver due to the former one having 2 clusters. Signed-off-by: Konrad Dybcio <konradybcio@gmail.com> --- .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 5 +++++ 2 files changed, 6 insertions(+)