Unverified Commit 58f3c70c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: st: Use maple tree register cache 

Merge series from Mark Brown <broonie@kernel.org>:

The maple tree register cache has now got to the point where is is
roughly feature compatible with the rbtree cache, let's convert the ST
drivers to use the more modern data structure.
parents 8f59c7ed 66b1abc1

sound/soc/codecs/sta32x.c

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ static const struct regmap_config sta32x_regmap = { 
	.max_register =		STA32X_FDRC2,

	.reg_defaults =		sta32x_regs,

	.num_reg_defaults =	ARRAY_SIZE(sta32x_regs),

	.cache_type =		REGCACHE_RBTREE,

	.cache_type =		REGCACHE_MAPLE,

	.wr_table =		&sta32x_write_regs,

	.rd_table =		&sta32x_read_regs,

	.volatile_table =	&sta32x_volatile_regs,

sound/soc/codecs/sta350.c

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static const struct regmap_config sta350_regmap = { 
	.max_register =		STA350_MISC2,

	.reg_defaults =		sta350_regs,

	.num_reg_defaults =	ARRAY_SIZE(sta350_regs),

	.cache_type =		REGCACHE_RBTREE,

	.cache_type =		REGCACHE_MAPLE,

	.wr_table =		&sta350_write_regs,

	.rd_table =		&sta350_read_regs,

	.volatile_table =	&sta350_volatile_regs,

sound/soc/codecs/sta529.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static const struct regmap_config sta529_regmap = { 
	.max_register = STA529_MAX_REGISTER,

	.readable_reg = sta529_readable,



	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

	.reg_defaults = sta529_reg_defaults,

	.num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults),

};

sound/soc/codecs/stac9766.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static const struct regmap_config stac9766_regmap_config = { 
	.reg_stride = 2,

	.val_bits = 16,

	.max_register = 0x78,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,



	.volatile_reg = regmap_ac97_default_volatile,

sound/soc/codecs/sti-sas.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static const struct regmap_config stih407_sas_regmap = { 
	.reg_defaults = stih407_sas_reg_defaults,

	.num_reg_defaults = ARRAY_SIZE(stih407_sas_reg_defaults),

	.volatile_reg = sti_sas_volatile_register,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

	.reg_read = sti_sas_read_reg,

	.reg_write = sti_sas_write_reg,

};