diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-20 08:18:07 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-06-20 13:22:37 +0900 |
| commit | 4f057aa0dcb2660bb09ead75d829a19ec71319f1 (patch) | |
| tree | 40ec23fa1c18ba5d3953f5d9542609879633a61b | |
| parent | 7d1d8ce5b50f4593f6d4b9d8149f978c122f617b (diff) | |
ARM: S3C64XX: Dynamically assign interrupts for CPU PMIC on Cragganmore
Now that the WM831x driver uses irq_domain we can happily allow it to
assign its own IRQs.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/crag6410.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/crag6410.h b/arch/arm/mach-s3c64xx/include/mach/crag6410.h index ec97c15b109..4c3c9994fc2 100644 --- a/arch/arm/mach-s3c64xx/include/mach/crag6410.h +++ b/arch/arm/mach-s3c64xx/include/mach/crag6410.h @@ -13,8 +13,7 @@ #include <linux/gpio.h> -#define BANFF_PMIC_IRQ_BASE IRQ_BOARD_START -#define GLENFARCLAS_PMIC_IRQ_BASE (IRQ_BOARD_START + 64) +#define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START #define PCA935X_GPIO_BASE GPIO_BOARD_START #define CODEC_GPIO_BASE (GPIO_BOARD_START + 8) diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index d0c352d861f..161c3b6218a 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -525,7 +525,6 @@ static struct wm831x_touch_pdata touch_pdata __initdata = { static struct wm831x_pdata crag_pmic_pdata __initdata = { .wm831x_num = 1, - .irq_base = BANFF_PMIC_IRQ_BASE, .gpio_base = BANFF_PMIC_GPIO_BASE, .soft_shutdown = true, |