lkml.org 
[lkml]   [2018]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRE: [PATCH v3] ASoC: da7219: read fmw property to get mclk for non-dts systems
Date
On 03 May 2018 08:59, Akshu Agrawal wrote:

> Non-dts based systems can use ACPI DSDT to pass on the mclk
> to da7219.
> This enables da7219 mclk to be linked to system clock.
> Enable/Disable of the mclk is already handled in the codec so
> platform drivers don't have to explicitly do handling of mclk.
>
> Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
> ---
> v2: Fixed kbuild error
> v3: Add corresponding clk_put for clk_get
> include/sound/da7219.h | 2 ++
> sound/soc/codecs/da7219.c | 10 +++++++++-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/include/sound/da7219.h b/include/sound/da7219.h
> index 1bfcb16..df7ddf4 100644
> --- a/include/sound/da7219.h
> +++ b/include/sound/da7219.h
> @@ -38,6 +38,8 @@ struct da7219_pdata {
>
> const char *dai_clks_name;
>
> + const char *mclk_name;
> +
> /* Mic */
> enum da7219_micbias_voltage micbias_lvl;
> enum da7219_mic_amp_in_sel mic_amp_in_sel;
> diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
> index 980a6a8..ecd46fc 100644
> --- a/sound/soc/codecs/da7219.c
> +++ b/sound/soc/codecs/da7219.c
> @@ -1624,6 +1624,8 @@ static struct da7219_pdata *da7219_fw_to_pdata(struct
> snd_soc_component *compone
> dev_warn(dev, "Using default clk name: %s\n",
> pdata->dai_clks_name);
>
> + device_property_read_string(dev, "dlg,mclk-name", &pdata->mclk_name);
> +

Personally am still not keen on this. To me the use of a device_property_*
function suggests the same property resides in both DT and ACPI, but here we're
only using this for the ACPI case. DT has no want or need for this. I still feel
we should look at something more generic in the clock framework, although I do
agree with Mark that this should be properly specced.

> if (device_property_read_u32(dev, "dlg,micbias-lvl", &of_val32) >= 0)
> pdata->micbias_lvl = da7219_fw_micbias_lvl(dev, of_val32);
> else
> @@ -1905,7 +1907,10 @@ static int da7219_probe(struct snd_soc_component
> *component)
> da7219_handle_pdata(component);
>
> /* Check if MCLK provided */
> - da7219->mclk = devm_clk_get(component->dev, "mclk");
> + if (da7219->pdata->mclk_name)
> + da7219->mclk = clk_get(NULL, da7219->pdata->mclk_name);
> + if (!da7219->mclk)
> + da7219->mclk = devm_clk_get(component->dev, "mclk");
> if (IS_ERR(da7219->mclk)) {
> if (PTR_ERR(da7219->mclk) != -ENOENT) {
> ret = PTR_ERR(da7219->mclk);
> @@ -1971,6 +1976,9 @@ static void da7219_remove(struct snd_soc_component
> *component)
> clkdev_drop(da7219->dai_clks_lookup);
> #endif
>
> + if (da7219->pdata->mclk_name)
> + clk_put(da7219->mclk);
> +
> /* Supplies */
> regulator_bulk_disable(DA7219_NUM_SUPPLIES, da7219->supplies);
> }
> --
> 1.9.1

\
 
 \ /
  Last update: 2018-05-04 11:16    [W:0.060 / U:6.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site