| Message ID | 1633702144-19017-1-git-send-email-srivasam@codeaurora.org |
|---|---|
| Headers | show |
| Series | Update Lpass digital codec macro drivers | expand |
On 08/10/2021 15:09, Srinivasa Rao Mandadapu wrote: > Update mic control register default values to hardware reset values > lpass sc7280. > > Fixes: c39667ddcfc5 (ASoC: codecs: lpass-tx-macro: add support for lpass tx macro) I dont think this should have fixes tag, as you are adding default values for sc7280. with that fixed, Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > Signed-off-by: Venkata Prasad Potturu <potturu@codeaurora.org> > Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org> > --- > sound/soc/codecs/lpass-tx-macro.c | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c > index d472af1..6742405 100644 > --- a/sound/soc/codecs/lpass-tx-macro.c > +++ b/sound/soc/codecs/lpass-tx-macro.c > @@ -272,7 +272,7 @@ struct tx_macro { > > static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400); > > -static const struct reg_default tx_defaults[] = { > +static struct reg_default tx_defaults[] = { > /* TX Macro */ > { CDC_TX_CLK_RST_CTRL_MCLK_CONTROL, 0x00 }, > { CDC_TX_CLK_RST_CTRL_FS_CNT_CONTROL, 0x00 }, > @@ -1781,9 +1781,10 @@ static const struct snd_soc_component_driver tx_macro_component_drv = { > static int tx_macro_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > struct tx_macro *tx; > void __iomem *base; > - int ret; > + int ret, reg; > > tx = devm_kzalloc(dev, sizeof(*tx), GFP_KERNEL); > if (!tx) > @@ -1805,6 +1806,20 @@ static int tx_macro_probe(struct platform_device *pdev) > if (IS_ERR(base)) > return PTR_ERR(base); > > + /* Update defaults for lpass sc7280 */ > + if (of_device_is_compatible(np, "qcom,sc7280-lpass-tx-macro")) { > + for (reg = 0; reg < ARRAY_SIZE(tx_defaults); reg++) { > + switch (tx_defaults[reg].reg) { > + case CDC_TX_TOP_CSR_SWR_AMIC0_CTL: > + case CDC_TX_TOP_CSR_SWR_AMIC1_CTL: > + tx_defaults[reg].def = 0x0E; > + break; > + default: > + break; > + } > + } > + } > + > tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config); > > dev_set_drvdata(dev, tx); >
On 08/10/2021 15:09, Srinivasa Rao Mandadapu wrote: > Add compatible names for sc7280 based targets in digital codec drivers > va,wsa,rx and tx. > > Signed-off-by: Venkata Prasad Potturu <potturu@codeaurora.org> > Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org> > --- Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > sound/soc/codecs/lpass-rx-macro.c | 1 + > sound/soc/codecs/lpass-tx-macro.c | 1 + > sound/soc/codecs/lpass-va-macro.c | 1 + > sound/soc/codecs/lpass-wsa-macro.c | 1 + > 4 files changed, 4 insertions(+) > > diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c > index 196b068..c2b9333 100644 > --- a/sound/soc/codecs/lpass-rx-macro.c > +++ b/sound/soc/codecs/lpass-rx-macro.c > @@ -3577,6 +3577,7 @@ static int rx_macro_remove(struct platform_device *pdev) > } > > static const struct of_device_id rx_macro_dt_match[] = { > + { .compatible = "qcom,sc7280-lpass-rx-macro" }, > { .compatible = "qcom,sm8250-lpass-rx-macro" }, > { } > }; > diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c > index 27a0d5d..5dcae73 100644 > --- a/sound/soc/codecs/lpass-tx-macro.c > +++ b/sound/soc/codecs/lpass-tx-macro.c > @@ -1843,6 +1843,7 @@ static int tx_macro_remove(struct platform_device *pdev) > } > > static const struct of_device_id tx_macro_dt_match[] = { > + { .compatible = "qcom,sc7280-lpass-tx-macro" }, > { .compatible = "qcom,sm8250-lpass-tx-macro" }, > { } > }; > diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c > index 56c93f4..70f09b4 100644 > --- a/sound/soc/codecs/lpass-va-macro.c > +++ b/sound/soc/codecs/lpass-va-macro.c > @@ -1472,6 +1472,7 @@ static int va_macro_remove(struct platform_device *pdev) > } > > static const struct of_device_id va_macro_dt_match[] = { > + { .compatible = "qcom,sc7280-lpass-va-macro" }, > { .compatible = "qcom,sm8250-lpass-va-macro" }, > {} > }; > diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c > index d3ac318..75baf8e 100644 > --- a/sound/soc/codecs/lpass-wsa-macro.c > +++ b/sound/soc/codecs/lpass-wsa-macro.c > @@ -2445,6 +2445,7 @@ static int wsa_macro_remove(struct platform_device *pdev) > } > > static const struct of_device_id wsa_macro_dt_match[] = { > + {.compatible = "qcom,sc7280-lpass-wsa-macro"}, > {.compatible = "qcom,sm8250-lpass-wsa-macro"}, > {} > }; >
This patch set is to add support for lpass sc7280 based targets. Upadate compatible name and change of bulk clock voting to optional clock voting in digital codecs va, rx, tx macro drivers. Changes Since V2: -- Add Tx macro deafults for lpass sc7280 Changes Since V1: -- Removed individual clock voting and used bulk clock optional. -- Removed volatile changes and fixed default values. -- Typo errors. Srinivasa Rao Mandadapu (5): ASoC: qcom: Add compatible names in va,wsa,rx,tx codec drivers for sc7280 ASoC: qcom: dt-bindings: Add compatible names for lpass sc7280 digital codecs ASoC: codecs: tx-macro: Enable tx top soundwire mic clock ASoC: codecs: tx-macro: Update tx default values ASoC: codecs: Change bulk clock voting to optional voting in digital codecs .../bindings/sound/qcom,lpass-rx-macro.yaml | 4 +++- .../bindings/sound/qcom,lpass-tx-macro.yaml | 4 +++- .../bindings/sound/qcom,lpass-va-macro.yaml | 4 +++- .../bindings/sound/qcom,lpass-wsa-macro.yaml | 4 +++- sound/soc/codecs/lpass-rx-macro.c | 3 ++- sound/soc/codecs/lpass-tx-macro.c | 25 +++++++++++++++++++--- sound/soc/codecs/lpass-va-macro.c | 3 ++- sound/soc/codecs/lpass-wsa-macro.c | 1 + 8 files changed, 39 insertions(+), 9 deletions(-)