ASoC: qcom: Add support for SC7180 lpass variant
Subsystems (5)
v4 cover ASoC: qcom: Add support for SC7180 lpass variant
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.
Changes since v3:
- Fixed yaml documentation comments and make dt_binding_check issues.
- Moved general fixes out of sc7180 specific patches as suggested by Srinivas.
- Update clock-names to make it same as existing platforms.
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 | 185 ++++++++++++++++++ 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, 930 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
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v4 1/12 ASoC: qcom: Add common array to initialize soc based core clocks
From: Ajit Pandey <[email protected]>
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.
--- sound/soc/qcom/lpass-apq8016.c | 39 +++++++++++++++++++-------------------- sound/soc/qcom/lpass.h | 10 +++++++--- 2 files changed, 26 insertions(+), 23 deletions(-)
sound/soc/qcom/lpass-apq8016.c +19 -20
@@ -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 *[]) {
sound/soc/qcom/lpass.h +7 -3
@@ -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 */
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v4 01/12] ASoC: qcom: Add common array to initialize soc based core clocks
Quoting Rohit kumar (2020-07-22 03:31:44)
Quoted 6 lines
From: Ajit Pandey <[email protected]>
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.
Why not just get all the clks and not even care about the names of them? Use devm_clk_bulk_get_all() for that, unless some clks need to change rates?
Re: [PATCH v4 01/12] ASoC: qcom: Add common array to initialize soc based core clocks
Thanks Stephen for reviewing.
Quoted 10 lines · Stephen Boyd
Quoting Rohit kumar (2020-07-22 03:31:44)
Quoted 6 lines
From: Ajit Pandey <[email protected]>
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.
Why not just get all the clks and not even care about the names of them? Use
devm_clk_bulk_get_all()for that, unless some clks need to change rates?
There is ahbix clk which needs clk rate to be set. Please check below patch in
the series for reference
[PATCH v5 02/12] ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function
Thanks,
Rohit
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.
Re: [PATCH v4 01/12] ASoC: qcom: Add common array to initialize soc based core clocks
Quoting Rohit Kumar (2020-08-05 20:59:48)
Quoted 14 lines
Thanks Stephen for reviewing.
Quoted 10 lines · Stephen Boyd
Quoting Rohit kumar (2020-07-22 03:31:44)
Quoted 6 lines
From: Ajit Pandey <[email protected]>
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.
Why not just get all the clks and not even care about the names of them? Use
devm_clk_bulk_get_all()for that, unless some clks need to change rates?
Quoted 8 lines
There is ahbix clk which needs clk rate to be set. Please check below patch in
the series for reference
[PATCH v5 02/12] ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function
Alright. I wonder if we could make the API better or the binding better and always have the rate settable clk first and then devm_clk_bulk_get_all() could be used along with clk_set_rate() on some array element 0 or something. Anyway, don't mind me, I'm just thinking how to make this simpler.
PATCH v4 2/12 ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function
In reply to Rohit kumarAhbix clock is optional clock and not needed for all platforms. Move it to lpass-apq8016/ipq806x as it is not needed for sc7180.
--- sound/soc/qcom/lpass-apq8016.c | 27 ++++++++++++++++++++++++++ sound/soc/qcom/lpass-cpu.c | 40 ++++++++++----------------------------- sound/soc/qcom/lpass-ipq806x.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 30 deletions(-)
sound/soc/qcom/lpass-apq8016.c +27 -0
@@ -185,7 +185,33 @@ static int apq8016_lpass_init(struct platform_device *pdev)return ret; } + drvdata->ahbix_clk =devm_clk_get (dev,"ahbix-clk" ); +if (IS_ERR (drvdata->ahbix_clk)) { +dev_err (dev,"error getting ahbix-clk: %ld\n" , +PTR_ERR (drvdata->ahbix_clk)); + ret =PTR_ERR (drvdata->ahbix_clk); + goto err_ahbix_clk; + } + + ret =clk_set_rate (drvdata->ahbix_clk,LPASS_AHBIX_CLOCK_FREQUENCY ); +if (ret) { +dev_err (dev,"error setting rate on ahbix_clk: %d\n" , ret); + goto err_ahbix_clk; + } +dev_dbg (dev,"set ahbix_clk rate to %lu\n" , +clk_get_rate (drvdata->ahbix_clk)); + + ret =clk_prepare_enable (drvdata->ahbix_clk); +if (ret) { +dev_err (dev,"error enabling ahbix_clk: %d\n" , ret); + goto err_ahbix_clk; + } +return 0 ; + +err_ahbix_clk: +clk_bulk_disable_unprepare (drvdata->num_clks, drvdata->clks); +return ret; }static int apq8016_lpass_exit (struct platform_device *pdev)
@@ -193,6 +219,7 @@ static int apq8016_lpass_exit(struct platform_device *pdev)struct lpass_data *drvdata =platform_get_drvdata (pdev);clk_bulk_disable_unprepare (drvdata->num_clks, drvdata->clks); +clk_disable_unprepare (drvdata->ahbix_clk);return 0 ; }
sound/soc/qcom/lpass-cpu.c +10 -30
@@ -566,8 +566,13 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)return PTR_ERR (drvdata->lpaif_map); } -if (variant->init) - variant->init (pdev); +if (variant->init) { + ret = variant->init (pdev); +if (ret) { +dev_err (dev,"error initializing variant: %d\n" , ret); +return ret; + } + }for (i =0 ; i < variant->num_dai; i++) { dai_id = variant->dai_driver[i].id;
@@ -594,46 +599,22 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) } } - drvdata->ahbix_clk =devm_clk_get (dev,"ahbix-clk" ); -if (IS_ERR (drvdata->ahbix_clk)) { -dev_err (dev,"error getting ahbix-clk: %ld\n" , -PTR_ERR (drvdata->ahbix_clk)); -return PTR_ERR (drvdata->ahbix_clk); - } - - ret =clk_set_rate (drvdata->ahbix_clk,LPASS_AHBIX_CLOCK_FREQUENCY ); -if (ret) { -dev_err (dev,"error setting rate on ahbix_clk: %d\n" , ret); -return ret; - } -dev_dbg (dev,"set ahbix_clk rate to %lu\n" , -clk_get_rate (drvdata->ahbix_clk)); - - ret =clk_prepare_enable (drvdata->ahbix_clk); -if (ret) { -dev_err (dev,"error enabling ahbix_clk: %d\n" , ret); -return ret; - } - ret =devm_snd_soc_register_component (dev, &lpass_cpu_comp_driver, variant->dai_driver, variant->num_dai);if (ret) {dev_err (dev,"error registering cpu driver: %d\n" , ret); - goto err_clk; + goto err; } ret =asoc_qcom_lpass_platform_register (pdev);if (ret) {dev_err (dev,"error registering platform driver: %d\n" , ret); - goto err_clk; + goto err; } -return 0 ; - -err_clk: -clk_disable_unprepare (drvdata->ahbix_clk); +err:return ret; }EXPORT_SYMBOL_GPL (asoc_qcom_lpass_cpu_platform_probe);
@@ -645,7 +626,6 @@ int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev)if (drvdata->variant->exit) drvdata->variant->exit (pdev); -clk_disable_unprepare (drvdata->ahbix_clk);return 0 ; }
sound/soc/qcom/lpass-ipq806x.c +43 -0
55 lines not on this page · raw message
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v4 3/12 ASoC: qcom: lpass-platform: Replace card->dev with component->dev
In reply to Rohit kumarFrom: Ajit Pandey <[email protected]>
We are allocating dma memory for component->dev but trying to mmap such memory for substream->pcm->card->dev. Replace device argument in mmap with component->dev to fix this.
--- sound/soc/qcom/lpass-platform.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/qcom/lpass-platform.c +2 -3
@@ -400,9 +400,8 @@ static int lpass_platform_pcmops_mmap(struct snd_soc_component *component, {struct snd_pcm_runtime *runtime = substream->runtime; -return dma_mmap_coherent (substream->pcm->card->dev, vma, - runtime->dma_area, runtime->dma_addr, - runtime->dma_bytes); +return dma_mmap_coherent (component->dev, vma, runtime->dma_area, + runtime->dma_addr, runtime->dma_bytes); } static irqreturn_t lpass_dma_interrupt_handler(
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v4 4/12 ASoC: qcom: lpass-platform: fix memory leak
In reply to Rohit kumarlpass_pcm_data is never freed. Free it in close
ops to avoid memory leak.
--- sound/soc/qcom/lpass-platform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/qcom/lpass-platform.c +2 -1
@@ -61,7 +61,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component,int ret, dma_ch, dir = substream->stream;struct lpass_pcm_data *data; - data =devm_kzalloc (soc_runtime->dev,sizeof (*data),GFP_KERNEL ); + data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ;
@@ -118,6 +118,7 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component,if (v->free_dma_channel) v->free_dma_channel (drvdata, data->dma_ch); +kfree (data);return 0 ; }
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v4 04/12] ASoC: qcom: lpass-platform: fix memory leak
Quoted 5 lines · Rohit kumar
lpass_pcm_datais never freed. Free it in close
ops to avoid memory leak.Fixes 022d00ee0b55 ("ASoC: lpass-platform: Fix broken pcm data usage")Signed-off-by Rohit kumar <[email protected]>
Quoted 26 lines
--- sound/soc/qcom/lpass-platform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)sound/soc/qcom/lpass-platform.c +2
-1@@ -61,7 +61,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component,int ret, dma_ch, dir = substream->stream;struct lpass_pcm_data *data; - data =devm_kzalloc (soc_runtime->dev,sizeof (*data),GFP_KERNEL ); + data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ;@@ -118,6 +118,7 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component,if (v->free_dma_channel) v->free_dma_channel (drvdata, data->dma_ch); +kfree (data);return 0 ; }
PATCH v4 5/12 ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers
In reply to Rohit kumarI2SCTL and DMACTL registers has different bits alignment for newer LPASS variants of SC7180 soc. Use REG_FIELD_ID() to define the reg_fields in platform specific file and removed shifts and mask macros for such registers from header file.
--- sound/soc/qcom/lpass-apq8016.c | 24 ++++++ sound/soc/qcom/lpass-cpu.c | 156 ++++++++++++++++++++++++++------------ sound/soc/qcom/lpass-ipq806x.c | 24 ++++++ sound/soc/qcom/lpass-lpaif-reg.h | 157 +++++++++++++++++++++------------------ sound/soc/qcom/lpass-platform.c | 145 ++++++++++++++++++++++++++++-------- sound/soc/qcom/lpass.h | 53 +++++++++++++ 6 files changed, 407 insertions(+), 152 deletions(-)
sound/soc/qcom/lpass-apq8016.c +24 -0
@@ -240,6 +240,30 @@ static struct lpass_variant apq8016_data = { .wrdma_reg_stride = 0x1000, .wrdma_channel_start = 5, .wrdma_channels = 2, + .loopback = REG_FIELD_ID(0x1000, 15, 15, 4, 0x1000), + .spken = REG_FIELD_ID(0x1000, 14, 14, 4, 0x1000), + .spkmode = REG_FIELD_ID(0x1000, 10, 13, 4, 0x1000), + .spkmono = REG_FIELD_ID(0x1000, 9, 9, 4, 0x1000), + .micen = REG_FIELD_ID(0x1000, 8, 8, 4, 0x1000), + .micmode = REG_FIELD_ID(0x1000, 4, 7, 4, 0x1000), + .micmono = REG_FIELD_ID(0x1000, 3, 3, 4, 0x1000), + .wssrc = REG_FIELD_ID(0x1000, 2, 2, 4, 0x1000), + .bitwidth = REG_FIELD_ID(0x1000, 0, 0, 4, 0x1000), + + .rdma_dyncclk = REG_FIELD_ID(0x8400, 12, 12, 2, 0x1000), + .rdma_bursten = REG_FIELD_ID(0x8400, 11, 11, 2, 0x1000), + .rdma_wpscnt = REG_FIELD_ID(0x8400, 8, 10, 2, 0x1000), + .rdma_intf = REG_FIELD_ID(0x8400, 4, 7, 2, 0x1000), + .rdma_fifowm = REG_FIELD_ID(0x8400, 1, 3, 2, 0x1000), + .rdma_enable = REG_FIELD_ID(0x8400, 0, 0, 2, 0x1000), + + .wrdma_dyncclk = REG_FIELD_ID(0xB000, 12, 12, 2, 0x1000), + .wrdma_bursten = REG_FIELD_ID(0xB000, 11, 11, 2, 0x1000), + .wrdma_wpscnt = REG_FIELD_ID(0xB000, 8, 10, 2, 0x1000), + .wrdma_intf = REG_FIELD_ID(0xB000, 4, 7, 2, 0x1000), + .wrdma_fifowm = REG_FIELD_ID(0xB000, 1, 3, 2, 0x1000), + .wrdma_enable = REG_FIELD_ID(0xB000, 0, 0, 2, 0x1000), + .clk_name = (const char *[]) {"pcnoc-mport-clk" ,"pcnoc-sway-clk" ,
sound/soc/qcom/lpass-cpu.c +107 -49
247 lines not on this page · raw message
sound/soc/qcom/lpass-ipq806x.c +24 -0
@@ -123,6 +123,30 @@ static struct lpass_variant ipq806x_data = { .wrdma_reg_stride = 0x1000, .wrdma_channel_start = 5, .wrdma_channels = 4, + .loopback = REG_FIELD_ID(0x0010, 15, 15, 5, 0x4), + .spken = REG_FIELD_ID(0x0010, 14, 14, 5, 0x4), + .spkmode = REG_FIELD_ID(0x0010, 10, 13, 5, 0x4), + .spkmono = REG_FIELD_ID(0x0010, 9, 9, 5, 0x4), + .micen = REG_FIELD_ID(0x0010, 8, 8, 5, 0x4), + .micmode = REG_FIELD_ID(0x0010, 4, 7, 5, 0x4), + .micmono = REG_FIELD_ID(0x0010, 3, 3, 5, 0x4), + .wssrc = REG_FIELD_ID(0x0010, 2, 2, 5, 0x4), + .bitwidth = REG_FIELD_ID(0x0010, 0, 0, 5, 0x4), + + .rdma_dyncclk = REG_FIELD_ID(0x6000, 12, 12, 4, 0x1000), + .rdma_bursten = REG_FIELD_ID(0x6000, 11, 11, 4, 0x1000), + .rdma_wpscnt = REG_FIELD_ID(0x6000, 8, 10, 4, 0x1000), + .rdma_intf = REG_FIELD_ID(0x6000, 4, 7, 4, 0x1000), + .rdma_fifowm = REG_FIELD_ID(0x6000, 1, 3, 4, 0x1000), + .rdma_enable = REG_FIELD_ID(0x6000, 0, 0, 4, 0x1000), + + .wrdma_dyncclk = REG_FIELD_ID(0xB000, 12, 12, 4, 0x1000), + .wrdma_bursten = REG_FIELD_ID(0xB000, 11, 11, 4, 0x1000), + .wrdma_wpscnt = REG_FIELD_ID(0xB000, 8, 10, 4, 0x1000), + .wrdma_intf = REG_FIELD_ID(0xB000, 4, 7, 4, 0x1000), + .wrdma_fifowm = REG_FIELD_ID(0xB000, 1, 3, 4, 0x1000), + .wrdma_enable = REG_FIELD_ID(0xB000, 0, 0, 4, 0x1000), + .dai_driver = &ipq806x_lpass_cpu_dai_driver, .num_dai = 1, .dai_osr_clk_names = (const char *[]) {
sound/soc/qcom/lpass-lpaif-reg.h +84 -73
181 lines not on this page · raw message
sound/soc/qcom/lpass-platform.c +115 -30
239 lines not on this page · raw message
sound/soc/qcom/lpass.h +53 -0
71 lines not on this page · raw message
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v4 6/12 ASoC: qcom: lpass-cpu: fix concurrency issue
In reply to Rohit kumari2sctl register value is set to 0 during hw_free(). This impacts any ongoing concurrent session on the same i2s port. As trigger() stop already resets enable bit to 0, there is no need of explicit hw_free. Removing it to fix the issue.
--- sound/soc/qcom/lpass-cpu.c | 16 ---------------- 1 file changed, 16 deletions(-)
sound/soc/qcom/lpass-cpu.c +0 -16
@@ -266,21 +266,6 @@ static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream,return 0 ; } -static int lpass_cpu_daiops_hw_free (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -struct lpass_data *drvdata =snd_soc_dai_get_drvdata (dai); -int ret; - - ret =regmap_write (drvdata->lpaif_map, -LPAIF_I2SCTL_REG (drvdata->variant, dai->driver->id), -0 ); -if (ret) -dev_err (dai->dev,"error writing to i2sctl reg: %d\n" , ret); - -return ret; -} -static int lpass_cpu_daiops_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {
@@ -350,7 +335,6 @@ const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = { .startup = lpass_cpu_daiops_startup, .shutdown = lpass_cpu_daiops_shutdown, .hw_params = lpass_cpu_daiops_hw_params, - .hw_free = lpass_cpu_daiops_hw_free, .prepare = lpass_cpu_daiops_prepare, .trigger = lpass_cpu_daiops_trigger, };
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v4 06/12] ASoC: qcom: lpass-cpu: fix concurrency issue
Quoted 8 lines · Rohit kumar
i2sctl register value is set to 0 during
hw_free(). This impacts any ongoing concurrent session on the same i2s port. Astrigger()stop already resets enable bit to 0, there is no need of explicithw_free. Removing it to fix the issue.Fixes 80beab8e1d86 ("ASoC: qcom: Add LPASS CPU DAI driver")Signed-off-by Rohit kumar <[email protected]>
Quoted 39 lines
--- sound/soc/qcom/lpass-cpu.c | 16 ---------------- 1 file changed, 16 deletions(-)sound/soc/qcom/lpass-cpu.c +0
-16@@ -266,21 +266,6 @@ static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream,return 0 ; } -static int lpass_cpu_daiops_hw_free (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -struct lpass_data *drvdata =snd_soc_dai_get_drvdata (dai); -int ret; - - ret =regmap_write (drvdata->lpaif_map, -LPAIF_I2SCTL_REG (drvdata->variant, dai->driver->id), -0 ); -if (ret) -dev_err (dai->dev,"error writing to i2sctl reg: %d\n" , ret); - -return ret; -} -static int lpass_cpu_daiops_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {@@ -350,7 +335,6 @@ const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = { .startup = lpass_cpu_daiops_startup, .shutdown = lpass_cpu_daiops_shutdown, .hw_params = lpass_cpu_daiops_hw_params, - .hw_free = lpass_cpu_daiops_hw_free, .prepare = lpass_cpu_daiops_prepare, .trigger = lpass_cpu_daiops_trigger, };
PATCH v4 7/12 dt-bindings: sound: lpass-cpu: Add sc7180 lpass cpu node
In reply to Rohit kumarAdd dt-bindings to support "qcom,lpass-cpu-sc7180" node.
--- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 55 +++++++++++++++++++++- 1 file changed, 53 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +53 -2
@@ -4,7 +4,8 @@ This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). Required properties: -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" +- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" or + "qcom,lpass-cpu-sc7180" - clocks : Must contain an entry for each entry in clock-names. - clock-names : A list which must include the following entries: * "ahbix-clk"
@@ -18,6 +19,13 @@ Required properties: * "mi2s-bit-clk3" * "pcnoc-mport-clk" * "pcnoc-sway-clk" + : required clocks for "qcom,lpass-cpu-sc7180" + * "audio-core" + * "mclk0" + * "mi2s-bit-clk0" + * "mi2s-bit-clk1" + * "pcnoc-sway-clk" + * "pcnoc-mport-clk" - interrupts : Must contain an entry for each entry in interrupt-names.
@@ -53,7 +61,8 @@ Required properties for each DAI (represented by a subnode): Note that adding a subnode changes the default to "no lines configured", so both playback and capture lines should be configured when a subnode is added. -Example: +Examples: +1) lpass@28100000 { compatible = "qcom,lpass-cpu";
@@ -77,3 +86,45 @@ lpass@28100000 { qcom,playback-sd-lines = <0 1>; }; }; + +2) + +#include <dt-bindings/sound/sc7180-lpass.h> + +lpass_cpu: lpass { + compatible = "qcom,lpass-cpu-sc7180"; + + reg = <0 0x62F00000 0 0x29000>; + + iommus = <&apps_smmu 0x1020 0>; + + power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>; + clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_CORE_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_SYSNOC_MPORT_CORE_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_PRI_IBIT_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_SEC_IBIT_CLK>; + clock-names = "pcnoc-sway-clk", "audio-core", + "mclk0", "pcnoc-mport-clk", + "mi2s-bit-clk0", "mi2s-bit-clk1"; + interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "lpass-irq-lpaif"; + + + #sound-dai-cells = <1>; + + #address-cells = <1>; + #size-cells = <0>; + + mi2s-primary@0 { + reg = <MI2S_PRIMARY>; + qcom,playback-sd-lines = <1>; + qcom,capture-sd-lines = <0>; + }; + + mi2s-secondary@1 { + reg = <MI2S_SECONDARY>; + qcom,playback-sd-lines = <0>; + }; +};
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Rob Herring
maintainerRe: [PATCH v4 07/12] dt-bindings: sound: lpass-cpu: Add sc7180 lpass cpu node
Quoted 12 lines · Rohit kumar
Add dt-bindings to support "qcom,lpass-cpu-sc7180" node.
Signed-off-by Rohit kumar <[email protected]>--- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 55 +++++++++++++++++++++- 1 file changed, 53 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +0
-0
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). · line 8
Quoted 6 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +2
-1@@ -4,7 +4,8 @@ This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). Required properties: -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" +- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" or + "qcom,lpass-cpu-sc7180"
qcom,sc7180-lpass-cpu
Quoted 77 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +51
-1- clocks : Must contain an entry for each entry in clock-names. - clock-names : A list which must include the following entries: * "ahbix-clk"@@ -18,6 +19,13 @@ Required properties: * "mi2s-bit-clk3" * "pcnoc-mport-clk" * "pcnoc-sway-clk" + : required clocks for "qcom,lpass-cpu-sc7180" + * "audio-core" + * "mclk0" + * "mi2s-bit-clk0" + * "mi2s-bit-clk1" + * "pcnoc-sway-clk" + * "pcnoc-mport-clk" - interrupts : Must contain an entry for each entry in interrupt-names.@@ -53,7 +61,8 @@ Required properties for each DAI (represented by a subnode): Note that adding a subnode changes the default to "no lines configured", so both playback and capture lines should be configured when a subnode is added. -Example: +Examples: +1) lpass@28100000 { compatible = "qcom,lpass-cpu";@@ -77,3 +86,45 @@ lpass@28100000 { qcom,playback-sd-lines = <0 1>; }; }; + +2) + +#include <dt-bindings/sound/sc7180-lpass.h> + +lpass_cpu: lpass { + compatible = "qcom,lpass-cpu-sc7180"; + + reg = <0 0x62F00000 0 0x29000>; + + iommus = <&apps_smmu 0x1020 0>; + + power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>; + clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_CORE_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_SYSNOC_MPORT_CORE_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_PRI_IBIT_CLK>, + <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_SEC_IBIT_CLK>; + clock-names = "pcnoc-sway-clk", "audio-core", + "mclk0", "pcnoc-mport-clk", + "mi2s-bit-clk0", "mi2s-bit-clk1"; + interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "lpass-irq-lpaif"; + + + #sound-dai-cells = <1>; + + #address-cells = <1>; + #size-cells = <0>; + + mi2s-primary@0 { + reg = <MI2S_PRIMARY>; + qcom,playback-sd-lines = <1>; + qcom,capture-sd-lines = <0>; + }; + + mi2s-secondary@1 { + reg = <MI2S_SECONDARY>; + qcom,playback-sd-lines = <0>; + }; +};Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v4 8/12 include: dt-bindings: sound: Add sc7180-lpass bindings header
In reply to Rohit kumarFrom: Ajit Pandey <[email protected]>
Add header defining dai-id and mclk id for SC7180 lpass soc.
--- include/dt-bindings/sound/sc7180-lpass.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 include/dt-bindings/sound/sc7180-lpass.h
include/dt-bindings/sound/sc7180-lpass.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_SC7180_LPASS_H +#define __DT_SC7180_LPASS_H + +#define MI2S_PRIMARY 0 +#define MI2S_SECONDARY 1 + +#define LPASS_MCLK0 0 + +#endif /* __DT_APQ8016_LPASS_H */
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v4 08/12] include: dt-bindings: sound: Add sc7180-lpass bindings header
Quoted 11 lines · Rohit kumar
From: Ajit Pandey <[email protected]>
Add header defining dai-id and mclk id for SC7180 lpass soc.
Signed-off-by Ajit Pandey <[email protected]>Signed-off-by Rohit kumar <[email protected]>--- include/dt-bindings/sound/sc7180-lpass.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 include/dt-bindings/sound/sc7180-lpass.h
PATCH v4 9/12 ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio
In reply to Rohit kumarFrom: Ajit Pandey <[email protected]>
Add platform driver for configuring sc7180 lpass core I2S and DMA configuration to support playback & capture to external codecs connected over primary & secondary MI2S interfaces.
--- sound/soc/qcom/Kconfig | 5 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass-sc7180.c | 216 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+) create mode 100644 sound/soc/qcom/lpass-sc7180.c
sound/soc/qcom/Kconfig +5 -0
@@ -24,6 +24,11 @@ config SND_SOC_LPASS_APQ8016 select SND_SOC_LPASS_CPU select SND_SOC_LPASS_PLATFORM +config SND_SOC_LPASS_SC7180 + tristate + select SND_SOC_LPASS_CPU + select SND_SOC_LPASS_PLATFORM + config SND_SOC_STORM tristate "ASoC I2S support for Storm boards" depends on SND_SOC_QCOM
sound/soc/qcom/Makefile +2 -0
@@ -4,11 +4,13 @@ snd-soc-lpass-cpu-objs := lpass-cpu.o snd-soc-lpass-platform-objs := lpass-platform.o snd-soc-lpass-ipq806x-objs := lpass-ipq806x.o snd-soc-lpass-apq8016-objs := lpass-apq8016.o +snd-soc-lpass-sc7180-objs := lpass-sc7180.o obj-$(CONFIG_SND_SOC_LPASS_CPU) += snd-soc-lpass-cpu.o obj-$(CONFIG_SND_SOC_LPASS_PLATFORM) += snd-soc-lpass-platform.o obj-$(CONFIG_SND_SOC_LPASS_IPQ806X) += snd-soc-lpass-ipq806x.o obj-$(CONFIG_SND_SOC_LPASS_APQ8016) += snd-soc-lpass-apq8016.o +obj-$(CONFIG_SND_SOC_LPASS_SC7180) += snd-soc-lpass-sc7180.o # Machine snd-soc-storm-objs := storm.o
sound/soc/qcom/lpass-sc7180.c new file +216 -0
216 lines not on this page · raw message
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v4 10/12 ASoC: qcom: lpass-cpu: Use platform_get_resource
In reply to Rohit kumarplatform_get_resource_byname() is used when there is list of reg entries. As lpass-cpu node has only one reg entry, use platform_get_resource() instead.
--- sound/soc/qcom/lpass-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/qcom/lpass-cpu.c +1 -1
@@ -575,7 +575,7 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)of_lpass_cpu_parse_dai_data (dev, drvdata); - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"lpass-lpaif" ); + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); drvdata->lpaif =devm_ioremap_resource (dev, res);if (IS_ERR ((void const __force *)drvdata->lpaif)) {
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v4 10/12] ASoC: qcom: lpass-cpu: Use platform_get_resource
Quoted 5 lines · Rohit kumar
platform_get_resource_byname()is used when there is list of reg entries. As lpass-cpu node has only one reg entry, useplatform_get_resource()instead.Signed-off-by Rohit kumar <[email protected]>
Quoted 18 lines
--- sound/soc/qcom/lpass-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/qcom/lpass-cpu.c +1
-1@@ -575,7 +575,7 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)of_lpass_cpu_parse_dai_data (dev, drvdata); - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"lpass-lpaif" ); + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); drvdata->lpaif =devm_ioremap_resource (dev, res);if (IS_ERR ((void const __force *)drvdata->lpaif)) {
PATCH v4 11/12 ASoC: qcom: lpass-platform: Use platform_get_irq
In reply to Rohit kumarplatform_get_irq_byname() is used when there is list of interrupts in the device node. As lpass-platform has only one interrupt entry, use platform_get_irq() instead.
--- sound/soc/qcom/lpass-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/qcom/lpass-platform.c +1 -1
@@ -638,7 +638,7 @@ int asoc_qcom_lpass_platform_register(struct platform_device *pdev)struct lpass_variant *v = drvdata->variant;int ret; - drvdata->lpaif_irq =platform_get_irq_byname (pdev,"lpass-irq-lpaif" ); + drvdata->lpaif_irq =platform_get_irq (pdev,0 );if (drvdata->lpaif_irq <0 )return -ENODEV ;
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v4 12/12 dt-bindings: sound: lpass-cpu: Move to yaml format
In reply to Rohit kumarUpdate lpass-cpu binding with yaml formats.
--- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 130 --------------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185 +++++++++++++++++++++ 2 files changed, 185 insertions(+), 130 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt deleted +0 -130
@@ -1,130 +0,0 @@ -* Qualcomm Technologies LPASS CPU DAI - -This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). - -Required properties: - -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" or - "qcom,lpass-cpu-sc7180" -- clocks : Must contain an entry for each entry in clock-names. -- clock-names : A list which must include the following entries: - * "ahbix-clk" - * "mi2s-osr-clk" - * "mi2s-bit-clk" - : required clocks for "qcom,lpass-cpu-apq8016" - * "ahbix-clk" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "mi2s-bit-clk2" - * "mi2s-bit-clk3" - * "pcnoc-mport-clk" - * "pcnoc-sway-clk" - : required clocks for "qcom,lpass-cpu-sc7180" - * "audio-core" - * "mclk0" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "pcnoc-sway-clk" - * "pcnoc-mport-clk" - -- interrupts : Must contain an entry for each entry in - interrupt-names. -- interrupt-names : A list which must include the following entries: - * "lpass-irq-lpaif" -- pinctrl-N : One property must exist for each entry in - pinctrl-names. See ../pinctrl/pinctrl-bindings.txt - for details of the property values. -- pinctrl-names : Must contain a "default" entry. -- reg : Must contain an address for each entry in reg-names. -- reg-names : A list which must include the following entries: - * "lpass-lpaif" -- #address-cells : Must be 1 -- #size-cells : Must be 0 - - - -Optional properties: - -- qcom,adsp : Phandle for the audio DSP node - -By default, the driver uses up to 4 MI2S SD lines, for a total of 8 channels. -The SD lines to use can be configured by adding subnodes for each of the DAIs. - -Required properties for each DAI (represented by a subnode): -- reg : Must be one of the DAI IDs - (usually part of dt-bindings header) -- qcom,playback-sd-lines: List of serial data lines to use for playback - Each SD line should be represented by a number from 0-3. -- qcom,capture-sd-lines : List of serial data lines to use for capture - Each SD line should be represented by a number from 0-3. - -Note that adding a subnode changes the default to "no lines configured", -so both playback and capture lines should be configured when a subnode is added. - -Examples: -1) - -lpass@28100000 { - compatible = "qcom,lpass-cpu"; - clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>; - clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; - interrupts = <0 85 1>; - interrupt-names = "lpass-irq-lpaif"; - pinctrl-names = "default", "idle"; - pinctrl-0 = <&mi2s_default>; - pinctrl-1 = <&mi2s_idle>; - reg = <0x28100000 0x10000>; - reg-names = "lpass-lpaif"; - qcom,adsp = <&adsp>; - - #address-cells = <1>; - #size-cells = <0>; - - /* Optional to set different MI2S SD lines */ - dai@3 { - reg = <MI2S_QUATERNARY>; - qcom,playback-sd-lines = <0 1>; - }; -}; - -2) - -#include <dt-bindings/sound/sc7180-lpass.h> - -lpass_cpu: lpass { - compatible = "qcom,lpass-cpu-sc7180"; - - reg = <0 0x62F00000 0 0x29000>; - - iommus = <&apps_smmu 0x1020 0>; - - power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>; - clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_SYSNOC_MPORT_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_PRI_IBIT_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_SEC_IBIT_CLK>; - clock-names = "pcnoc-sway-clk", "audio-core", - "mclk0", "pcnoc-mport-clk", - "mi2s-bit-clk0", "mi2s-bit-clk1"; - interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "lpass-irq-lpaif"; - - - #sound-dai-cells = <1>; - - #address-cells = <1>; - #size-cells = <0>; - - mi2s-primary@0 { - reg = <MI2S_PRIMARY>; - qcom,playback-sd-lines = <1>; - qcom,capture-sd-lines = <0>; - }; - - mi2s-secondary@1 { - reg = <MI2S_SECONDARY>; - qcom,playback-sd-lines = <0>; - }; -};
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +185 -0
185 lines not on this page · raw message
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Rob Herring
maintainerRe: [PATCH v4 12/12] dt-bindings: sound: lpass-cpu: Move to yaml format
Quoted 152 lines · Rohit kumar
Update lpass-cpu binding with yaml formats.
Signed-off-by Rohit kumar <[email protected]>--- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 130 --------------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185 +++++++++++++++++++++ 2 files changed, 185 insertions(+), 130 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yamlDocumentation/devicetree/bindings/sound/qcom,lpass-cpu.txt deleted +0
-130@@ -1,130 +0,0 @@ -* Qualcomm Technologies LPASS CPU DAI - -This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). - -Required properties: - -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" or - "qcom,lpass-cpu-sc7180" -- clocks : Must contain an entry for each entry in clock-names. -- clock-names : A list which must include the following entries: - * "ahbix-clk" - * "mi2s-osr-clk" - * "mi2s-bit-clk" - : required clocks for "qcom,lpass-cpu-apq8016" - * "ahbix-clk" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "mi2s-bit-clk2" - * "mi2s-bit-clk3" - * "pcnoc-mport-clk" - * "pcnoc-sway-clk" - : required clocks for "qcom,lpass-cpu-sc7180" - * "audio-core" - * "mclk0" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "pcnoc-sway-clk" - * "pcnoc-mport-clk" - -- interrupts : Must contain an entry for each entry in - interrupt-names. -- interrupt-names : A list which must include the following entries: - * "lpass-irq-lpaif" -- pinctrl-N : One property must exist for each entry in - pinctrl-names. See ../pinctrl/pinctrl-bindings.txt - for details of the property values. -- pinctrl-names : Must contain a "default" entry. -- reg : Must contain an address for each entry in reg-names. -- reg-names : A list which must include the following entries: - * "lpass-lpaif" -- #address-cells : Must be 1 -- #size-cells : Must be 0 - - - -Optional properties: - -- qcom,adsp : Phandle for the audio DSP node - -By default, the driver uses up to 4 MI2S SD lines, for a total of 8 channels. -The SD lines to use can be configured by adding subnodes for each of the DAIs. - -Required properties for each DAI (represented by a subnode): -- reg : Must be one of the DAI IDs - (usually part of dt-bindings header) -- qcom,playback-sd-lines: List of serial data lines to use for playback - Each SD line should be represented by a number from 0-3. -- qcom,capture-sd-lines : List of serial data lines to use for capture - Each SD line should be represented by a number from 0-3. - -Note that adding a subnode changes the default to "no lines configured", -so both playback and capture lines should be configured when a subnode is added. - -Examples: -1) - -lpass@28100000 { - compatible = "qcom,lpass-cpu"; - clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>; - clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; - interrupts = <0 85 1>; - interrupt-names = "lpass-irq-lpaif"; - pinctrl-names = "default", "idle"; - pinctrl-0 = <&mi2s_default>; - pinctrl-1 = <&mi2s_idle>; - reg = <0x28100000 0x10000>; - reg-names = "lpass-lpaif"; - qcom,adsp = <&adsp>; - - #address-cells = <1>; - #size-cells = <0>; - - /* Optional to set different MI2S SD lines */ - dai@3 { - reg = <MI2S_QUATERNARY>; - qcom,playback-sd-lines = <0 1>; - }; -}; - -2) - -#include <dt-bindings/sound/sc7180-lpass.h> - -lpass_cpu: lpass { - compatible = "qcom,lpass-cpu-sc7180"; - - reg = <0 0x62F00000 0 0x29000>; - - iommus = <&apps_smmu 0x1020 0>; - - power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>; - clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_SYSNOC_MPORT_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_PRI_IBIT_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_SEC_IBIT_CLK>; - clock-names = "pcnoc-sway-clk", "audio-core", - "mclk0", "pcnoc-mport-clk", - "mi2s-bit-clk0", "mi2s-bit-clk1"; - interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "lpass-irq-lpaif"; - - - #sound-dai-cells = <1>; - - #address-cells = <1>; - #size-cells = <0>; - - mi2s-primary@0 { - reg = <MI2S_PRIMARY>; - qcom,playback-sd-lines = <1>; - qcom,capture-sd-lines = <0>; - }; - - mi2s-secondary@1 { - reg = <MI2S_SECONDARY>; - qcom,playback-sd-lines = <0>; - }; -};Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +0
-0
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 1
Quoted 1 line
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +1
-0@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-only
If all the authors are QCom or Linaro please dual license.
Quoted 18 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +18
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,lpass-cpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm LPASS CPU dai driver bindings + +maintainers: + - Srinivas Kandagatla <[email protected]> + - Rohit kumar <[email protected]> + +description: | + Qualcomm SOC Low-Power Audio SubSystem (LPASS) that consist of MI2S interface + for audio data transfer on external codecs. LPASS cpu driver is a module to + configure Low-Power Audio Interface(LPAIF) core registers across different + IP versions. + +properties:
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 29
Quoted 10 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +10
-0+ compatible: + oneOf: + - const: qcom,lpass-cpu + description: For IPQ806x + + - const: qcom,apq8016-lpass-cpu + description: For APQ8016 + + - const: qcom,lpass-cpu-sc7180 + description: For SC7180
Use enum rather than oneOf+const
Quoted 35 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +35
-0+ + reg: + maxItems: 1 + description: LPAIF core registers + + clocks: + minItems: 3 + maxItems: 6 + + clock-names: + minItems: 3 + maxItems: 6 + + interrupts: + maxItems: 1 + description: LPAIF DMA buffer interrupt + + qcom,adsp: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle for the audio DSP node + + iommus: + maxItems: 1 + description: Phandle to apps_smmu node with sid mask + + power-domains: + maxItems: 1 + + '#sound-dai-cells': + const: 1 + +patternProperties: + "(^mi2s-[0-9a-f]$|mi2s)": + type: object + description: Required properties for each DAI
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 74
Quoted 10 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +10
-0+ + properties: + reg: + maxItems: 1 + description: Must be one of the DAI ID + + required: + - reg + +
Extra blank line.
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 81
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - '#sound-dai-cells'
Add:
additionalProperties: false
Quoted 40 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +40
-0+ +allOf: + - if: + properties: + compatible: + contains: + const: qcom,lpass-cpu-sc7180 + + then: + required: + - iommus + - power-domains + + - if: + properties: + compatible: + contains: + const: qcom,lpass-cpu + + then: + properties: + clock-names: + items: + - const: ahbix-clk + - const: mi2s-osr-clk + - const: mi2s-bit-clk + + - if: + properties: + compatible: + contains: + const: qcom,apq8016-lpass-cpu + + then: + properties: + clock-names: + items: + - const: ahbix-clk + - const: mi2s-bit-clk0 + - const: mi2s-bit-clk1
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 131
Quoted 10 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +10
-0+ - const: mi2s-bit-clk2 + - const: mi2s-bit-clk3 + - const: pcnoc-mport-clk + - const: pcnoc-sway-clk + + - if: + properties: + compatible: + contains: + const: qcom,lpass-cpu-sc7180
You already have the same condition previously. Combine into 1.
Quoted 58 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +54
-0+ + then: + properties: + clock-names: + items: + - const: pcnoc-sway-clk + - const: audio-core + - const: mclk0 + - const: pcnoc-mport-clk + - const: mi2s-bit-clk0 + - const: mi2s-bit-clk1 + +examples: + - | + #include <dt-bindings/sound/sc7180-lpass.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + lpass@62f00000 { + compatible = "qcom,lpass-cpu-sc7180"; + + reg = <0 0x62f00000 0 0x29000>; + + iommus = <&apps_smmu 0x1020 0>; + power-domains = <&lpass_hm 0>; + + clocks = <&gcc 131>, + <&lpasscorecc 6>, + <&lpasscorecc 7>, + <&lpasscorecc 10>, + <&lpasscorecc 8>, + <&lpasscorecc 9>; + + clock-names = "pcnoc-sway-clk", "audio-core", + "mclk0", "pcnoc-mport-clk", + "mi2s-bit-clk0", "mi2s-bit-clk1"; + + interrupts = <0 160 1>; + + #sound-dai-cells = <1>; + + #address-cells = <1>; + #size-cells = <0>; + /* Optional to set different MI2S SD lines */ + mi2s-primary@0 { + reg = <MI2S_PRIMARY>; + qcom,playback-sd-lines = <1>; + qcom,capture-sd-lines = <0>; + }; + }; + }; + +...Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v4 12/12] dt-bindings: sound: lpass-cpu: Move to yaml format
Thanks Rob for reviewing
Quoted 147 lines · Rob Herring
Quoted 146 lines · Rohit kumar
Update lpass-cpu binding with yaml formats.
Signed-off-by Rohit kumar <[email protected]>--- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 130 --------------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185 +++++++++++++++++++++ 2 files changed, 185 insertions(+), 130 deletions(-)delete mode 100644
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txtcreate mode 100644Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yamlDocumentation/devicetree/bindings/sound/qcom,lpass-cpu.txt deleted +0
-130@@ -1,130 +0,0 @@ -* Qualcomm Technologies LPASS CPU DAI - -This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). - -Required properties: - -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" or - "qcom,lpass-cpu-sc7180" -- clocks : Must contain an entry for each entry in clock-names. -- clock-names : A list which must include the following entries: - * "ahbix-clk" - * "mi2s-osr-clk" - * "mi2s-bit-clk" - : required clocks for "qcom,lpass-cpu-apq8016" - * "ahbix-clk" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "mi2s-bit-clk2" - * "mi2s-bit-clk3" - * "pcnoc-mport-clk" - * "pcnoc-sway-clk" - : required clocks for "qcom,lpass-cpu-sc7180" - * "audio-core" - * "mclk0" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "pcnoc-sway-clk" - * "pcnoc-mport-clk" - -- interrupts : Must contain an entry for each entry in - interrupt-names. -- interrupt-names : A list which must include the following entries: - * "lpass-irq-lpaif" -- pinctrl-N : One property must exist for each entry in - pinctrl-names. See ../pinctrl/pinctrl-bindings.txt - for details of the property values. -- pinctrl-names : Must contain a "default" entry. -- reg : Must contain an address for each entry in reg-names. -- reg-names : A list which must include the following entries: - * "lpass-lpaif" -- #address-cells : Must be 1 -- #size-cells : Must be 0 - - - -Optional properties: - -- qcom,adsp : Phandle for the audio DSP node - -By default, the driver uses up to 4 MI2S SD lines, for a total of 8 channels. -The SD lines to use can be configured by adding subnodes for each of the DAIs. - -Required properties for each DAI (represented by a subnode): -- reg : Must be one of the DAI IDs - (usually part of dt-bindings header) -- qcom,playback-sd-lines: List of serial data lines to use for playback - Each SD line should be represented by a number from 0-3. -- qcom,capture-sd-lines : List of serial data lines to use for capture - Each SD line should be represented by a number from 0-3. - -Note that adding a subnode changes the default to "no lines configured", -so both playback and capture lines should be configured when a subnode is added. - -Examples: -1) - -lpass@28100000 { - compatible = "qcom,lpass-cpu"; - clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>; - clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; - interrupts = <0 85 1>; - interrupt-names = "lpass-irq-lpaif"; - pinctrl-names = "default", "idle"; - pinctrl-0 = <&mi2s_default>; - pinctrl-1 = <&mi2s_idle>; - reg = <0x28100000 0x10000>; - reg-names = "lpass-lpaif"; - qcom,adsp = <&adsp>; - - #address-cells = <1>; - #size-cells = <0>; - - /* Optional to set different MI2S SD lines */ - dai@3 { - reg = <MI2S_QUATERNARY>; - qcom,playback-sd-lines = <0 1>; - }; -}; - -2) - -#include <dt-bindings/sound/sc7180-lpass.h> - -lpass_cpu: lpass { - compatible = "qcom,lpass-cpu-sc7180"; - - reg = <0 0x62F00000 0 0x29000>; - - iommus = <&apps_smmu 0x1020 0>; - - power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>; - clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_SYSNOC_MPORT_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_PRI_IBIT_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_SEC_IBIT_CLK>; - clock-names = "pcnoc-sway-clk", "audio-core", - "mclk0", "pcnoc-mport-clk", - "mi2s-bit-clk0", "mi2s-bit-clk1"; - interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "lpass-irq-lpaif"; - - - #sound-dai-cells = <1>; - - #address-cells = <1>; - #size-cells = <0>; - - mi2s-primary@0 { - reg = <MI2S_PRIMARY>; - qcom,playback-sd-lines = <1>; - qcom,capture-sd-lines = <0>; - }; - - mi2s-secondary@1 { - reg = <MI2S_SECONDARY>; - qcom,playback-sd-lines = <0>; - }; -};
Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 1
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +1
-0@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-onlyIf all the authors are QCom or Linaro please dual license.
Ok
Quoted 21 lines
Quoted 21 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +21
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,lpass-cpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm LPASS CPU dai driver bindings + +maintainers: + - Srinivas Kandagatla <[email protected]> + - Rohit kumar <[email protected]> + +description: | + Qualcomm SOC Low-Power Audio SubSystem (LPASS) that consist of MI2S interface + for audio data transfer on external codecs. LPASS cpu driver is a module to + configure Low-Power Audio Interface(LPAIF) core registers across different + IP versions. + +properties: + compatible: + oneOf: + - const: qcom,lpass-cpu
Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 29
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+ description: For IPQ806x + + - const: qcom,apq8016-lpass-cpu + description: For APQ8016 + + - const: qcom,lpass-cpu-sc7180 + description: For SC7180Use enum rather than oneOf+const
Sure
Quoted 38 lines
Quoted 38 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +38
-0+ + reg: + maxItems: 1 + description: LPAIF core registers + + clocks: + minItems: 3 + maxItems: 6 + + clock-names: + minItems: 3 + maxItems: 6 + + interrupts: + maxItems: 1 + description: LPAIF DMA buffer interrupt + + qcom,adsp: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle for the audio DSP node + + iommus: + maxItems: 1 + description: Phandle to apps_smmu node with sid mask + + power-domains: + maxItems: 1 + + '#sound-dai-cells': + const: 1 + +patternProperties: + "(^mi2s-[0-9a-f]$|mi2s)": + type: object + description: Required properties for each DAI + + properties: + reg:
Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 74
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+ maxItems: 1 + description: Must be one of the DAI ID + + required: + - reg + +Extra blank line.
Ok
Quoted 10 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 81
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - '#sound-dai-cells'Add:
additionalProperties: false
If I am adding this, I am getting below error:
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.example.dt.yaml: lpass@62f00000: '#address-cells', '#size-cells' do not match any of the regexes: '(^mi2s-[0-9a-f]$|mi2s)', 'pinctrl-[0-9]+'
I think this is coming because we have not mentioned mi2s-primary@0 in required fields. The field name is variable based on the interface to which peripheral is connected to. It can be either of primary/secondary/tertiary/quaternary. Can you please suggest how to avoid this error?
Quoted 43 lines
Quoted 43 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +43
-0+ +allOf: + - if: + properties: + compatible: + contains: + const: qcom,lpass-cpu-sc7180 + + then: + required: + - iommus + - power-domains + + - if: + properties: + compatible: + contains: + const: qcom,lpass-cpu + + then: + properties: + clock-names: + items: + - const: ahbix-clk + - const: mi2s-osr-clk + - const: mi2s-bit-clk + + - if: + properties: + compatible: + contains: + const: qcom,apq8016-lpass-cpu + + then: + properties: + clock-names: + items: + - const: ahbix-clk + - const: mi2s-bit-clk0 + - const: mi2s-bit-clk1 + - const: mi2s-bit-clk2 + - const: mi2s-bit-clk3 + - const: pcnoc-mport-clk
Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 131
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+ - const: pcnoc-sway-clk + + - if: + properties: + compatible: + contains: + const: qcom,lpass-cpu-sc7180You already have the same condition previously. Combine into 1.
Ok
Quoted 49 lines
Quoted 49 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +49
-0+ + then: + properties: + clock-names: + items: + - const: pcnoc-sway-clk + - const: audio-core + - const: mclk0 + - const: pcnoc-mport-clk + - const: mi2s-bit-clk0 + - const: mi2s-bit-clk1 + +examples: + - | + #include <dt-bindings/sound/sc7180-lpass.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + lpass@62f00000 { + compatible = "qcom,lpass-cpu-sc7180"; + + reg = <0 0x62f00000 0 0x29000>; + + iommus = <&apps_smmu 0x1020 0>; + power-domains = <&lpass_hm 0>; + + clocks = <&gcc 131>, + <&lpasscorecc 6>, + <&lpasscorecc 7>, + <&lpasscorecc 10>, + <&lpasscorecc 8>, + <&lpasscorecc 9>; + + clock-names = "pcnoc-sway-clk", "audio-core", + "mclk0", "pcnoc-mport-clk", + "mi2s-bit-clk0", "mi2s-bit-clk1"; + + interrupts = <0 160 1>; + + #sound-dai-cells = <1>; + + #address-cells = <1>; + #size-cells = <0>; + /* Optional to set different MI2S SD lines */ + mi2s-primary@0 { + reg = <MI2S_PRIMARY>; + qcom,playback-sd-lines = <1>; + qcom,capture-sd-lines = <0>;
Quoted 8 lines
Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +5
-0+ }; + }; + }; + +...Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Thanks,
Rohit
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 v4 12/12] dt-bindings: sound: lpass-cpu: Move to yaml format
Quoted 255 lines · Rohit Kumar
Thanks Rob for reviewing
Quoted 147 lines · Rob Herring
Quoted 146 lines · Rohit kumar
Update lpass-cpu binding with yaml formats.
Signed-off-by Rohit kumar <[email protected]>--- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 130 --------------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185 +++++++++++++++++++++ 2 files changed, 185 insertions(+), 130 deletions(-)delete mode 100644
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txtcreate mode 100644Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yamlDocumentation/devicetree/bindings/sound/qcom,lpass-cpu.txt deleted +0
-130@@ -1,130 +0,0 @@ -* Qualcomm Technologies LPASS CPU DAI - -This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). - -Required properties: - -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" or - "qcom,lpass-cpu-sc7180" -- clocks : Must contain an entry for each entry in clock-names. -- clock-names : A list which must include the following entries: - * "ahbix-clk" - * "mi2s-osr-clk" - * "mi2s-bit-clk" - : required clocks for "qcom,lpass-cpu-apq8016" - * "ahbix-clk" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "mi2s-bit-clk2" - * "mi2s-bit-clk3" - * "pcnoc-mport-clk" - * "pcnoc-sway-clk" - : required clocks for "qcom,lpass-cpu-sc7180" - * "audio-core" - * "mclk0" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "pcnoc-sway-clk" - * "pcnoc-mport-clk" - -- interrupts : Must contain an entry for each entry in - interrupt-names. -- interrupt-names : A list which must include the following entries: - * "lpass-irq-lpaif" -- pinctrl-N : One property must exist for each entry in - pinctrl-names. See ../pinctrl/pinctrl-bindings.txt - for details of the property values. -- pinctrl-names : Must contain a "default" entry. -- reg : Must contain an address for each entry in reg-names. -- reg-names : A list which must include the following entries: - * "lpass-lpaif" -- #address-cells : Must be 1 -- #size-cells : Must be 0 - - - -Optional properties: - -- qcom,adsp : Phandle for the audio DSP node - -By default, the driver uses up to 4 MI2S SD lines, for a total of 8 channels. -The SD lines to use can be configured by adding subnodes for each of the DAIs. - -Required properties for each DAI (represented by a subnode): -- reg : Must be one of the DAI IDs - (usually part of dt-bindings header) -- qcom,playback-sd-lines: List of serial data lines to use for playback - Each SD line should be represented by a number from 0-3. -- qcom,capture-sd-lines : List of serial data lines to use for capture - Each SD line should be represented by a number from 0-3. - -Note that adding a subnode changes the default to "no lines configured", -so both playback and capture lines should be configured when a subnode is added. - -Examples: -1) - -lpass@28100000 { - compatible = "qcom,lpass-cpu"; - clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>; - clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; - interrupts = <0 85 1>; - interrupt-names = "lpass-irq-lpaif"; - pinctrl-names = "default", "idle"; - pinctrl-0 = <&mi2s_default>; - pinctrl-1 = <&mi2s_idle>; - reg = <0x28100000 0x10000>; - reg-names = "lpass-lpaif"; - qcom,adsp = <&adsp>; - - #address-cells = <1>; - #size-cells = <0>; - - /* Optional to set different MI2S SD lines */ - dai@3 { - reg = <MI2S_QUATERNARY>; - qcom,playback-sd-lines = <0 1>; - }; -}; - -2) - -#include <dt-bindings/sound/sc7180-lpass.h> - -lpass_cpu: lpass { - compatible = "qcom,lpass-cpu-sc7180"; - - reg = <0 0x62F00000 0 0x29000>; - - iommus = <&apps_smmu 0x1020 0>; - - power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>; - clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_SYSNOC_MPORT_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_PRI_IBIT_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_SEC_IBIT_CLK>; - clock-names = "pcnoc-sway-clk", "audio-core", - "mclk0", "pcnoc-mport-clk", - "mi2s-bit-clk0", "mi2s-bit-clk1"; - interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "lpass-irq-lpaif"; - - - #sound-dai-cells = <1>; - - #address-cells = <1>; - #size-cells = <0>; - - mi2s-primary@0 { - reg = <MI2S_PRIMARY>; - qcom,playback-sd-lines = <1>; - qcom,capture-sd-lines = <0>; - }; - - mi2s-secondary@1 { - reg = <MI2S_SECONDARY>; - qcom,playback-sd-lines = <0>; - }; -};Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 1
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +1
-0@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-onlyIf all the authors are QCom or Linaro please dual license.
Ok
Quoted 21 lines
Quoted 21 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +21
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,lpass-cpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm LPASS CPU dai driver bindings + +maintainers: + - Srinivas Kandagatla <[email protected]> + - Rohit kumar <[email protected]> + +description: | + Qualcomm SOC Low-Power Audio SubSystem (LPASS) that consist of MI2S interface + for audio data transfer on external codecs. LPASS cpu driver is a module to + configure Low-Power Audio Interface(LPAIF) core registers across different + IP versions. + +properties: + compatible: + oneOf: + - const: qcom,lpass-cpuQuoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 29
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+ description: For IPQ806x + + - const: qcom,apq8016-lpass-cpu + description: For APQ8016 + + - const: qcom,lpass-cpu-sc7180 + description: For SC7180Use enum rather than oneOf+const
Sure
Quoted 38 lines
Quoted 38 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +38
-0+ + reg: + maxItems: 1 + description: LPAIF core registers + + clocks: + minItems: 3 + maxItems: 6 + + clock-names: + minItems: 3 + maxItems: 6 + + interrupts: + maxItems: 1 + description: LPAIF DMA buffer interrupt + + qcom,adsp: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle for the audio DSP node + + iommus: + maxItems: 1 + description: Phandle to apps_smmu node with sid mask + + power-domains: + maxItems: 1 + + '#sound-dai-cells': + const: 1 + +patternProperties: + "(^mi2s-[0-9a-f]$|mi2s)": + type: object + description: Required properties for each DAI + + properties: + reg:Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 74
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+ maxItems: 1 + description: Must be one of the DAI ID + + required: + - reg + +Extra blank line.
Ok
Quoted 10 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 81
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - '#sound-dai-cells'Add:
additionalProperties: false
If I am adding this, I am getting below error:
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.example.dt.yaml:
lpass@62f00000: '#address-cells', '#size-cells' do not match any of the
regexes: '(^mi2s-[0-9a-f]$|mi2s)', 'pinctrl-[0-9]+'
Quoted 7 lines
I think this is coming because we have not mentioned mi2s-primary@0 in required fields.
The field name is variable based on the interface to which peripheral is connected to.
It can be either of primary/secondary/tertiary/quaternary. Can you please suggest how to
avoid this error?
No, the error is because you didn't list '#address-cells' and '#size-cells' as properties.
Rob
Re: [PATCH v4 12/12] dt-bindings: sound: lpass-cpu: Move to yaml format
Quoted 261 lines · Rob Herring
Quoted 253 lines · Rohit Kumar
Thanks Rob for reviewing
Quoted 147 lines · Rob Herring
Quoted 146 lines · Rohit kumar
Update lpass-cpu binding with yaml formats.
Signed-off-by Rohit kumar <[email protected]>--- .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 130 --------------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185 +++++++++++++++++++++ 2 files changed, 185 insertions(+), 130 deletions(-)delete mode 100644
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txtcreate mode 100644Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yamlDocumentation/devicetree/bindings/sound/qcom,lpass-cpu.txt deleted +0
-130@@ -1,130 +0,0 @@ -* Qualcomm Technologies LPASS CPU DAI - -This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). - -Required properties: - -- compatible : "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu" or - "qcom,lpass-cpu-sc7180" -- clocks : Must contain an entry for each entry in clock-names. -- clock-names : A list which must include the following entries: - * "ahbix-clk" - * "mi2s-osr-clk" - * "mi2s-bit-clk" - : required clocks for "qcom,lpass-cpu-apq8016" - * "ahbix-clk" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "mi2s-bit-clk2" - * "mi2s-bit-clk3" - * "pcnoc-mport-clk" - * "pcnoc-sway-clk" - : required clocks for "qcom,lpass-cpu-sc7180" - * "audio-core" - * "mclk0" - * "mi2s-bit-clk0" - * "mi2s-bit-clk1" - * "pcnoc-sway-clk" - * "pcnoc-mport-clk" - -- interrupts : Must contain an entry for each entry in - interrupt-names. -- interrupt-names : A list which must include the following entries: - * "lpass-irq-lpaif" -- pinctrl-N : One property must exist for each entry in - pinctrl-names. See ../pinctrl/pinctrl-bindings.txt - for details of the property values. -- pinctrl-names : Must contain a "default" entry. -- reg : Must contain an address for each entry in reg-names. -- reg-names : A list which must include the following entries: - * "lpass-lpaif" -- #address-cells : Must be 1 -- #size-cells : Must be 0 - - - -Optional properties: - -- qcom,adsp : Phandle for the audio DSP node - -By default, the driver uses up to 4 MI2S SD lines, for a total of 8 channels. -The SD lines to use can be configured by adding subnodes for each of the DAIs. - -Required properties for each DAI (represented by a subnode): -- reg : Must be one of the DAI IDs - (usually part of dt-bindings header) -- qcom,playback-sd-lines: List of serial data lines to use for playback - Each SD line should be represented by a number from 0-3. -- qcom,capture-sd-lines : List of serial data lines to use for capture - Each SD line should be represented by a number from 0-3. - -Note that adding a subnode changes the default to "no lines configured", -so both playback and capture lines should be configured when a subnode is added. - -Examples: -1) - -lpass@28100000 { - compatible = "qcom,lpass-cpu"; - clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>; - clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; - interrupts = <0 85 1>; - interrupt-names = "lpass-irq-lpaif"; - pinctrl-names = "default", "idle"; - pinctrl-0 = <&mi2s_default>; - pinctrl-1 = <&mi2s_idle>; - reg = <0x28100000 0x10000>; - reg-names = "lpass-lpaif"; - qcom,adsp = <&adsp>; - - #address-cells = <1>; - #size-cells = <0>; - - /* Optional to set different MI2S SD lines */ - dai@3 { - reg = <MI2S_QUATERNARY>; - qcom,playback-sd-lines = <0 1>; - }; -}; - -2) - -#include <dt-bindings/sound/sc7180-lpass.h> - -lpass_cpu: lpass { - compatible = "qcom,lpass-cpu-sc7180"; - - reg = <0 0x62F00000 0 0x29000>; - - iommus = <&apps_smmu 0x1020 0>; - - power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>; - clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_SYSNOC_MPORT_CORE_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_PRI_IBIT_CLK>, - <&lpasscorecc LPASS_AUDIO_CORE_LPAIF_SEC_IBIT_CLK>; - clock-names = "pcnoc-sway-clk", "audio-core", - "mclk0", "pcnoc-mport-clk", - "mi2s-bit-clk0", "mi2s-bit-clk1"; - interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "lpass-irq-lpaif"; - - - #sound-dai-cells = <1>; - - #address-cells = <1>; - #size-cells = <0>; - - mi2s-primary@0 { - reg = <MI2S_PRIMARY>; - qcom,playback-sd-lines = <1>; - qcom,capture-sd-lines = <0>; - }; - - mi2s-secondary@1 { - reg = <MI2S_SECONDARY>; - qcom,playback-sd-lines = <0>; - }; -};Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 1
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +1
-0@@ -0,0 +1,185 @@ +# SPDX-License-Identifier: GPL-2.0-onlyIf all the authors are QCom or Linaro please dual license.
Ok
Quoted 21 lines
Quoted 21 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +21
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,lpass-cpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm LPASS CPU dai driver bindings + +maintainers: + - Srinivas Kandagatla <[email protected]> + - Rohit kumar <[email protected]> + +description: | + Qualcomm SOC Low-Power Audio SubSystem (LPASS) that consist of MI2S interface + for audio data transfer on external codecs. LPASS cpu driver is a module to + configure Low-Power Audio Interface(LPAIF) core registers across different + IP versions. + +properties: + compatible: + oneOf: + - const: qcom,lpass-cpuQuoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 29
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+ description: For IPQ806x + + - const: qcom,apq8016-lpass-cpu + description: For APQ8016 + + - const: qcom,lpass-cpu-sc7180 + description: For SC7180Use enum rather than oneOf+const
Sure
Quoted 38 lines
Quoted 38 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +38
-0+ + reg: + maxItems: 1 + description: LPAIF core registers + + clocks: + minItems: 3 + maxItems: 6 + + clock-names: + minItems: 3 + maxItems: 6 + + interrupts: + maxItems: 1 + description: LPAIF DMA buffer interrupt + + qcom,adsp: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle for the audio DSP node + + iommus: + maxItems: 1 + description: Phandle to apps_smmu node with sid mask + + power-domains: + maxItems: 1 + + '#sound-dai-cells': + const: 1 + +patternProperties: + "(^mi2s-[0-9a-f]$|mi2s)": + type: object + description: Required properties for each DAI + + properties: + reg:Quoted 8 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 74
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+ maxItems: 1 + description: Must be one of the DAI ID + + required: + - reg + +Extra blank line.
Ok
Quoted 10 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml line 81
Quoted 7 lines
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml new file +7
-0+required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - '#sound-dai-cells'Add:
additionalProperties: false
If I am adding this, I am getting below error:
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.example.dt.yaml:
lpass@62f00000: '#address-cells', '#size-cells' do not match any of the
regexes: '(^mi2s-[0-9a-f]$|mi2s)', 'pinctrl-[0-9]+'Quoted 7 lines
I think this is coming because we have not mentioned mi2s-primary@0 in required fields.
The field name is variable based on the interface to which peripheral is connected to.
It can be either of primary/secondary/tertiary/quaternary. Can you please suggest how to
avoid this error?
Quoted 2 lines
No, the error is because you didn't list '#address-cells' and '#size-cells' as properties.
Thanks Rob for the input. Posted v5 patches with the change.
Quoted 2 lines
Rob
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.
Quoted 15 lines · Rohit kumar
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.
Changes since v3:
- Fixed yaml documentation comments and makedt_binding_checkissues.
- Moved general fixes out of sc7180 specific patches as suggested by Srinivas.
- Update clock-names to make it same as existing platforms.Ajit Pandey (4):
ASoC: qcom: Add common array to initialize soc based core clocks
ASoC: qcom: lpass-platform: Replacecard->devwithcomponent->dev
include: dt-bindings: sound: Add sc7180-lpass bindings header
ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio
Quoted 9 lines
Rohit kumar (8):
ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function
ASoC: qcom: lpass-platform: fix memory leak
ASoC: qcom: lpass: Useregmap_fieldfor 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: Useplatform_get_resource
ASoC: qcom: lpass-platform: Useplatform_get_irq
dt-bindings: sound: lpass-cpu: Move to yaml format
Tested this on Dragon Board 410c!
--srini
Quoted 19 lines
.../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 -------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185 ++++++++++++++++++ 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, 930 insertions(+), 299 deletions(-)delete mode 100644
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txtcreate mode 100644Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yamlcreate mode 100644include/dt-bindings/sound/sc7180-lpass.hcreate mode 100644sound/soc/qcom/lpass-sc7180.c
Quoted 18 lines · Srinivas Kandagatla
Quoted 15 lines · Rohit kumar
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.
Changes since v3:
- Fixed yaml documentation comments and makedt_binding_checkissues.
- Moved general fixes out of sc7180 specific patches as suggested by Srinivas.
- Update clock-names to make it same as existing platforms.Ajit Pandey (4):
ASoC: qcom: Add common array to initialize soc based core clocks
ASoC: qcom: lpass-platform: Replacecard->devwithcomponent->dev
include: dt-bindings: sound: Add sc7180-lpass bindings header
ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio
Quoted 11 lines
Quoted 9 lines
Rohit kumar (8):
ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function
ASoC: qcom: lpass-platform: fix memory leak
ASoC: qcom: lpass: Useregmap_fieldfor 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: Useplatform_get_resource
ASoC: qcom: lpass-platform: Useplatform_get_irq
dt-bindings: sound: lpass-cpu: Move to yaml format
Thanks Srini for review and testing.
Mark, I am planning to repost patch07 onwards to address comments by Rob as
there are no comments till patch06 and they are just fixes.
Quoted 29 lines
Tested this on Dragon Board 410c!
Tested-by Srinivas Kandagatla <[email protected]>--srini
Quoted 24 lines
.../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 -------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185
++++++++++++++++++
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, 930 insertions(+), 299 deletions(-)delete mode 100644
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txtcreate mode 100644Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yamlcreate mode 100644include/dt-bindings/sound/sc7180-lpass.hcreate mode 100644sound/soc/qcom/lpass-sc7180.c
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.
Quoted 31 lines · Rohit Kumar
Quoted 18 lines · Srinivas Kandagatla
Quoted 15 lines · Rohit kumar
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.
Changes since v3:
- Fixed yaml documentation comments and makedt_binding_checkissues.
- Moved general fixes out of sc7180 specific patches as suggested by Srinivas.
- Update clock-names to make it same as existing platforms.Ajit Pandey (4):
ASoC: qcom: Add common array to initialize soc based core clocks
ASoC: qcom: lpass-platform: Replacecard->devwithcomponent->dev
include: dt-bindings: sound: Add sc7180-lpass bindings header
ASoC: qcom: lpass-sc7180: Add platform driver for lpass audioQuoted 11 lines
Quoted 9 lines
Rohit kumar (8):
ASoC: qcom: lpass-cpu: Move ahbix clk to platform specific function
ASoC: qcom: lpass-platform: fix memory leak
ASoC: qcom: lpass: Useregmap_fieldfor 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: Useplatform_get_resource
ASoC: qcom: lpass-platform: Useplatform_get_irq
dt-bindings: sound: lpass-cpu: Move to yaml format
Quoted 5 lines
Thanks Srini for review and testing.
Mark, I am planning to repost patch07 onwards to address comments by Rob as
there are no comments till patch06 and they are just fixes.
Hello Mark,
Are you planning to review/merge the changes till patch06. If not, I will resend those
patches along with comments addressed on patch07 onwards.
Thanks,
Rohit
Quoted 30 lines
Quoted 30 lines
Tested this on Dragon Board 410c!
Tested-by Srinivas Kandagatla <[email protected]>--srini
Quoted 24 lines
.../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 -------- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 185
++++++++++++++++++
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, 930 insertions(+), 299 deletions(-)delete mode 100644
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txtcreate mode 100644Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yamlcreate mode 100644include/dt-bindings/sound/sc7180-lpass.hcreate mode 100644sound/soc/qcom/lpass-sc7180.c
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.