Re: [PATCH v2 3/3] clk: qcom: Add modem clock controller driver for SC7180

[Sibi Sankar <sibis@codeaurora.org>]

Hey Taniya,

On 2019-12-27 10:12, Taniya Das wrote:
> Add support for the modem clock controller found on SC7180
> based devices. This would allow modem drivers to probe and
> control their clocks.
> 
> Signed-off-by: Taniya Das <tdas@codeaurora.org>
> ---
>  drivers/clk/qcom/Kconfig      |  9 +++++
>  drivers/clk/qcom/Makefile     |  1 +
>  drivers/clk/qcom/gcc-sc7180.c | 70 ++++++++++++++++++++++++++++++++
>  drivers/clk/qcom/mss-sc7180.c | 94 
> +++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 174 insertions(+)
>  create mode 100644 drivers/clk/qcom/mss-sc7180.c
> 
> diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
> index 3b33ef1..5d4b6e5 100644
> --- a/drivers/clk/qcom/Kconfig
> +++ b/drivers/clk/qcom/Kconfig
> @@ -245,6 +245,15 @@ config SC_GCC_7180
>  	  Say Y if you want to use peripheral devices such as UART, SPI,
>  	  I2C, USB, UFS, SDCC, etc.
> 
> +config SC_MSS_7180
> +	tristate "SC7180 MSS Clock Controller"
> +	select SC_GCC_7180
> +	help
> +	  Support for the MSS clock controller on Qualcomm Technologies, Inc
> +	  SC7180 devices.
> +	  Say Y if you want to use the MSS branch clocks of the MSS clock
> +	  controller to reset the MSS subsystem.
> +
>  config SDM_CAMCC_845
>  	tristate "SDM845 Camera Clock Controller"
>  	select SDM_GCC_845
> diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
> index d899661..0e66bc6 100644
> --- a/drivers/clk/qcom/Makefile
> +++ b/drivers/clk/qcom/Makefile
> @@ -46,6 +46,7 @@ obj-$(CONFIG_QCS_GCC_404) += gcc-qcs404.o
>  obj-$(CONFIG_QCS_Q6SSTOP_404) += q6sstop-qcs404.o
>  obj-$(CONFIG_QCS_TURING_404) += turingcc-qcs404.o
>  obj-$(CONFIG_SC_GCC_7180) += gcc-sc7180.o
> +obj-$(CONFIG_SC_MSS_7180) += mss-sc7180.o
>  obj-$(CONFIG_SDM_CAMCC_845) += camcc-sdm845.o
>  obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o
>  obj-$(CONFIG_SDM_GCC_660) += gcc-sdm660.o
> diff --git a/drivers/clk/qcom/gcc-sc7180.c 
> b/drivers/clk/qcom/gcc-sc7180.c
> index 38424e6..7b3a705 100644
> --- a/drivers/clk/qcom/gcc-sc7180.c
> +++ b/drivers/clk/qcom/gcc-sc7180.c
> @@ -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 = {
> @@ -2334,6 +2399,11 @@ static struct clk_regmap *gcc_sc7180_clocks[] = 
> {
>  	[GPLL7] = &gpll7.clkr,
>  	[GPLL4] = &gpll4.clkr,
>  	[GPLL1] = &gpll1.clkr,
> +	[GCC_MSS_CFG_AHB_CBCR] = &gcc_mss_cfg_ahb_clk.clkr,
> +	[GCC_MSS_MFAB_AXIS_CBCR] = &gcc_mss_mfab_axis_clk.clkr,
> +	[GCC_MSS_NAV_AXI_CBCR] = &gcc_mss_nav_axi_clk.clkr,
> +	[GCC_MSS_Q6_MEMNOC_AXI_CBCR] = &gcc_mss_q6_memnoc_axi_clk.clkr,
> +	[GCC_MSS_SNOC_AXI_CBCR] = &gcc_mss_snoc_axi_clk.clkr,
>  };
> 
>  static const struct qcom_reset_map gcc_sc7180_resets[] = {
> diff --git a/drivers/clk/qcom/mss-sc7180.c 
> b/drivers/clk/qcom/mss-sc7180.c
> new file mode 100644
> index 0000000..24c38dc
> --- /dev/null
> +++ b/drivers/clk/qcom/mss-sc7180.c
> @@ -0,0 +1,94 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2019, The Linux Foundation. All rights reserved.
> + */
> +
> +#include <linux/clk-provider.h>
> +#include <linux/platform_device.h>
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/regmap.h>
> +
> +#include <dt-bindings/clock/qcom,mss-sc7180.h>
> +
> +#include "clk-regmap.h"
> +#include "clk-branch.h"
> +#include "common.h"
> +
> +static struct clk_branch mss_axi_nav_clk = {
> +	.halt_reg = 0xbc,

if we use the entire mpss_perph
reg space it should be 0x20bc
instead.

> +	.halt_check = BRANCH_HALT,
> +	.clkr = {
> +		.enable_reg = 0xbc,

0x20bc

> +		.enable_mask = BIT(0),
> +		.hw.init = &(struct clk_init_data){
> +			.name = "mss_axi_nav_clk",
> +			.ops = &clk_branch2_ops,
> +		},
> +	},
> +};
> +
> +static struct clk_branch mss_axi_crypto_clk = {
> +	.halt_reg = 0xcc,

if we use the entire mpss_perph
reg space it should be 0x20cc
instead.

> +	.halt_check = BRANCH_HALT,
> +	.clkr = {
> +		.enable_reg = 0xcc,

0x20cc

> +		.enable_mask = BIT(0),
> +		.hw.init = &(struct clk_init_data){
> +			.name = "mss_axi_crypto_clk",
> +			.ops = &clk_branch2_ops,
> +		},
> +	},
> +};
> +
> +static struct regmap_config mss_regmap_config = {
> +	.reg_bits	= 32,
> +	.reg_stride	= 4,
> +	.val_bits	= 32,
> +	.fast_io	= true,
> +};
> +
> +static struct clk_regmap *mss_sc7180_clocks[] = {
> +	[MSS_AXI_CRYPTO_CLK] = &mss_axi_crypto_clk.clkr,
> +	[MSS_AXI_NAV_CLK] = &mss_axi_nav_clk.clkr,
> +};
> +
> +static const struct qcom_cc_desc mss_sc7180_desc = {
> +	.config = &mss_regmap_config,
> +	.clks = mss_sc7180_clocks,
> +	.num_clks = ARRAY_SIZE(mss_sc7180_clocks),
> +};
> +
> +static int mss_sc7180_probe(struct platform_device *pdev)
> +{
> +	return qcom_cc_probe(pdev, &mss_sc7180_desc);

Similar to turingcc-qcs404 and q6sstop-qcs404
shouldn't we model the iface clk dependency
here since  both the above clocks cant be turned
on/off without it.

> +}
> +
> +static const struct of_device_id mss_sc7180_match_table[] = {
> +	{ .compatible = "qcom,sc7180-mss" },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, mss_sc7180_match_table);
> +
> +static struct platform_driver mss_sc7180_driver = {
> +	.probe		= mss_sc7180_probe,
> +	.driver		= {
> +		.name		= "sc7180-mss",
> +		.of_match_table = mss_sc7180_match_table,
> +	},
> +};
> +
> +static int __init mss_sc7180_init(void)
> +{
> +	return platform_driver_register(&mss_sc7180_driver);
> +}
> +subsys_initcall(mss_sc7180_init);
> +
> +static void __exit mss_sc7180_exit(void)
> +{
> +	platform_driver_unregister(&mss_sc7180_driver);
> +}
> +module_exit(mss_sc7180_exit);
> +
> +MODULE_DESCRIPTION("QTI MSS SC7180 Driver");
> +MODULE_LICENSE("GPL v2");
> --
> Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a 
> member
> of the Code Aurora Forum, hosted by the  Linux Foundation.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project.