|
@@ -28,6 +28,7 @@ struct rsnd_gen {
|
|
|
|
|
|
struct regmap *regmap[RSND_BASE_MAX];
|
|
struct regmap *regmap[RSND_BASE_MAX];
|
|
struct regmap_field *regs[RSND_REG_MAX];
|
|
struct regmap_field *regs[RSND_REG_MAX];
|
|
|
|
+ phys_addr_t res[RSND_REG_MAX];
|
|
};
|
|
};
|
|
|
|
|
|
#define rsnd_priv_to_gen(p) ((struct rsnd_gen *)(p)->gen)
|
|
#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,
|
|
mask, data);
|
|
mask, data);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id)
|
|
|
|
+{
|
|
|
|
+ struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
|
|
|
|
+
|
|
|
|
+ return gen->res[reg_id];
|
|
|
|
+}
|
|
|
|
+
|
|
#define rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf) \
|
|
#define rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf) \
|
|
_rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf, ARRAY_SIZE(conf))
|
|
_rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf, ARRAY_SIZE(conf))
|
|
static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
|
|
static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
|
|
@@ -159,6 +167,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
|
|
|
|
|
|
gen->base[reg_id] = base;
|
|
gen->base[reg_id] = base;
|
|
gen->regmap[reg_id] = regmap;
|
|
gen->regmap[reg_id] = regmap;
|
|
|
|
+ gen->res[reg_id] = res->start;
|
|
|
|
|
|
for (i = 0; i < conf_size; i++) {
|
|
for (i = 0; i < conf_size; i++) {
|
|
|
|
|
|
@@ -216,13 +225,10 @@ rsnd_gen2_dma_addr(struct rsnd_priv *priv,
|
|
struct rsnd_mod *mod,
|
|
struct rsnd_mod *mod,
|
|
int is_play, int is_from)
|
|
int is_play, int is_from)
|
|
{
|
|
{
|
|
- struct platform_device *pdev = rsnd_priv_to_pdev(priv);
|
|
|
|
struct device *dev = rsnd_priv_to_dev(priv);
|
|
struct device *dev = rsnd_priv_to_dev(priv);
|
|
struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
|
|
struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
|
|
- dma_addr_t ssi_reg = platform_get_resource(pdev,
|
|
|
|
- IORESOURCE_MEM, RSND_GEN2_SSI)->start;
|
|
|
|
- dma_addr_t src_reg = platform_get_resource(pdev,
|
|
|
|
- IORESOURCE_MEM, RSND_GEN2_SCU)->start;
|
|
|
|
|
|
+ phys_addr_t ssi_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SSI);
|
|
|
|
+ phys_addr_t src_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SCU);
|
|
int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod);
|
|
int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod);
|
|
int use_src = !!rsnd_io_to_mod_src(io);
|
|
int use_src = !!rsnd_io_to_mod_src(io);
|
|
int use_dvc = !!rsnd_io_to_mod_dvc(io);
|
|
int use_dvc = !!rsnd_io_to_mod_dvc(io);
|