diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:32 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:32 -0500 |
commit | 8e24a6e696ebdc44513357ac00b6ee18f54e69f5 (patch) | |
tree | 82cc7ac9259a9f20159f9265aca52533b1cb3ca8 /drivers/base/regmap | |
parent | db760fbecd3d609098ef4121d7988ff2a5db15d1 (diff) | |
parent | 76aad392f75e6ce5be3f106554e16f7ff96543e5 (diff) |
Merge remote-tracking branch 'regmap/topic/table' into regmap-next
Diffstat (limited to 'drivers/base/regmap')
-rw-r--r-- | drivers/base/regmap/internal.h | 4 | ||||
-rw-r--r-- | drivers/base/regmap/regmap.c | 46 |
2 files changed, 50 insertions, 0 deletions
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h index 0fadeba64ce0..401d1919635a 100644 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h | |||
@@ -69,6 +69,10 @@ struct regmap { | |||
69 | bool (*readable_reg)(struct device *dev, unsigned int reg); | 69 | bool (*readable_reg)(struct device *dev, unsigned int reg); |
70 | bool (*volatile_reg)(struct device *dev, unsigned int reg); | 70 | bool (*volatile_reg)(struct device *dev, unsigned int reg); |
71 | bool (*precious_reg)(struct device *dev, unsigned int reg); | 71 | bool (*precious_reg)(struct device *dev, unsigned int reg); |
72 | const struct regmap_access_table *wr_table; | ||
73 | const struct regmap_access_table *rd_table; | ||
74 | const struct regmap_access_table *volatile_table; | ||
75 | const struct regmap_access_table *precious_table; | ||
72 | 76 | ||
73 | u8 read_flag_mask; | 77 | u8 read_flag_mask; |
74 | u8 write_flag_mask; | 78 | u8 write_flag_mask; |
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 64eb8350a074..96f7e8523ee8 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
@@ -34,6 +34,36 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, | |||
34 | unsigned int mask, unsigned int val, | 34 | unsigned int mask, unsigned int val, |
35 | bool *change); | 35 | bool *change); |
36 | 36 | ||
37 | bool regmap_reg_in_ranges(unsigned int reg, | ||
38 | const struct regmap_range *ranges, | ||
39 | unsigned int nranges) | ||
40 | { | ||
41 | const struct regmap_range *r; | ||
42 | int i; | ||
43 | |||
44 | for (i = 0, r = ranges; i < nranges; i++, r++) | ||
45 | if (regmap_reg_in_range(reg, r)) | ||
46 | return true; | ||
47 | return false; | ||
48 | } | ||
49 | EXPORT_SYMBOL_GPL(regmap_reg_in_ranges); | ||
50 | |||
51 | static bool _regmap_check_range_table(struct regmap *map, | ||
52 | unsigned int reg, | ||
53 | const struct regmap_access_table *table) | ||
54 | { | ||
55 | /* Check "no ranges" first */ | ||
56 | if (regmap_reg_in_ranges(reg, table->no_ranges, table->n_no_ranges)) | ||
57 | return false; | ||
58 | |||
59 | /* In case zero "yes ranges" are supplied, any reg is OK */ | ||
60 | if (!table->n_yes_ranges) | ||
61 | return true; | ||
62 | |||
63 | return regmap_reg_in_ranges(reg, table->yes_ranges, | ||
64 | table->n_yes_ranges); | ||
65 | } | ||
66 | |||
37 | bool regmap_writeable(struct regmap *map, unsigned int reg) | 67 | bool regmap_writeable(struct regmap *map, unsigned int reg) |
38 | { | 68 | { |
39 | if (map->max_register && reg > map->max_register) | 69 | if (map->max_register && reg > map->max_register) |
@@ -42,6 +72,9 @@ bool regmap_writeable(struct regmap *map, unsigned int reg) | |||
42 | if (map->writeable_reg) | 72 | if (map->writeable_reg) |
43 | return map->writeable_reg(map->dev, reg); | 73 | return map->writeable_reg(map->dev, reg); |
44 | 74 | ||
75 | if (map->wr_table) | ||
76 | return _regmap_check_range_table(map, reg, map->wr_table); | ||
77 | |||
45 | return true; | 78 | return true; |
46 | } | 79 | } |
47 | 80 | ||
@@ -56,6 +89,9 @@ bool regmap_readable(struct regmap *map, unsigned int reg) | |||
56 | if (map->readable_reg) | 89 | if (map->readable_reg) |
57 | return map->readable_reg(map->dev, reg); | 90 | return map->readable_reg(map->dev, reg); |
58 | 91 | ||
92 | if (map->rd_table) | ||
93 | return _regmap_check_range_table(map, reg, map->rd_table); | ||
94 | |||
59 | return true; | 95 | return true; |
60 | } | 96 | } |
61 | 97 | ||
@@ -67,6 +103,9 @@ bool regmap_volatile(struct regmap *map, unsigned int reg) | |||
67 | if (map->volatile_reg) | 103 | if (map->volatile_reg) |
68 | return map->volatile_reg(map->dev, reg); | 104 | return map->volatile_reg(map->dev, reg); |
69 | 105 | ||
106 | if (map->volatile_table) | ||
107 | return _regmap_check_range_table(map, reg, map->volatile_table); | ||
108 | |||
70 | return true; | 109 | return true; |
71 | } | 110 | } |
72 | 111 | ||
@@ -78,6 +117,9 @@ bool regmap_precious(struct regmap *map, unsigned int reg) | |||
78 | if (map->precious_reg) | 117 | if (map->precious_reg) |
79 | return map->precious_reg(map->dev, reg); | 118 | return map->precious_reg(map->dev, reg); |
80 | 119 | ||
120 | if (map->precious_table) | ||
121 | return _regmap_check_range_table(map, reg, map->precious_table); | ||
122 | |||
81 | return false; | 123 | return false; |
82 | } | 124 | } |
83 | 125 | ||
@@ -370,6 +412,10 @@ struct regmap *regmap_init(struct device *dev, | |||
370 | map->bus = bus; | 412 | map->bus = bus; |
371 | map->bus_context = bus_context; | 413 | map->bus_context = bus_context; |
372 | map->max_register = config->max_register; | 414 | map->max_register = config->max_register; |
415 | map->wr_table = config->wr_table; | ||
416 | map->rd_table = config->rd_table; | ||
417 | map->volatile_table = config->volatile_table; | ||
418 | map->precious_table = config->precious_table; | ||
373 | map->writeable_reg = config->writeable_reg; | 419 | map->writeable_reg = config->writeable_reg; |
374 | map->readable_reg = config->readable_reg; | 420 | map->readable_reg = config->readable_reg; |
375 | map->volatile_reg = config->volatile_reg; | 421 | map->volatile_reg = config->volatile_reg; |