]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: S3C64XX: Add devices for Kilchoman audio module on Cragganmore
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Sep 2011 05:48:39 +0000 (14:48 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 19 Sep 2011 07:33:03 +0000 (16:33 +0900)
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>
arch/arm/mach-s3c64xx/mach-crag6410-module.c

index 0708fa01db9c00356ed79c6619bdf16325e654fc..66668565ee75e6694c086030504bf5d01fc59bef 100644 (file)
@@ -89,6 +89,14 @@ static const struct i2c_board_info wm1254_devs[] = {
          .platform_data = &wm9081_pdata, },
 };
 
+static const struct i2c_board_info wm1255_devs[] = {
+       { I2C_BOARD_INFO("wm5100", 0x1a),
+         .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,
+       },
+       { I2C_BOARD_INFO("wm9081", 0x6c),
+         .platform_data = &wm9081_pdata, },
+};
+
 static const struct i2c_board_info wm1259_devs[] = {
        { I2C_BOARD_INFO("wm8962", 0x1a),
          .platform_data = &wm8962_pdata,
@@ -114,7 +122,8 @@ static __devinitdata const struct {
          .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) },
        { .id = 0x3a, .name = "1259-EV1 Tobermory",
          .i2c_devs = wm1259_devs, .num_i2c_devs = ARRAY_SIZE(wm1259_devs) },
-       { .id = 0x3b, .name = "1255-EV1 Kilchoman" },
+       { .id = 0x3b, .name = "1255-EV1 Kilchoman",
+         .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) },
        { .id = 0x3c, .name = "1273-EV1 Longmorn" },
 };