diff options
author | Mathias Krause <minipli@googlemail.com> | 2015-06-13 08:25:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-15 06:17:14 -0400 |
commit | b895dc2c47c3e81c9de452d84ad4f4fc6f862de1 (patch) | |
tree | e17fe3b60e4afe232ccc434538271b5150e7c7e2 | |
parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) |
ASoC: rt5640: Constify ACPI device ids and register defaults
Constify the ACPI device ID array and the register map, no need to have
them writable at runtime. Also drop the unneeded RT5640_INIT_REG_LEN
define.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/rt5640.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 178e55d4d481..914681978222 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c | |||
@@ -51,7 +51,7 @@ static const struct regmap_range_cfg rt5640_ranges[] = { | |||
51 | .window_len = 0x1, }, | 51 | .window_len = 0x1, }, |
52 | }; | 52 | }; |
53 | 53 | ||
54 | static struct reg_default init_list[] = { | 54 | static const struct reg_default init_list[] = { |
55 | {RT5640_PR_BASE + 0x3d, 0x3600}, | 55 | {RT5640_PR_BASE + 0x3d, 0x3600}, |
56 | {RT5640_PR_BASE + 0x12, 0x0aa8}, | 56 | {RT5640_PR_BASE + 0x12, 0x0aa8}, |
57 | {RT5640_PR_BASE + 0x14, 0x0aaa}, | 57 | {RT5640_PR_BASE + 0x14, 0x0aaa}, |
@@ -59,7 +59,6 @@ static struct reg_default init_list[] = { | |||
59 | {RT5640_PR_BASE + 0x21, 0xe0e0}, | 59 | {RT5640_PR_BASE + 0x21, 0xe0e0}, |
60 | {RT5640_PR_BASE + 0x23, 0x1804}, | 60 | {RT5640_PR_BASE + 0x23, 0x1804}, |
61 | }; | 61 | }; |
62 | #define RT5640_INIT_REG_LEN ARRAY_SIZE(init_list) | ||
63 | 62 | ||
64 | static const struct reg_default rt5640_reg[] = { | 63 | static const struct reg_default rt5640_reg[] = { |
65 | { 0x00, 0x000e }, | 64 | { 0x00, 0x000e }, |
@@ -2122,7 +2121,7 @@ MODULE_DEVICE_TABLE(of, rt5640_of_match); | |||
2122 | #endif | 2121 | #endif |
2123 | 2122 | ||
2124 | #ifdef CONFIG_ACPI | 2123 | #ifdef CONFIG_ACPI |
2125 | static struct acpi_device_id rt5640_acpi_match[] = { | 2124 | static const struct acpi_device_id rt5640_acpi_match[] = { |
2126 | { "INT33CA", 0 }, | 2125 | { "INT33CA", 0 }, |
2127 | { "10EC5640", 0 }, | 2126 | { "10EC5640", 0 }, |
2128 | { "10EC5642", 0 }, | 2127 | { "10EC5642", 0 }, |