On 04/19, Linus Walleij wrote:
> This adds support for the MSM8660 Low-power audio
> subsystem (LPASS) clock controller (LCC). This is nice when
> you want to have audio from the system.
>
> We currently only support using the PLL4 (which is an RPM
> clock) as the parent, however the LPASS has its own PLL named
> LPA_PLL0 that we can experiment with enabling later on, so
> for this reason the code contains a few hints on how to enable
> the LPA_PLL0.
>
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> ChangeLog v1->v2:
> - No changes.
> ---
> drivers/clk/qcom/Kconfig | 9 +
> drivers/clk/qcom/Makefile | 1 +
> drivers/clk/qcom/lcc-msm8660.c | 418 +++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 428 insertions(+)
> create mode 100644 drivers/clk/qcom/lcc-msm8660.c
>
> diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
> index 5fb8d7430908..d657d94d372f 100644
> --- a/drivers/clk/qcom/Kconfig
> +++ b/drivers/clk/qcom/Kconfig
> @@ -90,6 +90,15 @@ config MSM_GCC_8660
> Say Y if you want to use peripheral devices such as UART, SPI,
> i2c, USB, SD/eMMC, etc.
>
> +config MSM_LCC_8660
> + tristate "MSM8660 LPASS Clock Controller"
> + select MSM_GCC_8660
> + depends on COMMON_CLK_QCOM
depends on MSM_GCC_8660? Or perhaps the RPM driver. The intent is
to make sure the driver can't be built unless the dependency clks
that are inputs to the controller are also built. We may want to
just get rid of that sort of dependency, but that's the design
right now.
> + help
> + Support for the Low-power Audio Subsystem (LPASS) clock controller
> + on MSM8660 devices.
> + Say Y if you want to use audio devices such as I2S and PCM.
> +
> config MSM_GCC_8916
> tristate "MSM8916 Global Clock Controller"
> select QCOM_GDSC
> diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
> index 1c3e222b917b..d6d5ab178522 100644
> --- a/drivers/clk/qcom/Makefile
> +++ b/drivers/clk/qcom/Makefile
> @@ -21,6 +21,7 @@ obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o
> obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o
> obj-$(CONFIG_MDM_LCC_9615) += lcc-mdm9615.o
> obj-$(CONFIG_MSM_GCC_8660) += gcc-msm8660.o
> +obj-$(CONFIG_MSM_LCC_8660) += lcc-msm8660.o
> obj-$(CONFIG_MSM_GCC_8916) += gcc-msm8916.o
> obj-$(CONFIG_MSM_GCC_8960) += gcc-msm8960.o
> obj-$(CONFIG_MSM_GCC_8974) += gcc-msm8974.o
> diff --git a/drivers/clk/qcom/lcc-msm8660.c b/drivers/clk/qcom/lcc-msm8660.c
> new file mode 100644
> index 000000000000..73dc8ede6a2a
> --- /dev/null
> +++ b/drivers/clk/qcom/lcc-msm8660.c
> @@ -0,0 +1,418 @@
> +/*
> + * Qualcomm MSM8660/APQ8060 Low-power Audio Subsystem (LPASS) Clock Controller
> + * Copyright (c) 2017 Linus Walleij <linus.walleij@xxxxxxxxxx>
> + *
> + * Based on a copy of the IPQ806x driver
> + * (C) 2014 Rajendra Nayak
I don't see that in the file. Perhaps you meant to copy the linux
foundation one like in mdm9615?
> + * and portions of the MDM9615 driver
> + * (C) 2014 Neil Armstrong.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/bitops.h>
> +#include <linux/err.h>
> +#include <linux/platform_device.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
Is this used?
> +#include <linux/clk-provider.h>
> +#include <linux/regmap.h>
> +
> +#include <dt-bindings/clock/qcom,lcc-msm8660.h>
> +
> +#include "common.h"
> +#include "clk-regmap.h"
> +#include "clk-pll.h"
> +#include "clk-rcg.h"
> +#include "clk-branch.h"
> +#include "clk-regmap-divider.h"
> +#include "clk-regmap-mux.h"
> +
> +/*
> + * The vendor tree calls this "PLL0" but we are going to refer to it as
> + * LPA_PLL0 so as not to confuse it with the PLL0 on the GCC.
> + */
> +static struct clk_pll lpa_pll0 = {
> + .l_reg = 0x4,
> + .m_reg = 0x8,
> + .n_reg = 0xc,
> + .config_reg = 0x14,
> + .mode_reg = 0x0,
> + .status_reg = 0x18,
> + .status_bit = 16,
> + .clkr.hw.init = &(struct clk_init_data){
> + .name = "lpa_pll0",
Just PLL4 please.
> + .parent_names = (const char *[]){ "pxo" },
> + .num_parents = 1,
> + .ops = &clk_pll_ops,
> + },
> +};
> +
> +/*
> + * The l/m/n values were read out of the registers after a cold boot.
> + * The config register read 00c22080 and the mode register 0x00000007.
0x00c22080?
> + */
> +static const struct pll_config lpa_pll0_config = {
> + .l = 0xf,
> + .m = 0x1c,
> + .n = 0x465,
> + .vco_val = BIT(17),
> + .vco_mask = BIT(17) | BIT(16),
> + .pre_div_val = 0x0,
> + .pre_div_mask = BIT(19),
> + .post_div_val = 0x0,
> + .post_div_mask = BIT(21) | BIT(20),
> + .mn_ena_mask = BIT(22),
> + .main_output_mask = BIT(23),
> +};
> +
> +enum {
> + P_PXO,
> + P_CXO,
> + P_PLL4_LPA_PLL0,
Just call it P_PLL4 please.
> + P_GND,
Please remove ground.
> +};
> +
> +/* The vendor code uses PLL4 as parent everywhere */
> +static const struct parent_map lcc_parent_map[] = {
> + { P_PXO, 0 },
> + { P_CXO, 1 },
> + /* Select RPM PLL4, but also used for selecting LPA PLL0 */
> + { P_PLL4_LPA_PLL0, 2 },
> + /* Will just ground the line */
> + { P_GND, 6 },
We don't do clk grounding upstream so we don't need this. We can
add grounding in the future if anyone cares.
> +};
> +
> +static const char * const lcc_parent_tbl[] = {
> + "pxo",
> + "cxo",
> + /*
> + * PLL4 is an RPM clock on MSM8660/APQ8060, set to "pll4" for this
> + * If we enable and mux in the LPA_PLL0 on this platform, we can
> + * set this to "lpa_pll0" instead
This comment is confusing because PLL4 is LPA_PLL0.
> + */
> + "pll4_clk",
And just pll4. We don't need _clk for that. If that affects RPM
driver, it should be fixed as well.
> + "gnd", /* This is a very inactive parent */
Heh. Is it needed because an audio clk is set to ground by
default? That's the only case where I think it may be needed,
but I don't think we have that case where we need to change the
parent from ground to something else. If so, then we'll need to
add it as a valid source and then register it in this driver as a
fixed rate clk of rate 0.
> +};
> +
> +/*
> + * This table is evidently for using PLL4 as parent, if we start using
> + * LPA_PLL0 we need to provide a second table.
> + */
Remove comment.
> +static struct freq_tbl clk_tbl_aif_osr_pll4[] = {
> + { 768000, P_PLL4_LPA_PLL0, 4, 1, 176 },
> + { 1024000, P_PLL4_LPA_PLL0, 4, 1, 132 },
> + { 1536000, P_PLL4_LPA_PLL0, 4, 1, 88 },
> + { 2048000, P_PLL4_LPA_PLL0, 4, 1, 66 },
> + { 3072000, P_PLL4_LPA_PLL0, 4, 1, 44 },
> + { 4096000, P_PLL4_LPA_PLL0, 4, 1, 33 },
> + { 6144000, P_PLL4_LPA_PLL0, 4, 1, 22 },
> + { 8192000, P_PLL4_LPA_PLL0, 2, 1, 33 },
> + { 12288000, P_PLL4_LPA_PLL0, 4, 1, 11 },
> + { 24576000, P_PLL4_LPA_PLL0, 2, 1, 11 },
> + { 27000000, P_PXO, 1, 0, 0 },
> + { }
> +};
> +
> +/*
> + * This macro is modified from lcc-mdm9516.c, it's used for all the
> + * AIF clocks, all of them have an OSR clock and a bit clock derived
> + * from the OSR clock.
> + *
> + * These clocks differ from many other platforms by using
> + * BRANCH_HALT_DELAY for the *_bit_div_clk
> + */
Ok. Please leave out this comment.
> +#define CLK_AIF_OSR_DIV(prefix, _ns, _md, _hr) \
> +static struct clk_rcg prefix##_osr_src = { \
> + .ns_reg = _ns, \
> + .md_reg = _md, \
> + .mn = { \
> + .mnctr_en_bit = 8, \
> + .mnctr_reset_bit = 7, \
> + .mnctr_mode_shift = 5, \
> + .n_val_shift = 24, \
> + .m_val_shift = 8, \
> + .width = 8, \
> + }, \
> + .p = { \
> + .pre_div_shift = 3, \
> + .pre_div_width = 2, \
> + }, \
> + .s = { \
> + .src_sel_shift = 0, \
> + .parent_map = lcc_parent_map, \
> + }, \
> + .freq_tbl = clk_tbl_aif_osr_pll4, \
> + .clkr = { \
> + .enable_reg = _ns, \
> + .enable_mask = BIT(9), \
> + .hw.init = &(struct clk_init_data){ \
> + .name = #prefix "_osr_src", \
> + .parent_names = lcc_parent_tbl, \
> + .num_parents = 4, \
> + .ops = &clk_rcg_ops, \
> + .flags = CLK_SET_RATE_GATE, \
> + }, \
> + }, \
> +}; \
> + \
> +static const char * const lcc_##prefix##_parents[] = { \
> + #prefix "_osr_src", \
> +}; \
> + \
> +static struct clk_branch prefix##_osr_clk = { \
> + .halt_reg = _hr, \
> + .halt_bit = 1, \
> + .halt_check = BRANCH_HALT_ENABLE, \
> + .clkr = { \
> + .enable_reg = _ns, \
> + .enable_mask = BIT(17), \
> + .hw.init = &(struct clk_init_data){ \
> + .name = #prefix "_osr_clk", \
> + .parent_names = lcc_##prefix##_parents, \
> + .num_parents = 1, \
> + .ops = &clk_branch_ops, \
> + .flags = CLK_SET_RATE_PARENT, \
> + }, \
> + }, \
> +}; \
> + \
> +static struct clk_regmap_div prefix##_div_clk = { \
> + .reg = _ns, \
> + .shift = 10, \
> + .width = 4, \
> + .clkr = { \
> + .hw.init = &(struct clk_init_data){ \
> + .name = #prefix "_div_clk", \
> + .parent_names = lcc_##prefix##_parents, \
> + .num_parents = 1, \
> + .ops = &clk_regmap_div_ops, \
> + }, \
> + }, \
> +}; \
> + \
> +static struct clk_branch prefix##_bit_div_clk = { \
> + .halt_reg = _hr, \
> + .halt_bit = 0, \
> + .halt_check = BRANCH_HALT_DELAY, \
> + .clkr = { \
> + .enable_reg = _ns, \
> + .enable_mask = BIT(15), \
> + .hw.init = &(struct clk_init_data){ \
> + .name = #prefix "_bit_div_clk", \
> + .parent_names = (const char *[]){ \
> + #prefix "_div_clk" \
> + }, \
> + .num_parents = 1, \
> + .ops = &clk_branch_ops, \
> + .flags = CLK_SET_RATE_PARENT, \
> + }, \
> + }, \
> +}; \
> + \
> +static struct clk_regmap_mux prefix##_bit_clk = { \
> + .reg = _ns, \
> + .shift = 14, \
> + .width = 1, \
> + .clkr = { \
> + .hw.init = &(struct clk_init_data){ \
> + .name = #prefix "_bit_clk", \
> + .parent_names = (const char *[]){ \
> + #prefix "_bit_div_clk", \
> + #prefix "_codec_clk", \
> + }, \
> + .num_parents = 2, \
> + .ops = &clk_regmap_mux_closest_ops, \
> + .flags = CLK_SET_RATE_PARENT, \
> + }, \
> + }, \
> +}
> +
> +CLK_AIF_OSR_DIV(mi2s, 0x48, 0x4c, 0x50);
> +CLK_AIF_OSR_DIV(codec_i2s_mic, 0x60, 0x64, 0x68);
> +CLK_AIF_OSR_DIV(spare_i2s_mic, 0x78, 0x7c, 0x80);
> +CLK_AIF_OSR_DIV(codec_i2s_spkr, 0x6c, 0x70, 0x74);
> +CLK_AIF_OSR_DIV(spare_i2s_spkr, 0x84, 0x88, 0x8c);
> +
> +/*
> + * PCM clock
> + * This table is evidently for using PLL4 as parent, if we start using
> + * LPA_PLL0 we need to provide a second table.
> + */
Remove comment.
> +static struct freq_tbl clk_tbl_pcm_pll4[] = {
> + { 512000, P_PLL4_LPA_PLL0, 4, 1, 264 },
> + { 768000, P_PLL4_LPA_PLL0, 4, 1, 176 },
> + { 1024000, P_PLL4_LPA_PLL0, 4, 1, 132 },
> + { 1536000, P_PLL4_LPA_PLL0, 4, 1, 88 },
> + { 2048000, P_PLL4_LPA_PLL0, 4, 1, 66 },
> + { 3072000, P_PLL4_LPA_PLL0, 4, 1, 44 },
> + { 4096000, P_PLL4_LPA_PLL0, 4, 1, 33 },
> + { 6144000, P_PLL4_LPA_PLL0, 4, 1, 22 },
> + { 8192000, P_PLL4_LPA_PLL0, 2, 1, 33 },
> + { 12288000, P_PLL4_LPA_PLL0, 4, 1, 11 },
> + { 24580000, P_PLL4_LPA_PLL0, 2, 1, 11 },
> + { 27000000, P_PXO, 1, 0, 0 },
> + { },
> +};
[...]
> +
> +static int lcc_msm8660_probe(struct platform_device *pdev)
> +{
> + u32 val;
> + struct regmap *regmap;
> +
> + regmap = qcom_cc_map(pdev, &lcc_msm8660_desc);
> + if (IS_ERR(regmap))
> + return PTR_ERR(regmap);
> +
> + /* Configure the rate of LPA_PLL0 if the bootloader hasn't already */
> + regmap_read(regmap, 0x0, &val);
> + if (!val) {
> + dev_info(&pdev->dev, "configuring LPA_PLL0\n");
> + clk_pll_configure_sr(&lpa_pll0, regmap, &lpa_pll0_config, true);
> + } else {
> + dev_info(&pdev->dev,
> + "LPA_PLL0 already configured\n");
dev_dbg? Is this the case that happens for you? I don't think we
should be programming the hardware because the RPM controls the
PLL. It should already be setup to the right rate. I don't see
this happening in the downstream code either, so this should all
be removed most likely.
> + }
> +
> + /*
> + * Enable LPA_PLL0 source on the LPASS Primary PLL Mux. Incidentally
> + * this is set to 0x00000001 at boot.
> + * 0x01 = LPA_PLL0
> + */
> + regmap_write(regmap, 0xc4, 0x1);
And this isn't needed either?
> +
> + return qcom_cc_really_probe(pdev, &lcc_msm8660_desc, regmap);
> +}
> +
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
