diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2015-03-26 19:58:08 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-05-05 13:09:37 +0300 |
| commit | 24efc4c5ab269211093b78d033d1c3ca5cc23762 (patch) | |
| tree | a720a549c84a4af165e365abb9d67677485372ef /arch/arm/mach-s3c64xx/mach-crag6410.c | |
| parent | bfa53978ef0ff341b1fb91ed26c41a529060a0fe (diff) | |
| download | linux-24efc4c5ab269211093b78d033d1c3ca5cc23762.tar.xz | |
ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
commit 4e330ae4ab2915444f1e6dca1358a910aa259362 upstream.
There are two PMICs on Cragganmore, currently one dynamically assign
its IRQ base and the other uses a fixed base. It is possible for the
statically assigned PMIC to fail if its IRQ is taken by the dynamically
assigned one. Fix this by statically assigning both the IRQ bases.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-crag6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 4b0199fff9f5..e57dd645309b 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -555,6 +555,7 @@ static struct wm831x_touch_pdata touch_pdata = { static struct wm831x_pdata crag_pmic_pdata = { .wm831x_num = 1, + .irq_base = BANFF_PMIC_IRQ_BASE, .gpio_base = BANFF_PMIC_GPIO_BASE, .soft_shutdown = true, |