diff options
Diffstat (limited to 'arch/arm/mach-s3c6410')
-rw-r--r-- | arch/arm/mach-s3c6410/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c6410/mach-smdk6410.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index 53fc3ff657f7..72d4b11b2077 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig | |||
@@ -77,6 +77,7 @@ config SMDK6410_WM1190_EV1 | |||
77 | depends on MACH_SMDK6410 | 77 | depends on MACH_SMDK6410 |
78 | select REGULATOR | 78 | select REGULATOR |
79 | select REGULATOR_WM8350 | 79 | select REGULATOR_WM8350 |
80 | select S3C24XX_GPIO_EXTRA64 | ||
80 | select MFD_WM8350_I2C | 81 | select MFD_WM8350_I2C |
81 | select MFD_WM8350_CONFIG_MODE_0 | 82 | select MFD_WM8350_CONFIG_MODE_0 |
82 | select MFD_WM8350_CONFIG_MODE_3 | 83 | select MFD_WM8350_CONFIG_MODE_3 |
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index ea51dbe76e3e..9f1a21462620 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c | |||
@@ -320,6 +320,9 @@ static int __init smdk6410_wm8350_init(struct wm8350 *wm8350) | |||
320 | { | 320 | { |
321 | int i; | 321 | int i; |
322 | 322 | ||
323 | /* Configure the IRQ line */ | ||
324 | s3c_gpio_setpull(S3C64XX_GPN(12), S3C_GPIO_PULL_UP); | ||
325 | |||
323 | /* Instantiate the regulators */ | 326 | /* Instantiate the regulators */ |
324 | for (i = 0; i < ARRAY_SIZE(wm1190_regulators); i++) | 327 | for (i = 0; i < ARRAY_SIZE(wm1190_regulators); i++) |
325 | wm8350_register_regulator(wm8350, | 328 | wm8350_register_regulator(wm8350, |