diff options
| author | Kuninori Morimoto | 2015-11-10 05:13:12 +0000 |
|---|---|---|
| committer | Mark Brown | 2015-11-18 18:08:16 +0000 |
| commit | 348d592c719da61a7dab289c7ce36e73c7caf063 (patch) | |
| tree | 3219273fd331f9432937b4b9890db61ae7af682b /sound/soc | |
| parent | 9eaa1a6f7e31ead7e2b8eb762455e77376bd87cc (diff) | |
ASoC: rsnd: remove platform boot support from gen.c
No board is using Renesas sound driver via platform boot now.
This means all user is using DT boot. Platform boot support is
no longer needed. But, it strongly depends on platform boot style.
This patch removes platform boot support from gen.c
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 1 | ||||
| -rw-r--r-- | sound/soc/sh/rcar/gen.c | 14 | ||||
| -rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 7 |
3 files changed, 5 insertions, 17 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 039d6cba8414..6043c71d10c9 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1037,6 +1037,7 @@ static int rsnd_probe(struct platform_device *pdev) priv->pdev = pdev; priv->info = info; + priv->flags = of_data->flags; spin_lock_init(&priv->lock); /* diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 1808fc64646c..099a1cd2d245 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -349,18 +349,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev, /* * Gen */ -static void rsnd_of_parse_gen(struct platform_device *pdev, - const struct rsnd_of_data *of_data, - struct rsnd_priv *priv) -{ - struct rcar_snd_info *info = priv->info; - - if (!of_data) - return; - - info->flags = of_data->flags; -} - int rsnd_gen_probe(struct platform_device *pdev, const struct rsnd_of_data *of_data, struct rsnd_priv *priv) @@ -369,8 +357,6 @@ int rsnd_gen_probe(struct platform_device *pdev, struct rsnd_gen *gen; int ret; - rsnd_of_parse_gen(pdev, of_data, priv); - gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL); if (!gen) { dev_err(dev, "GEN allocate failed\n"); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 23507c8d79c2..c1cf16db6405 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -352,9 +352,6 @@ void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, enum rsnd_reg reg); phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id); -#define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1) -#define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2) - /* * R-Car ADG */ @@ -386,6 +383,7 @@ struct rsnd_priv { struct platform_device *pdev; struct rcar_snd_info *info; spinlock_t lock; + u32 flags; /* * below value will be filled on rsnd_gen_probe() @@ -456,6 +454,9 @@ struct rsnd_priv { #define rsnd_priv_to_dev(priv) (&(rsnd_priv_to_pdev(priv)->dev)) #define rsnd_priv_to_info(priv) ((priv)->info) +#define rsnd_is_gen1(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN1) +#define rsnd_is_gen2(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN2) + /* * rsnd_kctrl */ |