aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-05 01:48:39 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-09-19 03:33:03 -0400
commit3aa7779c748bf340dd122e2d4205f312af977544 (patch)
tree57bd1ae5dde79a86454f86526b05e158e6471ee5 /arch/arm/mach-s3c64xx
parent4ed12b50708875e23ecea191d538e6666b2196eb (diff)
ARM: S3C64XX: Add devices for Kilchoman audio module on Cragganmore
The Kilchoman audio module carries a WM5100 audio CODEC and WM9081 speaker amplifier. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410-module.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 0708fa01db9c..66668565ee75 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -89,6 +89,14 @@ static const struct i2c_board_info wm1254_devs[] = {
89 .platform_data = &wm9081_pdata, }, 89 .platform_data = &wm9081_pdata, },
90}; 90};
91 91
92static const struct i2c_board_info wm1255_devs[] = {
93 { I2C_BOARD_INFO("wm5100", 0x1a),
94 .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,
95 },
96 { I2C_BOARD_INFO("wm9081", 0x6c),
97 .platform_data = &wm9081_pdata, },
98};
99
92static const struct i2c_board_info wm1259_devs[] = { 100static const struct i2c_board_info wm1259_devs[] = {
93 { I2C_BOARD_INFO("wm8962", 0x1a), 101 { I2C_BOARD_INFO("wm8962", 0x1a),
94 .platform_data = &wm8962_pdata, 102 .platform_data = &wm8962_pdata,
@@ -114,7 +122,8 @@ static __devinitdata const struct {
114 .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) }, 122 .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) },
115 { .id = 0x3a, .name = "1259-EV1 Tobermory", 123 { .id = 0x3a, .name = "1259-EV1 Tobermory",
116 .i2c_devs = wm1259_devs, .num_i2c_devs = ARRAY_SIZE(wm1259_devs) }, 124 .i2c_devs = wm1259_devs, .num_i2c_devs = ARRAY_SIZE(wm1259_devs) },
117 { .id = 0x3b, .name = "1255-EV1 Kilchoman" }, 125 { .id = 0x3b, .name = "1255-EV1 Kilchoman",
126 .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) },
118 { .id = 0x3c, .name = "1273-EV1 Longmorn" }, 127 { .id = 0x3c, .name = "1273-EV1 Longmorn" },
119}; 128};
120 129