aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-30 16:51:45 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-31 06:15:46 -0500
commit69edea8a50fb88edd0f23eecfb89ef513b68eaee (patch)
tree719bee518cd1947d41c161189ffd9effdc67e627
parent394d2bbae3dbde0972b90415fc4b5628bbfd700f (diff)
ASoC: max9768: Fix up review comments in max9768 driver
The Mute Switch should be called Playback Switch to match the volume and the regmap core has been updated so we don't need to mark all the registers as non-volatile. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de>
-rw-r--r--sound/soc/codecs/max9768.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c
index 634899525848..79e990185914 100644
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@ -115,7 +115,7 @@ static const struct snd_kcontrol_new max9768_volume[] = {
115}; 115};
116 116
117static const struct snd_kcontrol_new max9768_mute[] = { 117static const struct snd_kcontrol_new max9768_mute[] = {
118 SOC_SINGLE_BOOL_EXT("Mute Switch", 0, max9768_get_gpio, max9768_set_gpio), 118 SOC_SINGLE_BOOL_EXT("Playback Switch", 0, max9768_get_gpio, max9768_set_gpio),
119}; 119};
120 120
121static int max9768_probe(struct snd_soc_codec *codec) 121static int max9768_probe(struct snd_soc_codec *codec)
@@ -150,18 +150,12 @@ static struct snd_soc_codec_driver max9768_codec_driver = {
150 .num_controls = ARRAY_SIZE(max9768_volume), 150 .num_controls = ARRAY_SIZE(max9768_volume),
151}; 151};
152 152
153static bool max9768_always_false(struct device *dev, unsigned int reg)
154{
155 return false;
156}
157
158static const struct regmap_config max9768_i2c_regmap_config = { 153static const struct regmap_config max9768_i2c_regmap_config = {
159 .reg_bits = 2, 154 .reg_bits = 2,
160 .val_bits = 6, 155 .val_bits = 6,
161 .max_register = 3, 156 .max_register = 3,
162 .reg_defaults = max9768_default_regs, 157 .reg_defaults = max9768_default_regs,
163 .num_reg_defaults = ARRAY_SIZE(max9768_default_regs), 158 .num_reg_defaults = ARRAY_SIZE(max9768_default_regs),
164 .volatile_reg = max9768_always_false,
165 .cache_type = REGCACHE_RBTREE, 159 .cache_type = REGCACHE_RBTREE,
166}; 160};
167 161