aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-15 18:00:03 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-05-15 18:00:03 -0400
commit98dcf9052e12e5e7bb2197d69778b19b5873d83f (patch)
tree843f34c51198fd6749455bb214482961c4f4a305
parent36be50515fe2aef61533b516fa2576a2c7fe7664 (diff)
ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
The Bells module now has a number assigned to it. Also hook up the WM9081 which is soldered down onto the board. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410-module.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 0ace108c3e3d..7a27f5603c74 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -182,6 +182,11 @@ static const struct i2c_board_info wm1277_devs[] = {
182 }, 182 },
183}; 183};
184 184
185static const struct i2c_board_info wm6230_i2c_devs[] = {
186 { I2C_BOARD_INFO("wm9081", 0x6c),
187 .platform_data = &wm9081_pdata, },
188};
189
185static __devinitdata const struct { 190static __devinitdata const struct {
186 u8 id; 191 u8 id;
187 const char *name; 192 const char *name;
@@ -195,7 +200,9 @@ static __devinitdata const struct {
195 { .id = 0x03, .name = "1252-EV1 Glenlivet" }, 200 { .id = 0x03, .name = "1252-EV1 Glenlivet" },
196 { .id = 0x11, .name = "6249-EV2 Glenfarclas", }, 201 { .id = 0x11, .name = "6249-EV2 Glenfarclas", },
197 { .id = 0x14, .name = "6271-EV1 Lochnagar" }, 202 { .id = 0x14, .name = "6271-EV1 Lochnagar" },
198 { .id = 0x15, .name = "XXXX-EV1 Bells" }, 203 { .id = 0x15, .name = "6320-EV1 Bells",
204 .i2c_devs = wm6230_i2c_devs,
205 .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) },
199 { .id = 0x21, .name = "1275-EV1 Mortlach" }, 206 { .id = 0x21, .name = "1275-EV1 Mortlach" },
200 { .id = 0x25, .name = "1274-EV1 Glencadam" }, 207 { .id = 0x25, .name = "1274-EV1 Glencadam" },
201 { .id = 0x31, .name = "1253-EV1 Tomatin", 208 { .id = 0x31, .name = "1253-EV1 Tomatin",