diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-02 00:32:32 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-02 00:32:32 -0500 |
commit | c5c32c965dad8456dd2f6e7c1b05183258593e75 (patch) | |
tree | c8463b5d827c2758fc56436860729ee16334a651 /arch/arm/mach-s3c64xx/mach-crag6410-module.c | |
parent | 3d19f1cd25cfcfba685ef9df7d926c7264b0f8c9 (diff) |
ARM: S3C64XX: Hook up Littlemill audio card on Cragganmore
The Littlemill audio card is an adaptor card which can take any 6220-EV1
CODEC daughtercard. Provide standard support for the use of WM8994 class
devices on the Littlemill card, configuring the MFD for WM8958 usage as
this part is a superset of all others and the driver will use runtime
detection to identify the actually fitted part given the configuration for
the superset.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
[kgene.kim@samsung.com: fix up conflict]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-crag6410-module.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index c492f75a6b32..3fa7ebc83a31 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/mfd/wm831x/irq.h> | 15 | #include <linux/mfd/wm831x/irq.h> |
16 | #include <linux/mfd/wm831x/gpio.h> | 16 | #include <linux/mfd/wm831x/gpio.h> |
17 | #include <linux/mfd/wm8994/pdata.h> | ||
17 | 18 | ||
18 | #include <sound/wm5100.h> | 19 | #include <sound/wm5100.h> |
19 | #include <sound/wm8996.h> | 20 | #include <sound/wm8996.h> |
@@ -133,6 +134,24 @@ static const struct i2c_board_info wm1259_devs[] = { | |||
133 | }, | 134 | }, |
134 | }; | 135 | }; |
135 | 136 | ||
137 | static struct wm8994_pdata wm8994_pdata = { | ||
138 | .gpio_base = CODEC_GPIO_BASE, | ||
139 | .gpio_defaults = { | ||
140 | 0x3, /* IRQ out, active high, CMOS */ | ||
141 | }, | ||
142 | .irq_base = CODEC_IRQ_BASE, | ||
143 | .ldo = { | ||
144 | { .supply = "WALLVDD" }, | ||
145 | { .supply = "WALLVDD" }, | ||
146 | }, | ||
147 | }; | ||
148 | |||
149 | static const struct i2c_board_info wm1277_devs[] = { | ||
150 | { I2C_BOARD_INFO("wm8958", 0x1a), /* WM8958 is the superset */ | ||
151 | .platform_data = &wm8994_pdata, | ||
152 | .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2, | ||
153 | }, | ||
154 | }; | ||
136 | 155 | ||
137 | static __devinitdata const struct { | 156 | static __devinitdata const struct { |
138 | u8 id; | 157 | u8 id; |
@@ -154,6 +173,8 @@ static __devinitdata const struct { | |||
154 | { .id = 0x3b, .name = "1255-EV1 Kilchoman", | 173 | { .id = 0x3b, .name = "1255-EV1 Kilchoman", |
155 | .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) }, | 174 | .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) }, |
156 | { .id = 0x3c, .name = "1273-EV1 Longmorn" }, | 175 | { .id = 0x3c, .name = "1273-EV1 Longmorn" }, |
176 | { .id = 0x3d, .name = "1277-EV1 Littlemill", | ||
177 | .i2c_devs = wm1277_devs, .num_i2c_devs = ARRAY_SIZE(wm1277_devs) }, | ||
157 | }; | 178 | }; |
158 | 179 | ||
159 | static __devinit int wlf_gf_module_probe(struct i2c_client *i2c, | 180 | static __devinit int wlf_gf_module_probe(struct i2c_client *i2c, |