ASoC: rsnd: use regmap instead of original register mapping method

Current Linux kernel is supporting regmap/regmap_field, and, it is good match for Renesas Sound Gen1/Gen2 register mapping. This patch uses regmap instead of original method for register access Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>

ASoC: rsnd: use regmap instead of original register mapping method
Current Linux kernel is supporting regmap/regmap_field, and, it is good match for Renesas Sound Gen1/Gen2 register mapping. This patch uses regmap instead of original method for register access Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Kuninori Morimoto · Mark Brown
1 parent efeb970ee7
Showing 2 changed files with 143 additions and 126 deletions Side-by-side Diff
sound/soc/sh/rcar/core.c
sound/soc/sh/rcar/gen.c
@@ -106,51 +106,6 @@
 	(!(priv->info->func) ? -ENODEV :		\
 	 priv->info->func(param))
  
-
-/*
- *	basic function
- */
-u32 rsnd_read(struct rsnd_priv *priv,
-	      struct rsnd_mod *mod, enum rsnd_reg reg)
-{
-	void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
-
-	BUG_ON(!base);
-
-	return ioread32(base);
-}
-
-void rsnd_write(struct rsnd_priv *priv,
-		struct rsnd_mod *mod,
-		enum rsnd_reg reg, u32 data)
-{
-	void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
-	struct device *dev = rsnd_priv_to_dev(priv);
-
-	BUG_ON(!base);
-
-	dev_dbg(dev, "w %p : %08x\n", base, data);
-
-	iowrite32(data, base);
-}
-
-void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod,
-	       enum rsnd_reg reg, u32 mask, u32 data)
-{
-	void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
-	struct device *dev = rsnd_priv_to_dev(priv);
-	u32 val;
-
-	BUG_ON(!base);
-
-	val = ioread32(base);
-	val &= ~mask;
-	val |= data & mask;
-	iowrite32(val, base);
-
-	dev_dbg(dev, "s %p : %08x\n", base, val);
-}
-
 /*
  *	rsnd_mod functions
  */
@@ -24,22 +24,98 @@
 			 struct rsnd_dai_stream *io);
 };
  
-struct rsnd_gen_reg_map {
-	int index;	/* -1 : not supported */
-	u32 offset_id;	/* offset of ssi0, ssi1, ssi2... */
-	u32 offset_adr;	/* offset of SSICR, SSISR, ... */
-};
-
 struct rsnd_gen {
 	void __iomem *base[RSND_BASE_MAX];
  
-	struct rsnd_gen_reg_map reg_map[RSND_REG_MAX];
 	struct rsnd_gen_ops *ops;
+
+	struct regmap *regmap;
+	struct regmap_field *regs[RSND_REG_MAX];
 };
  
 #define rsnd_priv_to_gen(p)	((struct rsnd_gen *)(p)->gen)
  
+#define RSND_REG_SET(gen, id, reg_id, offset, _id_offset, _id_size)	\
+	[id] = {							\
+		.reg = (unsigned int)gen->base[reg_id] + offset,	\
+		.lsb = 0,						\
+		.msb = 31,						\
+		.id_size = _id_size,					\
+		.id_offset = _id_offset,				\
+	}
+
 /*
+ *		basic function
+ */
+static int rsnd_regmap_write32(void *context, const void *_data, size_t count)
+{
+	struct rsnd_priv *priv = context;
+	struct device *dev = rsnd_priv_to_dev(priv);
+	u32 *data = (u32 *)_data;
+	u32 val = data[1];
+	void __iomem *reg = (void *)data[0];
+
+	iowrite32(val, reg);
+
+	dev_dbg(dev, "w %p : %08x\n", reg, val);
+
+	return 0;
+}
+
+static int rsnd_regmap_read32(void *context,
+			      const void *_data, size_t reg_size,
+			      void *_val, size_t val_size)
+{
+	struct rsnd_priv *priv = context;
+	struct device *dev = rsnd_priv_to_dev(priv);
+	u32 *data = (u32 *)_data;
+	u32 *val = (u32 *)_val;
+	void __iomem *reg = (void *)data[0];
+
+	*val = ioread32(reg);
+
+	dev_dbg(dev, "r %p : %08x\n", reg, *val);
+
+	return 0;
+}
+
+static struct regmap_bus rsnd_regmap_bus = {
+	.write				= rsnd_regmap_write32,
+	.read				= rsnd_regmap_read32,
+	.reg_format_endian_default	= REGMAP_ENDIAN_NATIVE,
+	.val_format_endian_default	= REGMAP_ENDIAN_NATIVE,
+};
+
+u32 rsnd_read(struct rsnd_priv *priv,
+	      struct rsnd_mod *mod, enum rsnd_reg reg)
+{
+	struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+	u32 val;
+
+	regmap_fields_read(gen->regs[reg], rsnd_mod_id(mod), &val);
+
+	return val;
+}
+
+void rsnd_write(struct rsnd_priv *priv,
+		struct rsnd_mod *mod,
+		enum rsnd_reg reg, u32 data)
+{
+	struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+
+	regmap_fields_write(gen->regs[reg], rsnd_mod_id(mod), data);
+}
+
+void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod,
+	       enum rsnd_reg reg, u32 mask, u32 data)
+{
+	struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+
+	regmap_fields_update_bits(gen->regs[reg], rsnd_mod_id(mod),
+				  mask, data);
+}
+
+/*
  *		Gen2
  *		will be filled in the future
  */
  
  
  
  
@@ -103,39 +179,64 @@
 	return ret;
 }
  
-#define RSND_GEN1_REG_MAP(g, s, i, oi, oa)				\
-	do {								\
-		(g)->reg_map[RSND_REG_##i].index  = RSND_GEN1_##s;	\
-		(g)->reg_map[RSND_REG_##i].offset_id = oi;		\
-		(g)->reg_map[RSND_REG_##i].offset_adr = oa;		\
-	} while (0)
+/* single address mapping */
+#define RSND_GEN1_S_REG(gen, reg, id, offset)	\
+	RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, 0, 9)
  
-static void rsnd_gen1_reg_map_init(struct rsnd_gen *gen)
+/* multi address mapping */
+#define RSND_GEN1_M_REG(gen, reg, id, offset, _id_offset)	\
+	RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, _id_offset, 9)
+
+static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
 {
-	RSND_GEN1_REG_MAP(gen, SRU,	SRC_ROUTE_SEL,	0x0,	0x00);
-	RSND_GEN1_REG_MAP(gen, SRU,	SRC_TMG_SEL0,	0x0,	0x08);
-	RSND_GEN1_REG_MAP(gen, SRU,	SRC_TMG_SEL1,	0x0,	0x0c);
-	RSND_GEN1_REG_MAP(gen, SRU,	SRC_TMG_SEL2,	0x0,	0x10);
-	RSND_GEN1_REG_MAP(gen, SRU,	SRC_CTRL,	0x0,	0xc0);
-	RSND_GEN1_REG_MAP(gen, SRU,	SSI_MODE0,	0x0,	0xD0);
-	RSND_GEN1_REG_MAP(gen, SRU,	SSI_MODE1,	0x0,	0xD4);
-	RSND_GEN1_REG_MAP(gen, SRU,	BUSIF_MODE,	0x4,	0x20);
-	RSND_GEN1_REG_MAP(gen, SRU,	BUSIF_ADINR,	0x40,	0x214);
+	int i;
+	struct device *dev = rsnd_priv_to_dev(priv);
+	struct regmap_config regc;
+	struct reg_field regf[RSND_REG_MAX] = {
+		RSND_GEN1_S_REG(gen, SRU,	SRC_ROUTE_SEL,	0x00),
+		RSND_GEN1_S_REG(gen, SRU,	SRC_TMG_SEL0,	0x08),
+		RSND_GEN1_S_REG(gen, SRU,	SRC_TMG_SEL1,	0x0c),
+		RSND_GEN1_S_REG(gen, SRU,	SRC_TMG_SEL2,	0x10),
+		RSND_GEN1_S_REG(gen, SRU,	SRC_CTRL,	0xc0),
+		RSND_GEN1_S_REG(gen, SRU,	SSI_MODE0,	0xD0),
+		RSND_GEN1_S_REG(gen, SRU,	SSI_MODE1,	0xD4),
+		RSND_GEN1_M_REG(gen, SRU,	BUSIF_MODE,	0x20,	0x4),
+		RSND_GEN1_M_REG(gen, SRU,	BUSIF_ADINR,	0x214,	0x40),
  
-	RSND_GEN1_REG_MAP(gen, ADG,	BRRA,		0x0,	0x00);
-	RSND_GEN1_REG_MAP(gen, ADG,	BRRB,		0x0,	0x04);
-	RSND_GEN1_REG_MAP(gen, ADG,	SSICKR,		0x0,	0x08);
-	RSND_GEN1_REG_MAP(gen, ADG,	AUDIO_CLK_SEL0,	0x0,	0x0c);
-	RSND_GEN1_REG_MAP(gen, ADG,	AUDIO_CLK_SEL1,	0x0,	0x10);
-	RSND_GEN1_REG_MAP(gen, ADG,	AUDIO_CLK_SEL3,	0x0,	0x18);
-	RSND_GEN1_REG_MAP(gen, ADG,	AUDIO_CLK_SEL4,	0x0,	0x1c);
-	RSND_GEN1_REG_MAP(gen, ADG,	AUDIO_CLK_SEL5,	0x0,	0x20);
+		RSND_GEN1_S_REG(gen, ADG,	BRRA,		0x00),
+		RSND_GEN1_S_REG(gen, ADG,	BRRB,		0x04),
+		RSND_GEN1_S_REG(gen, ADG,	SSICKR,		0x08),
+		RSND_GEN1_S_REG(gen, ADG,	AUDIO_CLK_SEL0,	0x0c),
+		RSND_GEN1_S_REG(gen, ADG,	AUDIO_CLK_SEL1,	0x10),
+		RSND_GEN1_S_REG(gen, ADG,	AUDIO_CLK_SEL3,	0x18),
+		RSND_GEN1_S_REG(gen, ADG,	AUDIO_CLK_SEL4,	0x1c),
+		RSND_GEN1_S_REG(gen, ADG,	AUDIO_CLK_SEL5,	0x20),
  
-	RSND_GEN1_REG_MAP(gen, SSI,	SSICR,		0x40,	0x00);
-	RSND_GEN1_REG_MAP(gen, SSI,	SSISR,		0x40,	0x04);
-	RSND_GEN1_REG_MAP(gen, SSI,	SSITDR,		0x40,	0x08);
-	RSND_GEN1_REG_MAP(gen, SSI,	SSIRDR,		0x40,	0x0c);
-	RSND_GEN1_REG_MAP(gen, SSI,	SSIWSR,		0x40,	0x20);
+		RSND_GEN1_M_REG(gen, SSI,	SSICR,		0x00,	0x40),
+		RSND_GEN1_M_REG(gen, SSI,	SSISR,		0x04,	0x40),
+		RSND_GEN1_M_REG(gen, SSI,	SSITDR,		0x08,	0x40),
+		RSND_GEN1_M_REG(gen, SSI,	SSIRDR,		0x0c,	0x40),
+		RSND_GEN1_M_REG(gen, SSI,	SSIWSR,		0x20,	0x40),
+	};
+
+	memset(&regc, 0, sizeof(regc));
+	regc.reg_bits = 32;
+	regc.val_bits = 32;
+
+	gen->regmap = devm_regmap_init(dev, &rsnd_regmap_bus, priv, &regc);
+	if (IS_ERR(gen->regmap)) {
+		dev_err(dev, "regmap error %ld\n", PTR_ERR(gen->regmap));
+		return PTR_ERR(gen->regmap);
+	}
+
+	for (i = 0; i < RSND_REG_MAX; i++) {
+		gen->regs[i] = devm_regmap_field_alloc(dev, gen->regmap, regf[i]);
+		if (IS_ERR(gen->regs[i]))
+			return PTR_ERR(gen->regs[i]);
+
+	}
+
+	return 0;
 }
  
 static int rsnd_gen1_probe(struct platform_device *pdev,
@@ -147,6 +248,7 @@
 	struct resource *sru_res;
 	struct resource *adg_res;
 	struct resource *ssi_res;
+	int ret;
  
 	/*
 	 * map address
@@ -163,7 +265,9 @@
 	    IS_ERR(gen->base[RSND_GEN1_SSI]))
 		return -ENODEV;
  
-	rsnd_gen1_reg_map_init(gen);
+	ret = rsnd_gen1_regmap_init(priv, gen);
+	if (ret < 0)
+		return ret;
  
 	dev_dbg(dev, "Gen1 device probed\n");
 	dev_dbg(dev, "SRU : %08x => %p\n",	sru_res->start,
  
@@ -210,46 +314,12 @@
 	return gen->ops->path_exit(priv, rdai, io);
 }
  
-void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
-			       struct rsnd_mod *mod,
-			       enum rsnd_reg reg)
-{
-	struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
-	struct device *dev = rsnd_priv_to_dev(priv);
-	int index;
-	u32 offset_id, offset_adr;
-
-	if (reg >= RSND_REG_MAX) {
-		dev_err(dev, "rsnd_reg reg error\n");
-		return NULL;
-	}
-
-	index		= gen->reg_map[reg].index;
-	offset_id	= gen->reg_map[reg].offset_id;
-	offset_adr	= gen->reg_map[reg].offset_adr;
-
-	if (index < 0) {
-		dev_err(dev, "unsupported reg access %d\n", reg);
-		return NULL;
-	}
-
-	if (offset_id && mod)
-		offset_id *= rsnd_mod_id(mod);
-
-	/*
-	 * index/offset were set on gen1/gen2
-	 */
-
-	return gen->base[index] + offset_id + offset_adr;
-}
-
 int rsnd_gen_probe(struct platform_device *pdev,
 		   struct rcar_snd_info *info,
 		   struct rsnd_priv *priv)
 {
 	struct device *dev = rsnd_priv_to_dev(priv);
 	struct rsnd_gen *gen;
-	int i;
  
 	gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL);
 	if (!gen) {
@@ -266,14 +336,6 @@
 	}
  
 	priv->gen = gen;
-
-	/*
-	 * see
-	 *	rsnd_reg_get()
-	 *	rsnd_gen_probe()
-	 */
-	for (i = 0; i < RSND_REG_MAX; i++)
-		gen->reg_map[i].index = -1;
  
 	return gen->ops->probe(pdev, info, priv);
 }
...	...	@@ -106,51 +106,6 @@
106	106	(!(priv->info->func) ? -ENODEV : \
107	107	priv->info->func(param))
108	108
109		-
110		-/*
111		- * basic function
112		- */
113		-u32 rsnd_read(struct rsnd_priv *priv,
114		- struct rsnd_mod *mod, enum rsnd_reg reg)
115		-{
116		- void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
117		-
118		- BUG_ON(!base);
119		-
120		- return ioread32(base);
121		-}
122		-
123		-void rsnd_write(struct rsnd_priv *priv,
124		- struct rsnd_mod *mod,
125		- enum rsnd_reg reg, u32 data)
126		-{
127		- void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
128		- struct device *dev = rsnd_priv_to_dev(priv);
129		-
130		- BUG_ON(!base);
131		-
132		- dev_dbg(dev, "w %p : %08x\n", base, data);
133		-
134		- iowrite32(data, base);
135		-}
136		-
137		-void rsnd_bset(struct rsnd_priv priv, struct rsnd_mod mod,
138		- enum rsnd_reg reg, u32 mask, u32 data)
139		-{
140		- void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
141		- struct device *dev = rsnd_priv_to_dev(priv);
142		- u32 val;
143		-
144		- BUG_ON(!base);
145		-
146		- val = ioread32(base);
147		- val &= ~mask;
148		- val \|= data & mask;
149		- iowrite32(val, base);
150		-
151		- dev_dbg(dev, "s %p : %08x\n", base, val);
152		-}
153		-
154	109	/*
155	110	* rsnd_mod functions
156	111	*/
...	...	@@ -24,22 +24,98 @@
24	24	struct rsnd_dai_stream *io);
25	25	};
26	26
27		-struct rsnd_gen_reg_map {
28		- int index; /* -1 : not supported */
29		- u32 offset_id; /* offset of ssi0, ssi1, ssi2... */
30		- u32 offset_adr; /* offset of SSICR, SSISR, ... */
31		-};
32		-
33	27	struct rsnd_gen {
34	28	void __iomem *base[RSND_BASE_MAX];
35	29
36		- struct rsnd_gen_reg_map reg_map[RSND_REG_MAX];
37	30	struct rsnd_gen_ops *ops;
	31	+
	32	+ struct regmap *regmap;
	33	+ struct regmap_field *regs[RSND_REG_MAX];
38	34	};
39	35
40	36	#define rsnd_priv_to_gen(p) ((struct rsnd_gen *)(p)->gen)
41	37
	38	+#define RSND_REG_SET(gen, id, reg_id, offset, _id_offset, _id_size) \
	39	+ [id] = { \
	40	+ .reg = (unsigned int)gen->base[reg_id] + offset, \
	41	+ .lsb = 0, \
	42	+ .msb = 31, \
	43	+ .id_size = _id_size, \
	44	+ .id_offset = _id_offset, \
	45	+ }
	46	+
42	47	/*
	48	+ * basic function
	49	+ */
	50	+static int rsnd_regmap_write32(void context, const void _data, size_t count)
	51	+{
	52	+ struct rsnd_priv *priv = context;
	53	+ struct device *dev = rsnd_priv_to_dev(priv);
	54	+ u32 data = (u32 )_data;
	55	+ u32 val = data[1];
	56	+ void __iomem reg = (void )data[0];
	57	+
	58	+ iowrite32(val, reg);
	59	+
	60	+ dev_dbg(dev, "w %p : %08x\n", reg, val);
	61	+
	62	+ return 0;
	63	+}
	64	+
	65	+static int rsnd_regmap_read32(void *context,
	66	+ const void *_data, size_t reg_size,
	67	+ void *_val, size_t val_size)
	68	+{
	69	+ struct rsnd_priv *priv = context;
	70	+ struct device *dev = rsnd_priv_to_dev(priv);
	71	+ u32 data = (u32 )_data;
	72	+ u32 val = (u32 )_val;
	73	+ void __iomem reg = (void )data[0];
	74	+
	75	+ *val = ioread32(reg);
	76	+
	77	+ dev_dbg(dev, "r %p : %08x\n", reg, *val);
	78	+
	79	+ return 0;
	80	+}
	81	+
	82	+static struct regmap_bus rsnd_regmap_bus = {
	83	+ .write = rsnd_regmap_write32,
	84	+ .read = rsnd_regmap_read32,
	85	+ .reg_format_endian_default = REGMAP_ENDIAN_NATIVE,
	86	+ .val_format_endian_default = REGMAP_ENDIAN_NATIVE,
	87	+};
	88	+
	89	+u32 rsnd_read(struct rsnd_priv *priv,
	90	+ struct rsnd_mod *mod, enum rsnd_reg reg)
	91	+{
	92	+ struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
	93	+ u32 val;
	94	+
	95	+ regmap_fields_read(gen->regs[reg], rsnd_mod_id(mod), &val);
	96	+
	97	+ return val;
	98	+}
	99	+
	100	+void rsnd_write(struct rsnd_priv *priv,
	101	+ struct rsnd_mod *mod,
	102	+ enum rsnd_reg reg, u32 data)
	103	+{
	104	+ struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
	105	+
	106	+ regmap_fields_write(gen->regs[reg], rsnd_mod_id(mod), data);
	107	+}
	108	+
	109	+void rsnd_bset(struct rsnd_priv priv, struct rsnd_mod mod,
	110	+ enum rsnd_reg reg, u32 mask, u32 data)
	111	+{
	112	+ struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
	113	+
	114	+ regmap_fields_update_bits(gen->regs[reg], rsnd_mod_id(mod),
	115	+ mask, data);
	116	+}
	117	+
	118	+/*
43	119	* Gen2
44	120	* will be filled in the future
45	121	*/
46	122
47	123
48	124
49	125
...	...	@@ -103,39 +179,64 @@
103	179	return ret;
104	180	}
105	181
106		-#define RSND_GEN1_REG_MAP(g, s, i, oi, oa) \
107		- do { \
108		- (g)->reg_map[RSND_REG_##i].index = RSND_GEN1_##s; \
109		- (g)->reg_map[RSND_REG_##i].offset_id = oi; \
110		- (g)->reg_map[RSND_REG_##i].offset_adr = oa; \
111		- } while (0)
	182	+/* single address mapping */
	183	+#define RSND_GEN1_S_REG(gen, reg, id, offset) \
	184	+ RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, 0, 9)
112	185
113		-static void rsnd_gen1_reg_map_init(struct rsnd_gen *gen)
	186	+/* multi address mapping */
	187	+#define RSND_GEN1_M_REG(gen, reg, id, offset, _id_offset) \
	188	+ RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, _id_offset, 9)
	189	+
	190	+static int rsnd_gen1_regmap_init(struct rsnd_priv priv, struct rsnd_gen gen)
114	191	{
115		- RSND_GEN1_REG_MAP(gen, SRU, SRC_ROUTE_SEL, 0x0, 0x00);
116		- RSND_GEN1_REG_MAP(gen, SRU, SRC_TMG_SEL0, 0x0, 0x08);
117		- RSND_GEN1_REG_MAP(gen, SRU, SRC_TMG_SEL1, 0x0, 0x0c);
118		- RSND_GEN1_REG_MAP(gen, SRU, SRC_TMG_SEL2, 0x0, 0x10);
119		- RSND_GEN1_REG_MAP(gen, SRU, SRC_CTRL, 0x0, 0xc0);
120		- RSND_GEN1_REG_MAP(gen, SRU, SSI_MODE0, 0x0, 0xD0);
121		- RSND_GEN1_REG_MAP(gen, SRU, SSI_MODE1, 0x0, 0xD4);
122		- RSND_GEN1_REG_MAP(gen, SRU, BUSIF_MODE, 0x4, 0x20);
123		- RSND_GEN1_REG_MAP(gen, SRU, BUSIF_ADINR, 0x40, 0x214);
	192	+ int i;
	193	+ struct device *dev = rsnd_priv_to_dev(priv);
	194	+ struct regmap_config regc;
	195	+ struct reg_field regf[RSND_REG_MAX] = {
	196	+ RSND_GEN1_S_REG(gen, SRU, SRC_ROUTE_SEL, 0x00),
	197	+ RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL0, 0x08),
	198	+ RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL1, 0x0c),
	199	+ RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL2, 0x10),
	200	+ RSND_GEN1_S_REG(gen, SRU, SRC_CTRL, 0xc0),
	201	+ RSND_GEN1_S_REG(gen, SRU, SSI_MODE0, 0xD0),
	202	+ RSND_GEN1_S_REG(gen, SRU, SSI_MODE1, 0xD4),
	203	+ RSND_GEN1_M_REG(gen, SRU, BUSIF_MODE, 0x20, 0x4),
	204	+ RSND_GEN1_M_REG(gen, SRU, BUSIF_ADINR, 0x214, 0x40),
124	205
125		- RSND_GEN1_REG_MAP(gen, ADG, BRRA, 0x0, 0x00);
126		- RSND_GEN1_REG_MAP(gen, ADG, BRRB, 0x0, 0x04);
127		- RSND_GEN1_REG_MAP(gen, ADG, SSICKR, 0x0, 0x08);
128		- RSND_GEN1_REG_MAP(gen, ADG, AUDIO_CLK_SEL0, 0x0, 0x0c);
129		- RSND_GEN1_REG_MAP(gen, ADG, AUDIO_CLK_SEL1, 0x0, 0x10);
130		- RSND_GEN1_REG_MAP(gen, ADG, AUDIO_CLK_SEL3, 0x0, 0x18);
131		- RSND_GEN1_REG_MAP(gen, ADG, AUDIO_CLK_SEL4, 0x0, 0x1c);
132		- RSND_GEN1_REG_MAP(gen, ADG, AUDIO_CLK_SEL5, 0x0, 0x20);
	206	+ RSND_GEN1_S_REG(gen, ADG, BRRA, 0x00),
	207	+ RSND_GEN1_S_REG(gen, ADG, BRRB, 0x04),
	208	+ RSND_GEN1_S_REG(gen, ADG, SSICKR, 0x08),
	209	+ RSND_GEN1_S_REG(gen, ADG, AUDIO_CLK_SEL0, 0x0c),
	210	+ RSND_GEN1_S_REG(gen, ADG, AUDIO_CLK_SEL1, 0x10),
	211	+ RSND_GEN1_S_REG(gen, ADG, AUDIO_CLK_SEL3, 0x18),
	212	+ RSND_GEN1_S_REG(gen, ADG, AUDIO_CLK_SEL4, 0x1c),
	213	+ RSND_GEN1_S_REG(gen, ADG, AUDIO_CLK_SEL5, 0x20),
133	214
134		- RSND_GEN1_REG_MAP(gen, SSI, SSICR, 0x40, 0x00);
135		- RSND_GEN1_REG_MAP(gen, SSI, SSISR, 0x40, 0x04);
136		- RSND_GEN1_REG_MAP(gen, SSI, SSITDR, 0x40, 0x08);
137		- RSND_GEN1_REG_MAP(gen, SSI, SSIRDR, 0x40, 0x0c);
138		- RSND_GEN1_REG_MAP(gen, SSI, SSIWSR, 0x40, 0x20);
	215	+ RSND_GEN1_M_REG(gen, SSI, SSICR, 0x00, 0x40),
	216	+ RSND_GEN1_M_REG(gen, SSI, SSISR, 0x04, 0x40),
	217	+ RSND_GEN1_M_REG(gen, SSI, SSITDR, 0x08, 0x40),
	218	+ RSND_GEN1_M_REG(gen, SSI, SSIRDR, 0x0c, 0x40),
	219	+ RSND_GEN1_M_REG(gen, SSI, SSIWSR, 0x20, 0x40),
	220	+ };
	221	+
	222	+ memset(&regc, 0, sizeof(regc));
	223	+ regc.reg_bits = 32;
	224	+ regc.val_bits = 32;
	225	+
	226	+ gen->regmap = devm_regmap_init(dev, &rsnd_regmap_bus, priv, &regc);
	227	+ if (IS_ERR(gen->regmap)) {
	228	+ dev_err(dev, "regmap error %ld\n", PTR_ERR(gen->regmap));
	229	+ return PTR_ERR(gen->regmap);
	230	+ }
	231	+
	232	+ for (i = 0; i < RSND_REG_MAX; i++) {
	233	+ gen->regs[i] = devm_regmap_field_alloc(dev, gen->regmap, regf[i]);
	234	+ if (IS_ERR(gen->regs[i]))
	235	+ return PTR_ERR(gen->regs[i]);
	236	+
	237	+ }
	238	+
	239	+ return 0;
139	240	}
140	241
141	242	static int rsnd_gen1_probe(struct platform_device *pdev,
...	...	@@ -147,6 +248,7 @@
147	248	struct resource *sru_res;
148	249	struct resource *adg_res;
149	250	struct resource *ssi_res;
	251	+ int ret;
150	252
151	253	/*
152	254	* map address
...	...	@@ -163,7 +265,9 @@
163	265	IS_ERR(gen->base[RSND_GEN1_SSI]))
164	266	return -ENODEV;
165	267
166		- rsnd_gen1_reg_map_init(gen);
	268	+ ret = rsnd_gen1_regmap_init(priv, gen);
	269	+ if (ret < 0)
	270	+ return ret;
167	271
168	272	dev_dbg(dev, "Gen1 device probed\n");
169	273	dev_dbg(dev, "SRU : %08x => %p\n", sru_res->start,
170	274
...	...	@@ -210,46 +314,12 @@
210	314	return gen->ops->path_exit(priv, rdai, io);
211	315	}
212	316
213		-void __iomem rsnd_gen_reg_get(struct rsnd_priv priv,
214		- struct rsnd_mod *mod,
215		- enum rsnd_reg reg)
216		-{
217		- struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
218		- struct device *dev = rsnd_priv_to_dev(priv);
219		- int index;
220		- u32 offset_id, offset_adr;
221		-
222		- if (reg >= RSND_REG_MAX) {
223		- dev_err(dev, "rsnd_reg reg error\n");
224		- return NULL;
225		- }
226		-
227		- index = gen->reg_map[reg].index;
228		- offset_id = gen->reg_map[reg].offset_id;
229		- offset_adr = gen->reg_map[reg].offset_adr;
230		-
231		- if (index < 0) {
232		- dev_err(dev, "unsupported reg access %d\n", reg);
233		- return NULL;
234		- }
235		-
236		- if (offset_id && mod)
237		- offset_id *= rsnd_mod_id(mod);
238		-
239		- /*
240		- * index/offset were set on gen1/gen2
241		- */
242		-
243		- return gen->base[index] + offset_id + offset_adr;
244		-}
245		-
246	317	int rsnd_gen_probe(struct platform_device *pdev,
247	318	struct rcar_snd_info *info,
248	319	struct rsnd_priv *priv)
249	320	{
250	321	struct device *dev = rsnd_priv_to_dev(priv);
251	322	struct rsnd_gen *gen;
252		- int i;
253	323
254	324	gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL);
255	325	if (!gen) {
...	...	@@ -266,14 +336,6 @@
266	336	}
267	337
268	338	priv->gen = gen;
269		-
270		- /*
271		- * see
272		- * rsnd_reg_get()
273		- * rsnd_gen_probe()
274		- */
275		- for (i = 0; i < RSND_REG_MAX; i++)
276		- gen->reg_map[i].index = -1;
277	339
278	340	return gen->ops->probe(pdev, info, priv);
279	341	}