aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-17 04:41:08 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-10-17 04:41:08 -0400
commitc8968ad80e0b25031d7c481d271a2d70bf6c894c (patch)
tree23efea47ced2ba96b82b8e9c496764f86c2fe9b5 /arch
parent479535edd96d797681d0323a90024da2b1e1a685 (diff)
ARM: S3C64XX: Provide platform data for Tomatin/Balblair on Cragganmore
This is required for operation of the WM0010 on the boards. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410-module.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 89f5e7da8aed..32b82c0b9487 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -20,6 +20,7 @@
20 20
21#include <linux/regulator/machine.h> 21#include <linux/regulator/machine.h>
22 22
23#include <sound/wm0010.h>
23#include <sound/wm5100.h> 24#include <sound/wm5100.h>
24#include <sound/wm8996.h> 25#include <sound/wm8996.h>
25#include <sound/wm8962.h> 26#include <sound/wm8962.h>
@@ -33,14 +34,34 @@ static struct s3c64xx_spi_csinfo wm0010_spi_csinfo = {
33 .line = S3C64XX_GPC(3), 34 .line = S3C64XX_GPC(3),
34}; 35};
35 36
37static struct wm0010_pdata wm0010_pdata = {
38 .gpio_reset = S3C64XX_GPN(6),
39 .reset_active_high = 1, /* Active high for Glenfarclas Rev 2 */
40};
41
36static struct spi_board_info wm1253_devs[] = { 42static struct spi_board_info wm1253_devs[] = {
37 [0] = { 43 [0] = {
38 .modalias = "wm0010", 44 .modalias = "wm0010",
45 .max_speed_hz = 26 * 1000 * 1000,
46 .bus_num = 0,
47 .chip_select = 0,
48 .mode = SPI_MODE_0,
49 .irq = S3C_EINT(5),
50 .controller_data = &wm0010_spi_csinfo,
51 .platform_data = &wm0010_pdata,
52 },
53};
54
55static struct spi_board_info balblair_devs[] = {
56 [0] = {
57 .modalias = "wm0010",
58 .max_speed_hz = 26 * 1000 * 1000,
39 .bus_num = 0, 59 .bus_num = 0,
40 .chip_select = 0, 60 .chip_select = 0,
41 .mode = SPI_MODE_0, 61 .mode = SPI_MODE_0,
42 .irq = S3C_EINT(5), 62 .irq = S3C_EINT(5),
43 .controller_data = &wm0010_spi_csinfo, 63 .controller_data = &wm0010_spi_csinfo,
64 .platform_data = &wm0010_pdata,
44 }, 65 },
45}; 66};
46 67
@@ -244,7 +265,9 @@ static __devinitdata const struct {
244 .spi_devs = wm1253_devs, .num_spi_devs = ARRAY_SIZE(wm1253_devs) }, 265 .spi_devs = wm1253_devs, .num_spi_devs = ARRAY_SIZE(wm1253_devs) },
245 { .id = 0x32, .name = "XXXX-EV1 Caol Illa" }, 266 { .id = 0x32, .name = "XXXX-EV1 Caol Illa" },
246 { .id = 0x33, .name = "XXXX-EV1 Oban" }, 267 { .id = 0x33, .name = "XXXX-EV1 Oban" },
247 { .id = 0x34, .name = "WM0010-6320-CS42 Balblair" }, 268 { .id = 0x34, .name = "WM0010-6320-CS42 Balblair",
269 .spi_devs = balblair_devs,
270 .num_spi_devs = ARRAY_SIZE(balblair_devs) },
248 { .id = 0x39, .name = "1254-EV1 Dallas Dhu", 271 { .id = 0x39, .name = "1254-EV1 Dallas Dhu",
249 .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) }, 272 .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) },
250 { .id = 0x3a, .name = "1259-EV1 Tobermory", 273 { .id = 0x3a, .name = "1259-EV1 Tobermory",