ASoC: st: Use maple tree register cache

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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.

Mark Brown 2 years ago 58f3c70c 8f59c7ed

+5 -5

5 changed files

expand all

sound

soc

codecs

sta32x.c

sta350.c

sta529.c

stac9766.c

sti-sas.c

+1 -1

sound/soc/codecs/sta32x.c

··· 1022 1022 .max_register = STA32X_FDRC2, 1023 1023 .reg_defaults = sta32x_regs, 1024 1024 .num_reg_defaults = ARRAY_SIZE(sta32x_regs), 1025 - .cache_type = REGCACHE_RBTREE, 1025 + .cache_type = REGCACHE_MAPLE, 1026 1026 .wr_table = &sta32x_write_regs, 1027 1027 .rd_table = &sta32x_read_regs, 1028 1028 .volatile_table = &sta32x_volatile_regs,

+1 -1

sound/soc/codecs/sta350.c

··· 1065 1065 .max_register = STA350_MISC2, 1066 1066 .reg_defaults = sta350_regs, 1067 1067 .num_reg_defaults = ARRAY_SIZE(sta350_regs), 1068 - .cache_type = REGCACHE_RBTREE, 1068 + .cache_type = REGCACHE_MAPLE, 1069 1069 .wr_table = &sta350_write_regs, 1070 1070 .rd_table = &sta350_read_regs, 1071 1071 .volatile_table = &sta350_volatile_regs,

+1 -1

sound/soc/codecs/sta529.c

··· 331 331 .max_register = STA529_MAX_REGISTER, 332 332 .readable_reg = sta529_readable, 333 333 334 - .cache_type = REGCACHE_RBTREE, 334 + .cache_type = REGCACHE_MAPLE, 335 335 .reg_defaults = sta529_reg_defaults, 336 336 .num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults), 337 337 };

+1 -1

sound/soc/codecs/stac9766.c

··· 67 67 .reg_stride = 2, 68 68 .val_bits = 16, 69 69 .max_register = 0x78, 70 - .cache_type = REGCACHE_RBTREE, 70 + .cache_type = REGCACHE_MAPLE, 71 71 72 72 .volatile_reg = regmap_ac97_default_volatile, 73 73

+1 -1

sound/soc/codecs/sti-sas.c

··· 316 316 .reg_defaults = stih407_sas_reg_defaults, 317 317 .num_reg_defaults = ARRAY_SIZE(stih407_sas_reg_defaults), 318 318 .volatile_reg = sti_sas_volatile_register, 319 - .cache_type = REGCACHE_RBTREE, 319 + .cache_type = REGCACHE_MAPLE, 320 320 .reg_read = sti_sas_read_reg, 321 321 .reg_write = sti_sas_write_reg, 322 322 };