diff options
author | Ola Lilja <ola.o.lilja@stericsson.com> | 2012-06-07 08:00:46 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-11 23:44:21 -0400 |
commit | f242e50eee1ec7692c4854d94e8cd543991cce71 (patch) | |
tree | 9c14bb93659d7de068f72868fd4714472d103a8e /arch | |
parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) |
mfd/ab8500: Move platform-data for ab8500-codec into mfd-driver
The platform-data used by the Ux500 ASoC-driver is moved from the
machine-driver context into the codec-driver context. This means
adding the platform-data for 'ab8500-codec' into the main AB8500
platform-data.
Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 9c74ac545849..c8a8fde777bb 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/mfd/tc3589x.h> | 25 | #include <linux/mfd/tc3589x.h> |
26 | #include <linux/mfd/tps6105x.h> | 26 | #include <linux/mfd/tps6105x.h> |
27 | #include <linux/mfd/abx500/ab8500-gpio.h> | 27 | #include <linux/mfd/abx500/ab8500-gpio.h> |
28 | #include <linux/mfd/abx500/ab8500-codec.h> | ||
28 | #include <linux/leds-lp5521.h> | 29 | #include <linux/leds-lp5521.h> |
29 | #include <linux/input.h> | 30 | #include <linux/input.h> |
30 | #include <linux/smsc911x.h> | 31 | #include <linux/smsc911x.h> |
@@ -97,6 +98,18 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = { | |||
97 | 0x7A, 0x00, 0x00}, | 98 | 0x7A, 0x00, 0x00}, |
98 | }; | 99 | }; |
99 | 100 | ||
101 | /* ab8500-codec */ | ||
102 | static struct ab8500_codec_platform_data ab8500_codec_pdata = { | ||
103 | .amics = { | ||
104 | .mic1_type = AMIC_TYPE_DIFFERENTIAL, | ||
105 | .mic2_type = AMIC_TYPE_DIFFERENTIAL, | ||
106 | .mic1a_micbias = AMIC_MICBIAS_VAMIC1, | ||
107 | .mic1b_micbias = AMIC_MICBIAS_VAMIC1, | ||
108 | .mic2_micbias = AMIC_MICBIAS_VAMIC2 | ||
109 | }, | ||
110 | .ear_cmv = EAR_CMV_0_95V | ||
111 | }; | ||
112 | |||
100 | static struct gpio_keys_button snowball_key_array[] = { | 113 | static struct gpio_keys_button snowball_key_array[] = { |
101 | { | 114 | { |
102 | .gpio = 32, | 115 | .gpio = 32, |
@@ -195,6 +208,7 @@ static struct ab8500_platform_data ab8500_platdata = { | |||
195 | .regulator = ab8500_regulators, | 208 | .regulator = ab8500_regulators, |
196 | .num_regulator = ARRAY_SIZE(ab8500_regulators), | 209 | .num_regulator = ARRAY_SIZE(ab8500_regulators), |
197 | .gpio = &ab8500_gpio_pdata, | 210 | .gpio = &ab8500_gpio_pdata, |
211 | .codec = &ab8500_codec_pdata, | ||
198 | }; | 212 | }; |
199 | 213 | ||
200 | static struct resource ab8500_resources[] = { | 214 | static struct resource ab8500_resources[] = { |