diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-02 00:29:07 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-02 00:29:07 -0500 |
commit | 8504a3cb5cbc43dbbec457105d9cead3fc20cd85 (patch) | |
tree | 4958b0802c5d5578c1b9f4811c710f2d0f200dbe /arch/arm/mach-s3c64xx | |
parent | dcf3580a554757920c799364369a44bf0e6dc6f8 (diff) |
ARM: S3C64XX: Configure WM1250 EV1 GPIOs on Cragganmore
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.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index bb81a9fc8221..2b91c877de69 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -37,6 +37,8 @@ | |||
37 | #include <linux/mfd/wm831x/irq.h> | 37 | #include <linux/mfd/wm831x/irq.h> |
38 | #include <linux/mfd/wm831x/gpio.h> | 38 | #include <linux/mfd/wm831x/gpio.h> |
39 | 39 | ||
40 | #include <sound/wm1250-ev1.h> | ||
41 | |||
40 | #include <asm/mach/arch.h> | 42 | #include <asm/mach/arch.h> |
41 | #include <asm/mach-types.h> | 43 | #include <asm/mach-types.h> |
42 | 44 | ||
@@ -624,6 +626,16 @@ static struct wm831x_pdata glenfarclas_pmic_pdata __initdata = { | |||
624 | .disable_touch = true, | 626 | .disable_touch = true, |
625 | }; | 627 | }; |
626 | 628 | ||
629 | static struct wm1250_ev1_pdata wm1250_ev1_pdata = { | ||
630 | .gpios = { | ||
631 | [WM1250_EV1_GPIO_CLK_ENA] = S3C64XX_GPN(12), | ||
632 | [WM1250_EV1_GPIO_CLK_SEL0] = S3C64XX_GPL(12), | ||
633 | [WM1250_EV1_GPIO_CLK_SEL1] = S3C64XX_GPL(13), | ||
634 | [WM1250_EV1_GPIO_OSR] = S3C64XX_GPL(14), | ||
635 | [WM1250_EV1_GPIO_MASTER] = S3C64XX_GPL(8), | ||
636 | }, | ||
637 | }; | ||
638 | |||
627 | static struct i2c_board_info i2c_devs1[] __initdata = { | 639 | static struct i2c_board_info i2c_devs1[] __initdata = { |
628 | { I2C_BOARD_INFO("wm8311", 0x34), | 640 | { I2C_BOARD_INFO("wm8311", 0x34), |
629 | .irq = S3C_EINT(0), | 641 | .irq = S3C_EINT(0), |
@@ -633,7 +645,8 @@ static struct i2c_board_info i2c_devs1[] __initdata = { | |||
633 | { I2C_BOARD_INFO("wlf-gf-module", 0x25) }, | 645 | { I2C_BOARD_INFO("wlf-gf-module", 0x25) }, |
634 | { I2C_BOARD_INFO("wlf-gf-module", 0x26) }, | 646 | { I2C_BOARD_INFO("wlf-gf-module", 0x26) }, |
635 | 647 | ||
636 | { I2C_BOARD_INFO("wm1250-ev1", 0x27) }, | 648 | { I2C_BOARD_INFO("wm1250-ev1", 0x27), |
649 | .platform_data = &wm1250_ev1_pdata }, | ||
637 | }; | 650 | }; |
638 | 651 | ||
639 | static struct s3c2410_platform_i2c i2c1_pdata = { | 652 | static struct s3c2410_platform_i2c i2c1_pdata = { |