Add modem Clock controller (MSS CC) driver for SC7180
v6 cover Add modem Clock controller (MSS CC) driver for SC7180
[v6]
* Combine the Documentation YAML schema and clock IDs for GCC MSS and MSS clocks.
* Remove a unnecessary header file inclusion, define the max_registers for regmap and also update the fw_name to remove _clk suffix.
* Update the copyright year.
[v5]
* Update the clock ID for GCC_MSS_NAV_AXIS_CLK to GCC_MSS_NAV_AXI_CLK
[v4]
* Split the GCC MSS clocks and Modem clock driver.
* Update mss_regmap_config to const.
* Rename the Documentation binding as per the latest convention.
* Minor comments of clock-names/clocks properties updated.
[v3]
* Add clocks/clock-names required for the MSS clock controller.
* Add pm_ops to enable/disable the required dependent clock.
* Add parent_data for the MSS clocks.
* Update the GCC MSS clocks from _CBCR to _CLK.
[v2]
* Update the license for the documentation and fix minor comments in the YAML bindings.
[v1]
* Add driver support for Modem clock controller for SC7180 and also update device tree bindings for the various clocks supported in the clock controller.
Taniya Das (3):
dt-bindings: clock: Add YAML schemas for the QCOM MSS clock bindings
clk: qcom: gcc: Add support for modem clocks in GCC
clk: qcom: Add modem clock controller driver for SC7180
.../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 62 +++++++++ drivers/clk/qcom/Kconfig | 9 ++ drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/gcc-sc7180.c | 72 ++++++++++- drivers/clk/qcom/mss-sc7180.c | 143 +++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc7180.h | 7 +- include/dt-bindings/clock/qcom,mss-sc7180.h | 12 ++ 7 files changed, 304 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml create mode 100644 drivers/clk/qcom/mss-sc7180.c create mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.h
--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
PATCH v6 1/3 dt-bindings: clock: Add YAML schemas for the QCOM MSS clock bindings
The Modem Subsystem clock provider have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.
Add clock ids for GCC MSS and MSS clocks which are required to bring the modem out of reset.
--- .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 62 ++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc7180.h | 7 ++- include/dt-bindings/clock/qcom,mss-sc7180.h | 12 +++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml create mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.h
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml new file +62 -0
@@ -0,0 +1,62 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/bindings/clock/qcom,sc7180-mss.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Modem Clock Controller Binding + +maintainers: + - Taniya Das <[email protected]> + +description: | + Qualcomm modem clock control module which supports the clocks. + + See also dt-bindings/clock/qcom,mss-sc7180.h. + +properties: + compatible: + enum: + - qcom,sc7180-mss + + clocks: + items: + - description: gcc_mss_mfab_axi clock from GCC + - description: gcc_mss_nav_axi clock from GCC + - description: gcc_mss_cfg_ahb clock from GCC + + clock-names: + items: + - const: gcc_mss_mfab_axis + - const: gcc_mss_nav_axi + - const: cfg_ahb + + '#clock-cells': + const: 1 + + reg: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - '#clock-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,gcc-sc7180.h> + clock-controller@41a8000 { + compatible = "qcom,sc7180-mss"; + reg = <0 0x041a8000 0 0x8000>; + clocks = <&gcc GCC_MSS_MFAB_AXIS_CLK>, + <&gcc GCC_MSS_NAV_AXI_CLK>, + <&gcc GCC_MSS_CFG_AHB_CLK>; + clock-names = "gcc_mss_mfab_axis", + "gcc_mss_nav_axi", + "cfg_ahb"; + #clock-cells = <1>; + }; +...
include/dt-bindings/clock/qcom,gcc-sc7180.h +6 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (c) 2019, The Linux Foundation. All rights reserved. +* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef _DT_BINDINGS_CLK_QCOM_GCC_SC7180_H
@@ -132,6 +132,11 @@#define GCC_VIDEO_GPLL0_DIV_CLK_SRC 122#define GCC_VIDEO_THROTTLE_AXI_CLK 123#define GCC_VIDEO_XO_CLK 124 +#define GCC_MSS_CFG_AHB_CLK 125 +#define GCC_MSS_MFAB_AXIS_CLK 126 +#define GCC_MSS_NAV_AXI_CLK 127 +#define GCC_MSS_Q6_MEMNOC_AXI_CLK 128 +#define GCC_MSS_SNOC_AXI_CLK 129/* GCC resets */ #define GCC_QUSB2PHY_PRIM_BCR 0
include/dt-bindings/clock/qcom,mss-sc7180.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2020, The Linux Foundation. All rights reserved. +*/ + +#ifndef _DT_BINDINGS_CLK_QCOM_MSS_SC7180_H +#define _DT_BINDINGS_CLK_QCOM_MSS_SC7180_H + +#define MSS_AXI_CRYPTO_CLK 0 +#define MSS_AXI_NAV_CLK 1 + +#endif
Signature · 2 lines
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Rob Herring
maintainerRe: [PATCH v6 1/3] dt-bindings: clock: Add YAML schemas for the QCOM MSS clock bindings
Quoted 6 lines · Taniya Das
The Modem Subsystem clock provider have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.
Add clock ids for GCC MSS and MSS clocks which are required to bring the modem out of reset.
Quoted 9 lines
Signed-off-by Taniya Das <[email protected]>--- .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 62 ++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc7180.h | 7 ++- include/dt-bindings/clock/qcom,mss-sc7180.h | 12 +++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml create mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.h
My bot found errors running 'make dt_binding_check' on your patch:
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml: $id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/clock/qcom,sc7180-mss.yaml#
See https://patchwork.ozlabs.org/patch/1254940
Please check and re-submit.
Re: [PATCH v6 1/3] dt-bindings: clock: Add YAML schemas for the QCOM MSS clock bindings
Quoted 17 lines · Rob Herring
Quoted 6 lines · Taniya Das
The Modem Subsystem clock provider have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.
Add clock ids for GCC MSS and MSS clocks which are required to bring the modem out of reset.
Quoted 9 lines
Signed-off-by Taniya Das <[email protected]>--- .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 62 ++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc7180.h | 7 ++- include/dt-bindings/clock/qcom,mss-sc7180.h | 12 +++++ 3 files changed, 80 insertions(+), 1 deletion(-)create mode 100644
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yamlcreate mode 100644include/dt-bindings/clock/qcom,mss-sc7180.h
Quoted 8 lines
My bot found errors running 'make
dt_binding_check' on your patch:
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml: $id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/clock/qcom,sc7180-mss.yaml#See https://patchwork.ozlabs.org/patch/1254940
Please check and re-submit.
Hi Rob,
Thanks, I have fixed it in the next patch series.
Is there a way to catch these before submitting? As I do not see these errors on my machine.
Signature · 4 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation. --
Rob Herring
maintainerRe: [PATCH v6 1/3] dt-bindings: clock: Add YAML schemas for the QCOM MSS clock bindings
Quoted 29 lines · Taniya Das
Quoted 17 lines · Rob Herring
Quoted 6 lines · Taniya Das
The Modem Subsystem clock provider have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.
Add clock ids for GCC MSS and MSS clocks which are required to bring the modem out of reset.
Quoted 9 lines
Signed-off-by Taniya Das <[email protected]>--- .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 62 ++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc7180.h | 7 ++- include/dt-bindings/clock/qcom,mss-sc7180.h | 12 +++++ 3 files changed, 80 insertions(+), 1 deletion(-)create mode 100644
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yamlcreate mode 100644include/dt-bindings/clock/qcom,mss-sc7180.hQuoted 8 lines
My bot found errors running 'make
dt_binding_check' on your patch:
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml: $id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/clock/qcom,sc7180-mss.yaml#See https://patchwork.ozlabs.org/patch/1254940
Please check and re-submit.
Quoted 6 lines
Hi Rob,
Thanks, I have fixed it in the next patch series.
Is there a way to catch these before submitting? As I do not see these errors on my machine.
If you ran 'make dt_binding_check' already, then update dt-schema with pip.
Rob
Stephen Boyd
maintainerRe: [PATCH v6 1/3] dt-bindings: clock: Add YAML schemas for the QCOM MSS clock bindings
In reply to Taniya DasQuoting Taniya Das (2020-03-14 11:49:56)
Quoted 21 lines
The Modem Subsystem clock provider have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those.
Add clock ids for GCC MSS and MSS clocks which are required to bring the modem out of reset.
Signed-off-by Taniya Das <[email protected]>--- .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 62 ++++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc7180.h | 7 ++- include/dt-bindings/clock/qcom,mss-sc7180.h | 12 +++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml create mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.hDocumentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml new file +0
-0
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml line 4
Quoted 4 lines
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml new file +4
-0@@ -0,0 +1,62 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/bindings/clock/qcom,sc7180-mss.yaml#
remove 'bindings' above.
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml line 15
Quoted 11 lines
Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml new file +11
-0+$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Modem Clock Controller Binding + +maintainers: + - Taniya Das <[email protected]> + +description: | + Qualcomm modem clock control module which supports the clocks. + + See also dt-bindings/clock/qcom,mss-sc7180.h.
Can you follow how for example gcc-sc7180 does this?
See also:
- dt-bindings/clock/qcom,mss-sc7180.h
PATCH v6 2/3 clk: qcom: gcc: Add support for modem clocks in GCC
In reply to Taniya DasAdd the required modem clocks in global clock controller which are required to bring the modem out of reset.
--- drivers/clk/qcom/gcc-sc7180.c | 72 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-)
drivers/clk/qcom/gcc-sc7180.c +71 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019, The Linux Foundation. All rights reserved. +* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. */ #include <linux/clk-provider.h>
@@ -2165,6 +2165,71 @@ static struct clk_branch gcc_video_xo_clk = { }, }; +static struct clk_branch gcc_mss_cfg_ahb_clk = { + .halt_reg =0x8a000 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x8a000 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_mss_cfg_ahb_clk" , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch gcc_mss_mfab_axis_clk = { + .halt_reg =0x8a004 , + .halt_check =BRANCH_HALT_VOTED , + .clkr = { + .enable_reg =0x8a004 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_mss_mfab_axis_clk" , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch gcc_mss_nav_axi_clk = { + .halt_reg =0x8a00c , + .halt_check =BRANCH_HALT_VOTED , + .clkr = { + .enable_reg =0x8a00c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_mss_nav_axi_clk" , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch gcc_mss_snoc_axi_clk = { + .halt_reg =0x8a150 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x8a150 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_mss_snoc_axi_clk" , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch gcc_mss_q6_memnoc_axi_clk = { + .halt_reg =0x8a154 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x8a154 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_mss_q6_memnoc_axi_clk" , + .ops = &clk_branch2_ops, + }, + }, +}; +static struct gdsc ufs_phy_gdsc = { .gdscr =0x77004 , .pd = {
@@ -2336,6 +2401,11 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GPLL7] = &gpll7.clkr, [GPLL4] = &gpll4.clkr, [GPLL1] = &gpll1.clkr, + [GCC_MSS_CFG_AHB_CLK] = &gcc_mss_cfg_ahb_clk.clkr, + [GCC_MSS_MFAB_AXIS_CLK] = &gcc_mss_mfab_axis_clk.clkr, + [GCC_MSS_NAV_AXI_CLK] = &gcc_mss_nav_axi_clk.clkr, + [GCC_MSS_Q6_MEMNOC_AXI_CLK] = &gcc_mss_q6_memnoc_axi_clk.clkr, + [GCC_MSS_SNOC_AXI_CLK] = &gcc_mss_snoc_axi_clk.clkr, };static const struct qcom_reset_map gcc_sc7180_resets[] = {
--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
PATCH v6 3/3 clk: qcom: Add modem clock controller driver for SC7180
In reply to Taniya DasAdd support for the modem clock controller found on SC7180 based devices. This would allow modem drivers to probe and control their clocks.
--- drivers/clk/qcom/Kconfig | 9 +++ drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/mss-sc7180.c | 143 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 drivers/clk/qcom/mss-sc7180.c
drivers/clk/qcom/Kconfig +9 -0
@@ -280,6 +280,15 @@ config SC_GPUCC_7180 Say Y if you want to support graphics controller devices and functionality such as 3D graphics. +config SC_MSS_7180 + tristate "SC7180 Modem Clock Controller" + select SC_GCC_7180 + help + Support for the Modem Subsystem clock controller on Qualcomm + Technologies, Inc on SC7180 devices. + Say Y if you want to use the Modem branch clocks of the Modem + subsystem clock controller to reset the MSS subsystem. + config SC_VIDEOCC_7180 tristate "SC7180 Video Clock Controller" select SC_GCC_7180
drivers/clk/qcom/Makefile +1 -0
@@ -50,6 +50,7 @@ obj-$(CONFIG_QCS_TURING_404) += turingcc-qcs404.o obj-$(CONFIG_SC_DISPCC_7180) += dispcc-sc7180.o obj-$(CONFIG_SC_GCC_7180) += gcc-sc7180.o obj-$(CONFIG_SC_GPUCC_7180) += gpucc-sc7180.o +obj-$(CONFIG_SC_MSS_7180) += mss-sc7180.o obj-$(CONFIG_SC_VIDEOCC_7180) += videocc-sc7180.o obj-$(CONFIG_SDM_CAMCC_845) += camcc-sdm845.o obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o
drivers/clk/qcom/mss-sc7180.c new file +143 -0
143 lines not on this page · raw message
--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Quoted 7 lines · Taniya Das
[v6]
* Combine the Documentation YAML schema and clock IDs for GCC MSS and MSS clocks.
* Remove a unnecessary header file inclusion, define themax_registers
for
regmap and also update thefw_nameto remove_clksuffix.
* Update the copyright year.
Quoted 48 lines
[v5]
* Update the clock ID forGCC_MSS_NAV_AXIS_CLKtoGCC_MSS_NAV_AXI_CLK[v4]
* Split the GCC MSS clocks and Modem clock driver.
* Updatemss_regmap_configto const.
* Rename the Documentation binding as per the latest convention.
* Minor comments of clock-names/clocks properties updated.[v3]
* Add clocks/clock-names required for the MSS clock controller.
* Addpm_opsto enable/disable the required dependent clock.
* Addparent_datafor the MSS clocks.
* Update the GCC MSS clocks from_CBCRto_CLK.[v2]
* Update the license for the documentation and fix minor comments in
the
YAML bindings.[v1]
* Add driver support for Modem clock controller for SC7180 and also update device tree bindings for the various clocks supported in the clock controller.Taniya Das (3):
dt-bindings: clock: Add YAML schemas for the QCOM MSS clock bindings
clk: qcom: gcc: Add support for modem clocks in GCC
clk: qcom: Add modem clock controller driver for SC7180.../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 62 +++++++++ drivers/clk/qcom/Kconfig | 9 ++ drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/gcc-sc7180.c | 72 ++++++++++- drivers/clk/qcom/mss-sc7180.c | 143 +++++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc7180.h | 7 +- include/dt-bindings/clock/qcom,mss-sc7180.h | 12 ++ 7 files changed, 304 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml create mode 100644 drivers/clk/qcom/mss-sc7180.c create mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.h--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.