Skip to content

Commit 246c9f5

Browse files
brooniebroonie
committed
ASoC: Convert Realtek I2C drivers to use maple tree
Merge series from Mark Brown <broonie@kernel.org>: Many of the Realtek I2C/SPI devices only support single register read and write operations so don't benefit from using the rbtree cache instead of the more modern maple tree cache, convert them to maple tree.
2 parents 6f80197 + eefc27e commit 246c9f5

16 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎sound/soc/codecs/rt1011.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,7 @@ static const struct regmap_config rt1011_regmap = {
21842184
.max_register = RT1011_MAX_REG + 1,
21852185
.volatile_reg = rt1011_volatile_register,
21862186
.readable_reg = rt1011_readable_register,
2187-
.cache_type = REGCACHE_RBTREE,
2187+
.cache_type = REGCACHE_MAPLE,
21882188
.reg_defaults = rt1011_reg,
21892189
.num_reg_defaults = ARRAY_SIZE(rt1011_reg),
21902190
.use_single_read = true,

‎sound/soc/codecs/rt1019.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ static const struct regmap_config rt1019_regmap = {
535535
.max_register = RT1019_BEEP_2,
536536
.volatile_reg = rt1019_volatile_register,
537537
.readable_reg = rt1019_readable_register,
538-
.cache_type = REGCACHE_RBTREE,
538+
.cache_type = REGCACHE_MAPLE,
539539
.reg_defaults = rt1019_reg,
540540
.num_reg_defaults = ARRAY_SIZE(rt1019_reg),
541541
};

‎sound/soc/codecs/rt1305.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ static const struct regmap_config rt1305_regmap = {
955955
RT1305_PR_SPACING),
956956
.volatile_reg = rt1305_volatile_register,
957957
.readable_reg = rt1305_readable_register,
958-
.cache_type = REGCACHE_RBTREE,
958+
.cache_type = REGCACHE_MAPLE,
959959
.reg_defaults = rt1305_reg,
960960
.num_reg_defaults = ARRAY_SIZE(rt1305_reg),
961961
.ranges = rt1305_ranges,

‎sound/soc/codecs/rt1308.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ static const struct regmap_config rt1308_regmap = {
773773
.max_register = RT1308_MAX_REG,
774774
.volatile_reg = rt1308_volatile_register,
775775
.readable_reg = rt1308_readable_register,
776-
.cache_type = REGCACHE_RBTREE,
776+
.cache_type = REGCACHE_MAPLE,
777777
.reg_defaults = rt1308_reg,
778778
.num_reg_defaults = ARRAY_SIZE(rt1308_reg),
779779
.use_single_read = true,

‎sound/soc/codecs/rt5514.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ static const struct regmap_config rt5514_regmap = {
11951195
.reg_read = rt5514_i2c_read,
11961196
.reg_write = rt5514_i2c_write,
11971197

1198-
.cache_type = REGCACHE_RBTREE,
1198+
.cache_type = REGCACHE_MAPLE,
11991199
.reg_defaults = rt5514_reg,
12001200
.num_reg_defaults = ARRAY_SIZE(rt5514_reg),
12011201
.use_single_read = true,

‎sound/soc/codecs/rt5616.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ static const struct regmap_config rt5616_regmap = {
13151315
RT5616_PR_SPACING),
13161316
.volatile_reg = rt5616_volatile_register,
13171317
.readable_reg = rt5616_readable_register,
1318-
.cache_type = REGCACHE_RBTREE,
1318+
.cache_type = REGCACHE_MAPLE,
13191319
.reg_defaults = rt5616_reg,
13201320
.num_reg_defaults = ARRAY_SIZE(rt5616_reg),
13211321
.ranges = rt5616_ranges,

‎sound/soc/codecs/rt5631.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1693,7 +1693,7 @@ static const struct regmap_config rt5631_regmap_config = {
16931693
.max_register = RT5631_VENDOR_ID2,
16941694
.reg_defaults = rt5631_reg,
16951695
.num_reg_defaults = ARRAY_SIZE(rt5631_reg),
1696-
.cache_type = REGCACHE_RBTREE,
1696+
.cache_type = REGCACHE_MAPLE,
16971697
.use_single_read = true,
16981698
.use_single_write = true,
16991699
};

‎sound/soc/codecs/rt5640.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2949,7 +2949,7 @@ static const struct regmap_config rt5640_regmap = {
29492949
.volatile_reg = rt5640_volatile_register,
29502950
.readable_reg = rt5640_readable_register,
29512951

2952-
.cache_type = REGCACHE_RBTREE,
2952+
.cache_type = REGCACHE_MAPLE,
29532953
.reg_defaults = rt5640_reg,
29542954
.num_reg_defaults = ARRAY_SIZE(rt5640_reg),
29552955
.ranges = rt5640_ranges,

‎sound/soc/codecs/rt5645.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3546,7 +3546,7 @@ static const struct regmap_config rt5645_regmap = {
35463546
.volatile_reg = rt5645_volatile_register,
35473547
.readable_reg = rt5645_readable_register,
35483548

3549-
.cache_type = REGCACHE_RBTREE,
3549+
.cache_type = REGCACHE_MAPLE,
35503550
.reg_defaults = rt5645_reg,
35513551
.num_reg_defaults = ARRAY_SIZE(rt5645_reg),
35523552
.ranges = rt5645_ranges,
@@ -3563,7 +3563,7 @@ static const struct regmap_config rt5650_regmap = {
35633563
.volatile_reg = rt5645_volatile_register,
35643564
.readable_reg = rt5645_readable_register,
35653565

3566-
.cache_type = REGCACHE_RBTREE,
3566+
.cache_type = REGCACHE_MAPLE,
35673567
.reg_defaults = rt5650_reg,
35683568
.num_reg_defaults = ARRAY_SIZE(rt5650_reg),
35693569
.ranges = rt5645_ranges,

‎sound/soc/codecs/rt5651.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,7 @@ static const struct regmap_config rt5651_regmap = {
21722172
.volatile_reg = rt5651_volatile_register,
21732173
.readable_reg = rt5651_readable_register,
21742174

2175-
.cache_type = REGCACHE_RBTREE,
2175+
.cache_type = REGCACHE_MAPLE,
21762176
.reg_defaults = rt5651_reg,
21772177
.num_reg_defaults = ARRAY_SIZE(rt5651_reg),
21782178
.ranges = rt5651_ranges,

0 commit comments

Comments
 (0)