Commit 1220f6a7 authored by Ajit Pandey's avatar Ajit Pandey Committed by Mark Brown

ASoC: qcom: Add common array to initialize soc based core clocks

LPASS variants have their own soc specific clocks that needs to be
enabled for MI2S audio support. Added a common variable in drvdata to
initialize such clocks using bulk clk api. Such clock names is
defined in variants specific data and needs to fetched during init.
Signed-off-by: default avatarAjit Pandey <ajitp@codeaurora.org>
Signed-off-by: default avatarRohit kumar <rohitkr@codeaurora.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/1597402388-14112-2-git-send-email-rohitkr@codeaurora.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 549ade57
...@@ -161,32 +161,27 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) ...@@ -161,32 +161,27 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan)
static int apq8016_lpass_init(struct platform_device *pdev) static int apq8016_lpass_init(struct platform_device *pdev)
{ {
struct lpass_data *drvdata = platform_get_drvdata(pdev); struct lpass_data *drvdata = platform_get_drvdata(pdev);
struct lpass_variant *variant = drvdata->variant;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int ret; int ret, i;
drvdata->pcnoc_mport_clk = devm_clk_get(dev, "pcnoc-mport-clk");
if (IS_ERR(drvdata->pcnoc_mport_clk)) {
dev_err(dev, "error getting pcnoc-mport-clk: %ld\n",
PTR_ERR(drvdata->pcnoc_mport_clk));
return PTR_ERR(drvdata->pcnoc_mport_clk);
}
ret = clk_prepare_enable(drvdata->pcnoc_mport_clk); drvdata->clks = devm_kcalloc(dev, variant->num_clks,
sizeof(*drvdata->clks), GFP_KERNEL);
drvdata->num_clks = variant->num_clks;
for (i = 0; i < drvdata->num_clks; i++)
drvdata->clks[i].id = variant->clk_name[i];
ret = devm_clk_bulk_get(dev, drvdata->num_clks, drvdata->clks);
if (ret) { if (ret) {
dev_err(dev, "Error enabling pcnoc-mport-clk: %d\n", ret); dev_err(dev, "Failed to get clocks %d\n", ret);
return ret; return ret;
} }
drvdata->pcnoc_sway_clk = devm_clk_get(dev, "pcnoc-sway-clk"); ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks);
if (IS_ERR(drvdata->pcnoc_sway_clk)) {
dev_err(dev, "error getting pcnoc-sway-clk: %ld\n",
PTR_ERR(drvdata->pcnoc_sway_clk));
return PTR_ERR(drvdata->pcnoc_sway_clk);
}
ret = clk_prepare_enable(drvdata->pcnoc_sway_clk);
if (ret) { if (ret) {
dev_err(dev, "Error enabling pcnoc_sway_clk: %d\n", ret); dev_err(dev, "apq8016 clk_enable failed\n");
return ret; return ret;
} }
...@@ -197,8 +192,7 @@ static int apq8016_lpass_exit(struct platform_device *pdev) ...@@ -197,8 +192,7 @@ static int apq8016_lpass_exit(struct platform_device *pdev)
{ {
struct lpass_data *drvdata = platform_get_drvdata(pdev); struct lpass_data *drvdata = platform_get_drvdata(pdev);
clk_disable_unprepare(drvdata->pcnoc_mport_clk); clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks);
clk_disable_unprepare(drvdata->pcnoc_sway_clk);
return 0; return 0;
} }
...@@ -219,6 +213,11 @@ static struct lpass_variant apq8016_data = { ...@@ -219,6 +213,11 @@ static struct lpass_variant apq8016_data = {
.wrdma_reg_stride = 0x1000, .wrdma_reg_stride = 0x1000,
.wrdma_channel_start = 5, .wrdma_channel_start = 5,
.wrdma_channels = 2, .wrdma_channels = 2,
.clk_name = (const char*[]) {
"pcnoc-mport-clk",
"pcnoc-sway-clk",
},
.num_clks = 2,
.dai_driver = apq8016_lpass_cpu_dai_driver, .dai_driver = apq8016_lpass_cpu_dai_driver,
.num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver), .num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver),
.dai_osr_clk_names = (const char *[]) { .dai_osr_clk_names = (const char *[]) {
......
...@@ -51,9 +51,9 @@ struct lpass_data { ...@@ -51,9 +51,9 @@ struct lpass_data {
/* used it for handling interrupt per dma channel */ /* used it for handling interrupt per dma channel */
struct snd_pcm_substream *substream[LPASS_MAX_DMA_CHANNELS]; struct snd_pcm_substream *substream[LPASS_MAX_DMA_CHANNELS];
/* 8016 specific */ /* SOC specific clock list */
struct clk *pcnoc_mport_clk; struct clk_bulk_data *clks;
struct clk *pcnoc_sway_clk; int num_clks;
}; };
...@@ -89,6 +89,10 @@ struct lpass_variant { ...@@ -89,6 +89,10 @@ struct lpass_variant {
int num_dai; int num_dai;
const char * const *dai_osr_clk_names; const char * const *dai_osr_clk_names;
const char * const *dai_bit_clk_names; const char * const *dai_bit_clk_names;
/* SOC specific clocks configuration */
const char **clk_name;
int num_clks;
}; };
/* register the platform driver from the CPU DAI driver */ /* register the platform driver from the CPU DAI driver */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment