lkml.org 
[lkml]   [2019]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 13/19] ASoC: tegra: Add fallback implementation for audio mclk
    Date
    mclk is from clk_out_1 which is part of Tegra PMC block and pmc clocks
    are moved to Tegra PMC driver with pmc as clock provider and using pmc
    clock ids.

    New device tree uses clk_out_1 from pmc clock provider.

    So, this patch adds implementation for mclk fallback to extern1 when
    retrieving mclk returns -ENOENT to be backward compatible of new device
    tree with older kernels.

    Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
    ---
    sound/soc/tegra/tegra_asoc_utils.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
    index fc3135c08f43..46ff70c16b74 100644
    --- a/sound/soc/tegra/tegra_asoc_utils.c
    +++ b/sound/soc/tegra/tegra_asoc_utils.c
    @@ -166,7 +166,16 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
    data->clk_cdev1 = devm_clk_get(dev, "mclk");
    if (IS_ERR(data->clk_cdev1)) {
    dev_err(data->dev, "Can't retrieve clk cdev1\n");
    - return PTR_ERR(data->clk_cdev1);
    + if (PTR_ERR(data->clk_cdev1) != -ENOENT)
    + return PTR_ERR(data->clk_cdev1);
    + /* Fall back to extern1 */
    + data->clk_cdev1 = devm_clk_get(dev, "extern1");
    + if (IS_ERR(data->clk_cdev1)) {
    + dev_err(data->dev, "Can't retrieve clk extern1\n");
    + return PTR_ERR(data->clk_cdev1);
    + }
    +
    + dev_err(data->dev, "Falling back to extern1\n");
    }

    /*
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-12-20 23:29    [W:2.953 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site