| Message ID | 1596528453-11437-1-git-send-email-rohitkr@codeaurora.org |
|---|---|
| Headers | show |
| Series | ASoC: qcom: Add support for SC7180 lpass variant | expand |
Hello Mark, Other than patch 12, there is no comment on other patches from anyone as of now. [PATCH v5 12/12] dt-bindings: sound: lpass-cpu: Move to yaml format I will plan to post patch12 only with comments addressed if other changes does not have any comment. Please let me know your inputs. Thanks, Rohit On 8/4/2020 1:37 PM, Rohit kumar wrote: > This patch chain add audio support for SC7180 soc by doing the required > modification in existing common lpass-cpu/lpass-platform driver. > This also fixes some concurrency issue. > > This patch series is already tested by Srinivas on Dragon Board 410c. > Changes since v4: > - Updated compatible string for sc7180 lpass cpu as suggested by Rob > - Addressed comments by Rob in yaml Documentation. > > Ajit Pandey (4): > ASoC: qcom: Add common array to initialize soc based core clocks > ASoC: qcom: lpass-platform: Replace card->dev with component->dev > include: dt-bindings: sound: Add sc7180-lpass bindings header > ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio > > Rohit kumar (8): > ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function > ASoC: qcom: lpass-platform: fix memory leak > ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers > ASoC: qcom: lpass-cpu: fix concurrency issue > dt-bindings: sound: lpass-cpu: Add sc7180 lpass cpu node > ASoC: qcom: lpass-cpu: Use platform_get_resource > ASoC: qcom: lpass-platform: Use platform_get_irq > dt-bindings: sound: lpass-cpu: Move to yaml format > > .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 -------- > .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 179 +++++++++++++++++ > include/dt-bindings/sound/sc7180-lpass.h | 10 + > sound/soc/qcom/Kconfig | 5 + > sound/soc/qcom/Makefile | 2 + > sound/soc/qcom/lpass-apq8016.c | 86 ++++++-- > sound/soc/qcom/lpass-cpu.c | 204 ++++++++++--------- > sound/soc/qcom/lpass-ipq806x.c | 67 +++++++ > sound/soc/qcom/lpass-lpaif-reg.h | 157 ++++++++------- > sound/soc/qcom/lpass-platform.c | 155 +++++++++++---- > sound/soc/qcom/lpass-sc7180.c | 216 +++++++++++++++++++++ > sound/soc/qcom/lpass.h | 63 +++++- > 12 files changed, 924 insertions(+), 299 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt > create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml > create mode 100644 include/dt-bindings/sound/sc7180-lpass.h > create mode 100644 sound/soc/qcom/lpass-sc7180.c >
Hello Mark, Do you see any concern with patches (1-11). As of now, there is comment only in patch 12 from Rob which I am planning to update once other patches are merged. Can you please review and let me know if anything is missing. Thanks, Rohit On 8/4/2020 1:37 PM, Rohit kumar wrote: > From: Ajit Pandey <ajitp@codeaurora.org> > > 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: Ajit Pandey <ajitp@codeaurora.org> > Signed-off-by: Rohit kumar <rohitkr@codeaurora.org> > Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > sound/soc/qcom/lpass-apq8016.c | 39 +++++++++++++++++++-------------------- > sound/soc/qcom/lpass.h | 10 +++++++--- > 2 files changed, 26 insertions(+), 23 deletions(-) > > diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c > index b3610d0..8210e37 100644 > --- a/sound/soc/qcom/lpass-apq8016.c > +++ b/sound/soc/qcom/lpass-apq8016.c > @@ -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) > { > struct lpass_data *drvdata = platform_get_drvdata(pdev); > + struct lpass_variant *variant = drvdata->variant; > 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) { > - dev_err(dev, "Error enabling pcnoc-mport-clk: %d\n", ret); > + dev_err(dev, "Failed to get clocks %d\n", ret); > return ret; > } > > - drvdata->pcnoc_sway_clk = devm_clk_get(dev, "pcnoc-sway-clk"); > - 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); > + ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); > if (ret) { > - dev_err(dev, "Error enabling pcnoc_sway_clk: %d\n", ret); > + dev_err(dev, "apq8016 clk_enable failed\n"); > return ret; > } > > @@ -197,8 +192,7 @@ static int apq8016_lpass_exit(struct platform_device *pdev) > { > struct lpass_data *drvdata = platform_get_drvdata(pdev); > > - clk_disable_unprepare(drvdata->pcnoc_mport_clk); > - clk_disable_unprepare(drvdata->pcnoc_sway_clk); > + clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); > > return 0; > } > @@ -219,6 +213,11 @@ static struct lpass_variant apq8016_data = { > .wrdma_reg_stride = 0x1000, > .wrdma_channel_start = 5, > .wrdma_channels = 2, > + .clk_name = (const char*[]) { > + "pcnoc-mport-clk", > + "pcnoc-sway-clk", > + }, > + .num_clks = 2, > .dai_driver = apq8016_lpass_cpu_dai_driver, > .num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver), > .dai_osr_clk_names = (const char *[]) { > diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h > index bd19ec5..450020e 100644 > --- a/sound/soc/qcom/lpass.h > +++ b/sound/soc/qcom/lpass.h > @@ -51,9 +51,9 @@ struct lpass_data { > /* used it for handling interrupt per dma channel */ > struct snd_pcm_substream *substream[LPASS_MAX_DMA_CHANNELS]; > > - /* 8016 specific */ > - struct clk *pcnoc_mport_clk; > - struct clk *pcnoc_sway_clk; > + /* SOC specific clock list */ > + struct clk_bulk_data *clks; > + int num_clks; > > }; > > @@ -89,6 +89,10 @@ struct lpass_variant { > int num_dai; > const char * const *dai_osr_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 */
On Tue, Aug 11, 2020 at 04:13:03PM +0530, Rohit Kumar wrote: > Do you see any concern with patches (1-11). > As of now, there is comment only in patch 12 from Rob which I am > planning to update once other patches are merged. Can you > please review and let me know if anything is missing. Please just post the fixed series instead of sending me a stream of pings, it must be taking you more time to do this than it would to just send the fix. I'm not going to apply your patches during the merge window, they are not bug fixes and sending me content free pings just makes me delay the review.
This patch chain add audio support for SC7180 soc by doing the required modification in existing common lpass-cpu/lpass-platform driver. This also fixes some concurrency issue. This patch series is already tested by Srinivas on Dragon Board 410c. Changes since v4: - Updated compatible string for sc7180 lpass cpu as suggested by Rob - Addressed comments by Rob in yaml Documentation. Ajit Pandey (4): ASoC: qcom: Add common array to initialize soc based core clocks ASoC: qcom: lpass-platform: Replace card->dev with component->dev include: dt-bindings: sound: Add sc7180-lpass bindings header ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio Rohit kumar (8): ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function ASoC: qcom: lpass-platform: fix memory leak ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers ASoC: qcom: lpass-cpu: fix concurrency issue dt-bindings: sound: lpass-cpu: Add sc7180 lpass cpu node ASoC: qcom: lpass-cpu: Use platform_get_resource ASoC: qcom: lpass-platform: Use platform_get_irq dt-bindings: sound: lpass-cpu: Move to yaml format .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 -------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 179 +++++++++++++++++ include/dt-bindings/sound/sc7180-lpass.h | 10 + sound/soc/qcom/Kconfig | 5 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass-apq8016.c | 86 ++++++-- sound/soc/qcom/lpass-cpu.c | 204 ++++++++++--------- sound/soc/qcom/lpass-ipq806x.c | 67 +++++++ sound/soc/qcom/lpass-lpaif-reg.h | 157 ++++++++------- sound/soc/qcom/lpass-platform.c | 155 +++++++++++---- sound/soc/qcom/lpass-sc7180.c | 216 +++++++++++++++++++++ sound/soc/qcom/lpass.h | 63 +++++- 12 files changed, 924 insertions(+), 299 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml create mode 100644 include/dt-bindings/sound/sc7180-lpass.h create mode 100644 sound/soc/qcom/lpass-sc7180.c