lkml.org 
[lkml]   [2016]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 04/17] ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_prefix
    Date
    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    It is assuming that the card related information is located on
    "card" node, but graph case doesn't have it.
    This patch adds node parameter to adjust for graph support

    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    ---
    v2 -> v3

    - no change

    include/sound/soc.h | 6 +++++-
    sound/soc/soc-core.c | 9 ++++++---
    2 files changed, 11 insertions(+), 4 deletions(-)

    diff --git a/include/sound/soc.h b/include/sound/soc.h
    index f276f69..60ac25d 100644
    --- a/include/sound/soc.h
    +++ b/include/sound/soc.h
    @@ -1658,7 +1658,11 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,
    unsigned int *rx_mask,
    unsigned int *slots,
    unsigned int *slot_width);
    -void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
    +#define snd_soc_of_parse_audio_prefix(card, codec_conf, of_node, propname) \
    + snd_soc_of_parse_audio_prefix_from_node(card, NULL, codec_conf, \
    + of_node, propname)
    +void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,
    + struct device_node *np,
    struct snd_soc_codec_conf *codec_conf,
    struct device_node *of_node,
    const char *propname);
    diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
    index 79a1045..8371488 100644
    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -3599,15 +3599,18 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,
    }
    EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);

    -void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
    +void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,
    + struct device_node *np,
    struct snd_soc_codec_conf *codec_conf,
    struct device_node *of_node,
    const char *propname)
    {
    - struct device_node *np = card->dev->of_node;
    const char *str;
    int ret;

    + if (!np)
    + np = card->dev->of_node;
    +
    ret = of_property_read_string(np, propname, &str);
    if (ret < 0) {
    /* no prefix is not error */
    @@ -3617,7 +3620,7 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
    codec_conf->of_node = of_node;
    codec_conf->name_prefix = str;
    }
    -EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix);
    +EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node);

    int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
    struct device_node *np,
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-11-11 02:25    [W:4.723 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site