Unverified Commit b174f9ca authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: cirrus: Use the maple tree register cache 

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

The maple tree register register cache is now able to generate multi
register writes which was the last big feature of the rbtree cache that
it didn't support so let's update drivers to use the cache with the more
modern data structure.
parents df4167d6 8bfb4c81

sound/soc/codecs/cs35l36.c

+1 −1
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ static struct regmap_config cs35l36_regmap = { 
	.precious_reg = cs35l36_precious_reg,

	.volatile_reg = cs35l36_volatile_reg,

	.readable_reg = cs35l36_readable_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};



static irqreturn_t cs35l36_irq(int irq, void *data)

sound/soc/codecs/cs35l41-lib.c

+2 −2
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ struct regmap_config cs35l41_regmap_i2c = { 
	.volatile_reg = cs35l41_volatile_reg,

	.readable_reg = cs35l41_readable_reg,

	.precious_reg = cs35l41_precious_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};

EXPORT_SYMBOL_GPL(cs35l41_regmap_i2c);
@@ -760,7 +760,7 @@ struct regmap_config cs35l41_regmap_spi = { 
	.volatile_reg = cs35l41_volatile_reg,

	.readable_reg = cs35l41_readable_reg,

	.precious_reg = cs35l41_precious_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};

EXPORT_SYMBOL_GPL(cs35l41_regmap_spi);

sound/soc/codecs/cs35l45-tables.c

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ const struct regmap_config cs35l45_i2c_regmap = { 
	.num_reg_defaults = ARRAY_SIZE(cs35l45_defaults),

	.volatile_reg = cs35l45_volatile_reg,

	.readable_reg = cs35l45_readable_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};

EXPORT_SYMBOL_NS_GPL(cs35l45_i2c_regmap, SND_SOC_CS35L45);
@@ -271,7 +271,7 @@ const struct regmap_config cs35l45_spi_regmap = { 
	.num_reg_defaults = ARRAY_SIZE(cs35l45_defaults),

	.volatile_reg = cs35l45_volatile_reg,

	.readable_reg = cs35l45_readable_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};

EXPORT_SYMBOL_NS_GPL(cs35l45_spi_regmap, SND_SOC_CS35L45);

sound/soc/codecs/cs35l56-shared.c

+3 −3
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ struct regmap_config cs35l56_regmap_i2c = { 
	.volatile_reg = cs35l56_volatile_reg,

	.readable_reg = cs35l56_readable_reg,

	.precious_reg = cs35l56_precious_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};

EXPORT_SYMBOL_NS_GPL(cs35l56_regmap_i2c, SND_SOC_CS35L56_SHARED);
@@ -330,7 +330,7 @@ struct regmap_config cs35l56_regmap_spi = { 
	.volatile_reg = cs35l56_volatile_reg,

	.readable_reg = cs35l56_readable_reg,

	.precious_reg = cs35l56_precious_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};

EXPORT_SYMBOL_NS_GPL(cs35l56_regmap_spi, SND_SOC_CS35L56_SHARED);
@@ -346,7 +346,7 @@ struct regmap_config cs35l56_regmap_sdw = { 
	.volatile_reg = cs35l56_volatile_reg,

	.readable_reg = cs35l56_readable_reg,

	.precious_reg = cs35l56_precious_reg,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};

EXPORT_SYMBOL_NS_GPL(cs35l56_regmap_sdw, SND_SOC_CS35L56_SHARED);

sound/soc/codecs/cs4265.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static const struct regmap_config cs4265_regmap = { 
	.num_reg_defaults = ARRAY_SIZE(cs4265_reg_defaults),

	.readable_reg = cs4265_readable_register,

	.volatile_reg = cs4265_volatile_register,

	.cache_type = REGCACHE_RBTREE,

	.cache_type = REGCACHE_MAPLE,

};



static int cs4265_i2c_probe(struct i2c_client *i2c_client)