summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8993.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-16 21:35:01 +0100
committerMark Brown <broonie@kernel.org>2015-07-16 21:35:01 +0100
commit7d9fb377a747025232fe4e8d17e54ff8032aba27 (patch)
tree275856c60130b84301673f3c9a302296227bee55 /sound/soc/codecs/wm8993.c
parent1c07a4de5baad76585f7ffb86b5b0bc34c33e8a6 (diff)
parentc418a84a8c8f98b1a0f30cd68d0cdf40d77aed01 (diff)
downloadop-kernel-dev-7d9fb377a747025232fe4e8d17e54ff8032aba27.zip
op-kernel-dev-7d9fb377a747025232fe4e8d17e54ff8032aba27.tar.gz
Merge branches 'topic/owner' and 'topic/reg-default' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-max9877
Diffstat (limited to 'sound/soc/codecs/wm8993.c')
-rw-r--r--sound/soc/codecs/wm8993.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 3f4dfb9..9638acc 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -41,7 +41,7 @@ static const char *wm8993_supply_names[WM8993_NUM_SUPPLIES] = {
"SPKVDD",
};
-static struct reg_default wm8993_reg_defaults[] = {
+static const struct reg_default wm8993_reg_defaults[] = {
{ 1, 0x0000 }, /* R1 - Power Management (1) */
{ 2, 0x6000 }, /* R2 - Power Management (2) */
{ 3, 0x0000 }, /* R3 - Power Management (3) */
@@ -1595,7 +1595,7 @@ static int wm8993_resume(struct snd_soc_codec *codec)
#endif
/* Tune DC servo configuration */
-static struct reg_default wm8993_regmap_patch[] = {
+static const struct reg_default wm8993_regmap_patch[] = {
{ 0x44, 3 },
{ 0x56, 3 },
{ 0x44, 0 },
OpenPOWER on IntegriCloud