lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 296/421] ASoC: tegra: Set driver_name=tegra for all machine drivers
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    commit f6eb84fa596abf28959fc7e0b626f925eb1196c7 upstream.

    The driver_name="tegra" is now required by the newer ALSA UCMs, otherwise
    Tegra UCMs don't match by the path/name.

    All Tegra machine drivers are specifying the card's name, but it has no
    effect if model name is specified in the device-tree since it overrides
    the card's name. We need to set the driver_name to "tegra" in order to
    get a usable lookup path for the updated ALSA UCMs. The new UCM lookup
    path has a form of driver_name/card_name.

    The old lookup paths that are based on driver module name continue to
    work as before. Note that UCM matching never worked for Tegra ASoC drivers
    if they were compiled as built-in, this is fixed by supporting the new
    naming scheme.

    Cc: stable@vger.kernel.org
    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Link: https://lore.kernel.org/r/20210529154649.25936-2-digetx@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/tegra/tegra_alc5632.c | 1 +
    sound/soc/tegra/tegra_max98090.c | 1 +
    sound/soc/tegra/tegra_rt5640.c | 1 +
    sound/soc/tegra/tegra_rt5677.c | 1 +
    sound/soc/tegra/tegra_sgtl5000.c | 1 +
    sound/soc/tegra/tegra_wm8753.c | 1 +
    sound/soc/tegra/tegra_wm8903.c | 1 +
    sound/soc/tegra/tegra_wm9712.c | 1 +
    sound/soc/tegra/trimslice.c | 1 +
    9 files changed, 9 insertions(+)

    --- a/sound/soc/tegra/tegra_alc5632.c
    +++ b/sound/soc/tegra/tegra_alc5632.c
    @@ -137,6 +137,7 @@ static struct snd_soc_dai_link tegra_alc

    static struct snd_soc_card snd_soc_tegra_alc5632 = {
    .name = "tegra-alc5632",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_alc5632_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/tegra_max98090.c
    +++ b/sound/soc/tegra/tegra_max98090.c
    @@ -188,6 +188,7 @@ static struct snd_soc_dai_link tegra_max

    static struct snd_soc_card snd_soc_tegra_max98090 = {
    .name = "tegra-max98090",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_max98090_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/tegra_rt5640.c
    +++ b/sound/soc/tegra/tegra_rt5640.c
    @@ -138,6 +138,7 @@ static struct snd_soc_dai_link tegra_rt5

    static struct snd_soc_card snd_soc_tegra_rt5640 = {
    .name = "tegra-rt5640",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_rt5640_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/tegra_rt5677.c
    +++ b/sound/soc/tegra/tegra_rt5677.c
    @@ -181,6 +181,7 @@ static struct snd_soc_dai_link tegra_rt5

    static struct snd_soc_card snd_soc_tegra_rt5677 = {
    .name = "tegra-rt5677",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_rt5677_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/tegra_sgtl5000.c
    +++ b/sound/soc/tegra/tegra_sgtl5000.c
    @@ -103,6 +103,7 @@ static struct snd_soc_dai_link tegra_sgt

    static struct snd_soc_card snd_soc_tegra_sgtl5000 = {
    .name = "tegra-sgtl5000",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_sgtl5000_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/tegra_wm8753.c
    +++ b/sound/soc/tegra/tegra_wm8753.c
    @@ -110,6 +110,7 @@ static struct snd_soc_dai_link tegra_wm8

    static struct snd_soc_card snd_soc_tegra_wm8753 = {
    .name = "tegra-wm8753",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_wm8753_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/tegra_wm8903.c
    +++ b/sound/soc/tegra/tegra_wm8903.c
    @@ -226,6 +226,7 @@ static struct snd_soc_dai_link tegra_wm8

    static struct snd_soc_card snd_soc_tegra_wm8903 = {
    .name = "tegra-wm8903",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_wm8903_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/tegra_wm9712.c
    +++ b/sound/soc/tegra/tegra_wm9712.c
    @@ -59,6 +59,7 @@ static struct snd_soc_dai_link tegra_wm9

    static struct snd_soc_card snd_soc_tegra_wm9712 = {
    .name = "tegra-wm9712",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &tegra_wm9712_dai,
    .num_links = 1,
    --- a/sound/soc/tegra/trimslice.c
    +++ b/sound/soc/tegra/trimslice.c
    @@ -103,6 +103,7 @@ static struct snd_soc_dai_link trimslice

    static struct snd_soc_card snd_soc_trimslice = {
    .name = "tegra-trimslice",
    + .driver_name = "tegra",
    .owner = THIS_MODULE,
    .dai_link = &trimslice_tlv320aic23_dai,
    .num_links = 1,

    \
     
     \ /
      Last update: 2021-07-19 18:41    [W:4.048 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site