Skip to content

Commit 54b8d09

Browse files
committed
regulator: convert to use maple tree register
Merge series from Bo Liu <[email protected]>: 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. Bo Liu (13): regulator: da9121: convert to use maple tree register cache regulator: da9211: convert to use maple tree register cache regulator: isl9305: convert to use maple tree register cache regulator: max8973: convert to use maple tree register cache regulator: mt6311: convert to use maple tree register cache regulator: pca9450: convert to use maple tree register cache regulator: pf8x00: convert to use maple tree register cache regulator: pfuze100: convert to use maple tree register cache regulator: rtmv20: convert to use maple tree register cache regulator: rtq6752: convert to use maple tree register cache regulator: tps51632: convert to use maple tree register cache regulator: tps62360: convert to use maple tree register cache regulator: rpi-panel-attiny: convert to use maple tree register cache drivers/regulator/da9121-regulator.c | 4 ++-- drivers/regulator/da9211-regulator.c | 2 +- drivers/regulator/isl9305.c | 2 +- drivers/regulator/max8973-regulator.c | 2 +- drivers/regulator/mt6311-regulator.c | 2 +- drivers/regulator/pca9450-regulator.c | 2 +- drivers/regulator/pf8x00-regulator.c | 2 +- drivers/regulator/pfuze100-regulator.c | 2 +- drivers/regulator/rpi-panel-attiny-regulator.c | 2 +- drivers/regulator/rtmv20-regulator.c | 2 +- drivers/regulator/rtq6752-regulator.c | 2 +- drivers/regulator/tps51632-regulator.c | 2 +- drivers/regulator/tps62360-regulator.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) -- 2.18.2
2 parents cd290ab + ab470ab commit 54b8d09

13 files changed

+14
-14
lines changed

drivers/regulator/da9121-regulator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ static struct regmap_config da9121_1ch_regmap_config = {
872872
.rd_table = &da9121_1ch_readable_table,
873873
.wr_table = &da9121_1ch_writeable_table,
874874
.volatile_table = &da9121_volatile_table,
875-
.cache_type = REGCACHE_RBTREE,
875+
.cache_type = REGCACHE_MAPLE,
876876
};
877877

878878
/* DA9121 regmap config for 2 channel variants */
@@ -883,7 +883,7 @@ static struct regmap_config da9121_2ch_regmap_config = {
883883
.rd_table = &da9121_2ch_readable_table,
884884
.wr_table = &da9121_2ch_writeable_table,
885885
.volatile_table = &da9121_volatile_table,
886-
.cache_type = REGCACHE_RBTREE,
886+
.cache_type = REGCACHE_MAPLE,
887887
};
888888

889889
static int da9121_check_device_type(struct i2c_client *i2c, struct da9121 *chip)

drivers/regulator/da9211-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static const struct regmap_config da9211_regmap_config = {
6868
.val_bits = 8,
6969
.max_register = 5 * 128,
7070
.volatile_reg = da9211_volatile_reg,
71-
.cache_type = REGCACHE_RBTREE,
71+
.cache_type = REGCACHE_MAPLE,
7272
.ranges = da9211_regmap_range,
7373
.num_ranges = ARRAY_SIZE(da9211_regmap_range),
7474
};

drivers/regulator/isl9305.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static const struct regmap_config isl9305_regmap = {
134134
.val_bits = 8,
135135

136136
.max_register = ISL9305_MAX_REG,
137-
.cache_type = REGCACHE_RBTREE,
137+
.cache_type = REGCACHE_MAPLE,
138138
};
139139

140140
static int isl9305_i2c_probe(struct i2c_client *i2c)

drivers/regulator/max8973-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ static const struct regmap_config max8973_regmap_config = {
510510
.reg_bits = 8,
511511
.val_bits = 8,
512512
.max_register = MAX8973_CHIPID2,
513-
.cache_type = REGCACHE_RBTREE,
513+
.cache_type = REGCACHE_MAPLE,
514514
};
515515

516516
static struct max8973_regulator_platform_data *max8973_parse_dt(

drivers/regulator/mt6311-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static const struct regmap_config mt6311_regmap_config = {
2020
.reg_bits = 8,
2121
.val_bits = 8,
2222
.max_register = MT6311_FQMTR_CON4,
23-
.cache_type = REGCACHE_RBTREE,
23+
.cache_type = REGCACHE_MAPLE,
2424
};
2525

2626
/* Default limits measured in millivolts and milliamps */

drivers/regulator/pca9450-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static const struct regmap_config pca9450_regmap_config = {
5353
.val_bits = 8,
5454
.volatile_table = &pca9450_volatile_regs,
5555
.max_register = PCA9450_MAX_REGISTER - 1,
56-
.cache_type = REGCACHE_RBTREE,
56+
.cache_type = REGCACHE_MAPLE,
5757
};
5858

5959
/*

drivers/regulator/pf8x00-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static const struct regmap_config pf8x00_regmap_config = {
142142
.reg_bits = 8,
143143
.val_bits = 8,
144144
.max_register = PF8X00_PAGE_SELECT,
145-
.cache_type = REGCACHE_RBTREE,
145+
.cache_type = REGCACHE_MAPLE,
146146
};
147147

148148
/* VLDOx output: 1.5V to 5.0V */

drivers/regulator/pfuze100-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ static const struct regmap_config pfuze_regmap_config = {
680680
.reg_bits = 8,
681681
.val_bits = 8,
682682
.max_register = PFUZE_NUMREGS - 1,
683-
.cache_type = REGCACHE_RBTREE,
683+
.cache_type = REGCACHE_MAPLE,
684684
};
685685

686686
static int pfuze100_regulator_probe(struct i2c_client *client)

drivers/regulator/rpi-panel-attiny-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static const struct regmap_config attiny_regmap_config = {
7575
.val_bits = 8,
7676
.disable_locking = 1,
7777
.max_register = REG_WRITE_DATA_L,
78-
.cache_type = REGCACHE_RBTREE,
78+
.cache_type = REGCACHE_MAPLE,
7979
};
8080

8181
static int attiny_set_port_state(struct attiny_lcd *state, int reg, u8 val)

drivers/regulator/rtmv20-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ static bool rtmv20_is_volatile_reg(struct device *dev, unsigned int reg)
312312
static const struct regmap_config rtmv20_regmap_config = {
313313
.reg_bits = 8,
314314
.val_bits = 8,
315-
.cache_type = REGCACHE_RBTREE,
315+
.cache_type = REGCACHE_MAPLE,
316316
.max_register = RTMV20_REG_LDMASK,
317317
.num_reg_defaults_raw = RTMV20_MAX_REGS,
318318

0 commit comments

Comments
 (0)