diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-30 16:06:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-30 16:06:56 -0700 |
| commit | 63bda79dc484c015f9902f2c8ae019952b93f876 (patch) | |
| tree | 8ac8535163e54fb7d44c29072c8242608832b0c3 /arch | |
| parent | 929d138a3ba776145d2f421c2c4f16d922535090 (diff) | |
| parent | be76871ed3ec0f4571704f07d0bd73c74cf00ddc (diff) | |
| download | linux-stable-63bda79dc484c015f9902f2c8ae019952b93f876.tar.gz linux-stable-63bda79dc484c015f9902f2c8ae019952b93f876.tar.bz2 linux-stable-63bda79dc484c015f9902f2c8ae019952b93f876.zip | |
Merge branch 'late/board' into devel-late
* late/board:
ARM: S3C64XX: Hook up carrier class modules on Cragganmore
ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 1 |
2 files changed, 9 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[] = { }, }; +static const struct i2c_board_info wm6230_i2c_devs[] = { + { I2C_BOARD_INFO("wm9081", 0x6c), + .platform_data = &wm9081_pdata, }, +}; + static __devinitdata const struct { u8 id; const char *name; @@ -195,7 +200,9 @@ static __devinitdata const struct { { .id = 0x03, .name = "1252-EV1 Glenlivet" }, { .id = 0x11, .name = "6249-EV2 Glenfarclas", }, { .id = 0x14, .name = "6271-EV1 Lochnagar" }, - { .id = 0x15, .name = "XXXX-EV1 Bells" }, + { .id = 0x15, .name = "6320-EV1 Bells", + .i2c_devs = wm6230_i2c_devs, + .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) }, { .id = 0x21, .name = "1275-EV1 Mortlach" }, { .id = 0x25, .name = "1274-EV1 Glencadam" }, { .id = 0x31, .name = "1253-EV1 Tomatin", diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index eda5e027b109..6b20a71d7dbf 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -671,6 +671,7 @@ static struct i2c_board_info i2c_devs1[] __initdata = { .irq = S3C_EINT(0), .platform_data = &glenfarclas_pmic_pdata }, + { I2C_BOARD_INFO("wlf-gf-module", 0x22) }, { I2C_BOARD_INFO("wlf-gf-module", 0x24) }, { I2C_BOARD_INFO("wlf-gf-module", 0x25) }, { I2C_BOARD_INFO("wlf-gf-module", 0x26) }, |