mfd: wolfson: Convert to use maple tree register cache

The maple tree register cache is based on a much more modern data structure
than the rbtree cache and makes optimisation choices which are probably
more appropriate for modern systems than those made by the rbtree cache.

Signed-off-by: Bo Liu <liubo03@inspur.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20240206071314.8721-11-liubo03@inspur.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index f77ecc635b6f10b20e6db7a02bcb364c0047e34c..6a8602c1c4ee741478fee9b73941a48ce3249fca 100644 (file)
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -1922,7 +1922,7 @@ const struct regmap_config wm5102_spi_regmap = {
        .readable_reg = wm5102_readable_register,
        .volatile_reg = wm5102_volatile_register,
 
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
        .reg_defaults = wm5102_reg_default,
        .num_reg_defaults = ARRAY_SIZE(wm5102_reg_default),
 };

diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index eba324875afdb55dccce538fbb591c8aec90e137..6ff33a54a068a60ae0b7210261f880470a5e1e04 100644 (file)
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -3202,7 +3202,7 @@ const struct regmap_config wm5110_spi_regmap = {
        .readable_reg = wm5110_readable_register,
        .volatile_reg = wm5110_volatile_register,
 
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
        .reg_defaults = wm5110_reg_default,
        .num_reg_defaults = ARRAY_SIZE(wm5110_reg_default),
 };

diff --git a/drivers/mfd/wm8350-regmap.c b/drivers/mfd/wm8350-regmap.c
index 5663b8b0b3ad5b77acbf29d7736a19c61967c2f8..3d0ebb004dbf1cafc8a510f01d1c927f7044eb0a 100644 (file)
--- a/drivers/mfd/wm8350-regmap.c
+++ b/drivers/mfd/wm8350-regmap.c
@@ -325,7 +325,7 @@ const struct regmap_config wm8350_regmap = {
        .reg_bits = 8,
        .val_bits = 16,
 
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 
        .max_register = WM8350_MAX_REGISTER,
        .readable_reg = wm8350_readable,

diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 75483c9be0c4da1be5d467c8ebdd7c2601bbd681..ddfb234849dd11720c063dde57e35bb55f5b7fe5 100644 (file)
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -100,7 +100,7 @@ static const struct regmap_config wm8400_regmap_config = {
 
        .volatile_reg = wm8400_volatile,
 
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 };
 
 /**

diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c
index 663acbb1854c93cf8921561767f3ece1cea2f3cb..1566a9b04b6a09e1f7617f361c60c6405299cbc3 100644 (file)
--- a/drivers/mfd/wm97xx-core.c
+++ b/drivers/mfd/wm97xx-core.c
@@ -95,7 +95,7 @@ static const struct regmap_config wm9705_regmap_config = {
        .reg_stride = 2,
        .val_bits = 16,
        .max_register = 0x7e,
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 
        .reg_defaults = wm9705_reg_defaults,
        .num_reg_defaults = ARRAY_SIZE(wm9705_reg_defaults),
@@ -163,7 +163,7 @@ static const struct regmap_config wm9712_regmap_config = {
        .reg_stride = 2,
        .val_bits = 16,
        .max_register = 0x7e,
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 
        .reg_defaults = wm9712_reg_defaults,
        .num_reg_defaults = ARRAY_SIZE(wm9712_reg_defaults),
@@ -234,7 +234,7 @@ static const struct regmap_config wm9713_regmap_config = {
        .reg_stride = 2,
        .val_bits = 16,
        .max_register = 0x7e,
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 
        .reg_defaults = wm9713_reg_defaults,
        .num_reg_defaults = ARRAY_SIZE(wm9713_reg_defaults),