Add ipq6018 apcs mailbox driver
Subsystems (3)
v2 cover Add ipq6018 apcs mailbox driver
The ipq6018 devices has apcs block for ipc interrupts, this block also provides a clock controller which provides cpu clocks.
This series adds support for the apcs block found in ipq6018 devices.
This series was originally part of ipq6018 apss clock controller series
https://lkml.org/lkml/2020/5/27/637
[V2]
* Addressed Bjorn's review comment, created a new structure for driver data.
* Re-arranged compatible string based on sort order.
* dropped dts patch from this series, will send it separately
Sivaprakash Murugesan (3):
dt-bindings: mailbox: Add YAML schemas for QCOM APCS global block
dt-bindings: mailbox: Add dt-bindings for ipq6018 apcs global block
mailbox: qcom: Add ipq6018 apcs compatible
.../bindings/mailbox/qcom,apcs-kpss-global.txt | 88 ------------------- .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 99 ++++++++++++++++++++++ drivers/mailbox/qcom-apcs-ipc-mailbox.c | 61 +++++++++---- 3 files changed, 142 insertions(+), 106 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
Signature · 1 line
2.7.4
PATCH v2 1/3 dt-bindings: mailbox: Add YAML schemas for QCOM APCS global block
Qualcomm APCS global block provides a bunch of generic properties which are required in a device tree. Add YAML schema for these properties.
--- .../bindings/mailbox/qcom,apcs-kpss-global.txt | 88 ---------------------- .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 86 +++++++++++++++++++++ 2 files changed, 86 insertions(+), 88 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt deleted +0 -88
@@ -1,88 +0,0 @@ -Binding for the Qualcomm APCS global block -========================================== - -This binding describes the APCS "global" block found in various Qualcomm -platforms. - -- compatible: - Usage: required - Value type: <string> - Definition: must be one of: - "qcom,msm8916-apcs-kpss-global", - "qcom,msm8996-apcs-hmss-global" - "qcom,msm8998-apcs-hmss-global" - "qcom,qcs404-apcs-apps-global" - "qcom,sc7180-apss-shared" - "qcom,sdm845-apss-shared" - "qcom,sm8150-apss-shared" - "qcom,ipq8074-apcs-apps-global" - -- reg: - Usage: required - Value type: <prop-encoded-array> - Definition: must specify the base address and size of the global block - -- clocks: - Usage: required if #clock-names property is present - Value type: <phandle array> - Definition: phandles to the two parent clocks of the clock driver. - -- #mbox-cells: - Usage: required - Value type: <u32> - Definition: as described in mailbox.txt, must be 1 - -- #clock-cells: - Usage: optional - Value type: <u32> - Definition: as described in clock.txt, must be 0 - -- clock-names: - Usage: required if the platform data based clock driver needs to - retrieve the parent clock names from device tree. - This will requires two mandatory clocks to be defined. - Value type: <string-array> - Definition: must be "pll" and "aux" - -= EXAMPLE -The following example describes the APCS HMSS found in MSM8996 and part of the -GLINK RPM referencing the "rpm_hlos" doorbell therein. - - apcs_glb: mailbox@9820000 { - compatible = "qcom,msm8996-apcs-hmss-global"; - reg = <0x9820000 0x1000>; - - #mbox-cells = <1>; - }; - - rpm-glink { - compatible = "qcom,glink-rpm"; - - interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>; - - qcom,rpm-msg-ram = <&rpm_msg_ram>; - - mboxes = <&apcs_glb 0>; - mbox-names = "rpm_hlos"; - }; - -Below is another example of the APCS binding on MSM8916 platforms: - - apcs: mailbox@b011000 { - compatible = "qcom,msm8916-apcs-kpss-global"; - reg = <0xb011000 0x1000>; - #mbox-cells = <1>; - clocks = <&a53pll>; - #clock-cells = <0>; - }; - -Below is another example of the APCS binding on QCS404 platforms: - - apcs_glb: mailbox@b011000 { - compatible = "qcom,qcs404-apcs-apps-global", "syscon"; - reg = <0x0b011000 0x1000>; - #mbox-cells = <1>; - clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>; - clock-names = "pll", "aux"; - #clock-cells = <0>; - };
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +86 -0
86 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 2/3 dt-bindings: mailbox: Add dt-bindings for ipq6018 apcs global block
In reply to Sivaprakash MurugesanAdd dt-bindings for ipq6018 mailbox driver
--- .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +15 -2
@@ -16,6 +16,7 @@ maintainers: properties: compatible: enum: + - qcom,ipq6018-apcs-apps-global - qcom,ipq8074-apcs-apps-global - qcom,msm8916-apcs-kpss-global - qcom,msm8996-apcs-hmss-global
@@ -38,12 +39,12 @@ properties: const: 1 '#clock-cells': - const: 0 + enum: [ 0, 1 ] clock-names: items: - const: pll - - const: aux + - enum: [ aux, xo ] required: - compatible
@@ -84,3 +85,15 @@ examples: clock-names = "pll", "aux"; #clock-cells = <0>; }; + + # Example apcs with ipq6018 + - | + #include "dt-bindings/clock/qcom,apss-ipq.h" + apcs_ipq: mailbox@b111000 { + compatible = "qcom,ipq6018-apcs-apps-global"; + reg = <0x0b111000 0x1000>; + #clock-cells = <1>; + clocks = <&a53pll>, <&xo>; + clock-names = "pll", "xo"; + #mbox-cells = <1>; + };
Signature · 1 line
2.7.4
PATCH v2 3/3 mailbox: qcom: Add ipq6018 apcs compatible
In reply to Sivaprakash MurugesanThe Qualcomm ipq6018 has apcs block, add compatible for the same. Also, the apcs provides a clock controller functionality similar to msm8916 but the clock driver is different.
Create a child platform device based on the apcs compatible for the clock controller functionality.
---
[V2]
* created a new structur for driver data.
* re-arranged compatible strings in sorted order
drivers/mailbox/qcom-apcs-ipc-mailbox.c | 61 +++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 18 deletions(-)
drivers/mailbox/qcom-apcs-ipc-mailbox.c +43 -18
@@ -24,6 +24,35 @@ struct qcom_apcs_ipc {struct platform_device *clk; }; +struct qcom_apcs_ipc_data { +int offset; +char *clk_name; +}; + +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" +}; + +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 apps_shared_apcs_data = { + .offset =12 , .clk_name =NULL +}; +static const struct regmap_config apcs_regmap_config = { .reg_bits =32 , .reg_stride =4 ,
@@ -48,17 +77,12 @@ static const struct mbox_chan_ops qcom_apcs_ipc_ops = {static int qcom_apcs_ipc_probe (struct platform_device *pdev) {struct qcom_apcs_ipc *apcs; +const struct qcom_apcs_ipc_data *apcs_data;struct regmap *regmap;struct resource *res; -unsigned long offset;void __iomem *base;unsigned long i;int ret; -const struct of_device_id apcs_clk_match_table[] = { - { .compatible ="qcom,msm8916-apcs-kpss-global" , }, - { .compatible ="qcom,qcs404-apcs-apps-global" , }, - {} - }; apcs =devm_kzalloc (&pdev->dev,sizeof (*apcs),GFP_KERNEL );if (!apcs)
@@ -73,10 +97,10 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)if (IS_ERR (regmap))return PTR_ERR (regmap); - offset = (unsigned long )of_device_get_match_data (&pdev->dev); + apcs_data =of_device_get_match_data (&pdev->dev); apcs->regmap = regmap; - apcs->offset = offset; + apcs->offset = apcs_data->offset;/* Initialize channel identifiers */ for (i =0 ; i <ARRAY_SIZE (apcs->mbox_chans); i++)
@@ -93,9 +117,9 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)return ret; } -if (of_match_device (apcs_clk_match_table, &pdev->dev)) { +if (apcs_data->clk_name) { apcs->clk =platform_device_register_data (&pdev->dev, -"qcom-apcs-msm8916-clk" , + apcs_data->clk_name,PLATFORM_DEVID_NONE ,NULL ,0 );if (IS_ERR (apcs->clk))
@@ -119,14 +143,15 @@ 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,msm8916-apcs-kpss-global" , .data = (void *)8 }, - { .compatible ="qcom,msm8996-apcs-hmss-global" , .data = (void *)16 }, - { .compatible ="qcom,msm8998-apcs-hmss-global" , .data = (void *)8 }, - { .compatible ="qcom,qcs404-apcs-apps-global" , .data = (void *)8 }, - { .compatible ="qcom,sc7180-apss-shared" , .data = (void *)12 }, - { .compatible ="qcom,sdm845-apss-shared" , .data = (void *)12 }, - { .compatible ="qcom,sm8150-apss-shared" , .data = (void *)12 }, - { .compatible ="qcom,ipq8074-apcs-apps-global" , .data = (void *)8 }, + { .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,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 }, + { .compatible ="qcom,sc7180-apss-shared" , .data = &apps_shared_apcs_data }, + { .compatible ="qcom,sdm845-apss-shared" , .data = &apps_shared_apcs_data }, + { .compatible ="qcom,sm8150-apss-shared" , .data = &apps_shared_apcs_data }, {} };MODULE_DEVICE_TABLE (of, qcom_apcs_ipc_of_match);
Signature · 1 line
2.7.4
Jassi Brar
maintainerRe: [PATCH V2 3/3] mailbox: qcom: Add ipq6018 apcs compatible
Quoted 5 lines · Sivaprakash Murugesan
The Qualcomm ipq6018 has apcs block, add compatible for the same. Also, the apcs provides a clock controller functionality similar to msm8916 but the clock driver is different.
Quoted 9 lines
Create a child platform device based on the apcs compatible for the clock controller functionality.
Signed-off-by Sivaprakash Murugesan <[email protected]>---
[V2]
* created a new structur for driver data.
* re-arranged compatible strings in sorted order
Please break this into two patches, first reorganise and then add new ipq6018 of_match.
thanks.
Re: [PATCH V2 3/3] mailbox: qcom: Add ipq6018 apcs compatible
Hi Jassi,
Quoted 9 lines · Jassi Brar
Quoted 7 lines · Sivaprakash Murugesan
The Qualcomm ipq6018 has apcs block, add compatible for the same. Also, the apcs provides a clock controller functionality similar to msm8916 but the clock driver is different.
Create a child platform device based on the apcs compatible for the clock controller functionality.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Sivaprakash Murugesan <[email protected]>---
[V2]
* created a new structur for driver data.
* re-arranged compatible strings in sorted orderPlease break this into two patches, first reorganise and then add new ipq6018
of_match.
have sent an updated patch series addressing the comments, thanks for your time.
Quoted 2 lines
thanks.