diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-02-20 05:25:27 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-07 10:04:29 -0500 |
commit | c5212b4556b6bd120b0f4e4ae7c4a1cb9f5efe07 (patch) | |
tree | 8dce6a65568a17f09532d72a134c5eda7fcc0230 /sound | |
parent | 7277911c87ba85436600f5b7aab15de112416795 (diff) |
ASoC: rsnd: add rsnd_gen_get_phy_addr() to get physical address
physical address is required from Audio DMAC peri peri.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/rcar/gen.c | 16 | ||||
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index d08bcd3dbfbf..0da04ed3aabe 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c | |||
@@ -28,6 +28,7 @@ struct rsnd_gen { | |||
28 | 28 | ||
29 | struct regmap *regmap[RSND_BASE_MAX]; | 29 | struct regmap *regmap[RSND_BASE_MAX]; |
30 | struct regmap_field *regs[RSND_REG_MAX]; | 30 | struct regmap_field *regs[RSND_REG_MAX]; |
31 | phys_addr_t res[RSND_REG_MAX]; | ||
31 | }; | 32 | }; |
32 | 33 | ||
33 | #define rsnd_priv_to_gen(p) ((struct rsnd_gen *)(p)->gen) | 34 | #define rsnd_priv_to_gen(p) ((struct rsnd_gen *)(p)->gen) |
@@ -118,6 +119,13 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, | |||
118 | mask, data); | 119 | mask, data); |
119 | } | 120 | } |
120 | 121 | ||
122 | phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id) | ||
123 | { | ||
124 | struct rsnd_gen *gen = rsnd_priv_to_gen(priv); | ||
125 | |||
126 | return gen->res[reg_id]; | ||
127 | } | ||
128 | |||
121 | #define rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf) \ | 129 | #define rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf) \ |
122 | _rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf, ARRAY_SIZE(conf)) | 130 | _rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf, ARRAY_SIZE(conf)) |
123 | static int _rsnd_gen_regmap_init(struct rsnd_priv *priv, | 131 | static int _rsnd_gen_regmap_init(struct rsnd_priv *priv, |
@@ -159,6 +167,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv, | |||
159 | 167 | ||
160 | gen->base[reg_id] = base; | 168 | gen->base[reg_id] = base; |
161 | gen->regmap[reg_id] = regmap; | 169 | gen->regmap[reg_id] = regmap; |
170 | gen->res[reg_id] = res->start; | ||
162 | 171 | ||
163 | for (i = 0; i < conf_size; i++) { | 172 | for (i = 0; i < conf_size; i++) { |
164 | 173 | ||
@@ -216,13 +225,10 @@ rsnd_gen2_dma_addr(struct rsnd_priv *priv, | |||
216 | struct rsnd_mod *mod, | 225 | struct rsnd_mod *mod, |
217 | int is_play, int is_from) | 226 | int is_play, int is_from) |
218 | { | 227 | { |
219 | struct platform_device *pdev = rsnd_priv_to_pdev(priv); | ||
220 | struct device *dev = rsnd_priv_to_dev(priv); | 228 | struct device *dev = rsnd_priv_to_dev(priv); |
221 | struct rsnd_dai_stream *io = rsnd_mod_to_io(mod); | 229 | struct rsnd_dai_stream *io = rsnd_mod_to_io(mod); |
222 | dma_addr_t ssi_reg = platform_get_resource(pdev, | 230 | phys_addr_t ssi_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SSI); |
223 | IORESOURCE_MEM, RSND_GEN2_SSI)->start; | 231 | phys_addr_t src_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SCU); |
224 | dma_addr_t src_reg = platform_get_resource(pdev, | ||
225 | IORESOURCE_MEM, RSND_GEN2_SCU)->start; | ||
226 | int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod); | 232 | int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod); |
227 | int use_src = !!rsnd_io_to_mod_src(io); | 233 | int use_src = !!rsnd_io_to_mod_src(io); |
228 | int use_dvc = !!rsnd_io_to_mod_dvc(io); | 234 | int use_dvc = !!rsnd_io_to_mod_dvc(io); |
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index ec77c9f1a57c..8a8a4d5d55ef 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
@@ -331,6 +331,7 @@ void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, | |||
331 | dma_addr_t rsnd_gen_dma_addr(struct rsnd_priv *priv, | 331 | dma_addr_t rsnd_gen_dma_addr(struct rsnd_priv *priv, |
332 | struct rsnd_mod *mod, | 332 | struct rsnd_mod *mod, |
333 | int is_play, int is_from); | 333 | int is_play, int is_from); |
334 | phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id); | ||
334 | 335 | ||
335 | #define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1) | 336 | #define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1) |
336 | #define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2) | 337 | #define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2) |