| Message ID | 1633702144-19017-5-git-send-email-srivasam@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| 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); >
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);