diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:05:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:05:43 +0200 |
| commit | 1a02b6627bb9e7cefc8f7faf884172e8e8d87ac8 (patch) | |
| tree | 20df848c45473860ea242fe26b681130d3ac17b2 /arch/arm/mach-exynos | |
| parent | 8f1ab524b1b97e91356e1b34322b27c304e39e7f (diff) | |
| parent | fe931229c61c04e0a7906c4ebef9623a4538a5ab (diff) | |
| download | blackbird-obmc-linux-1a02b6627bb9e7cefc8f7faf884172e8e8d87ac8.tar.gz blackbird-obmc-linux-1a02b6627bb9e7cefc8f7faf884172e8e8d87ac8.zip | |
Merge tag 'samsung-fixes-4.1-4' of https://github.com/krzk/linux into fixes
Merge "ARM: EXYNOS: Fix for 4.1, 4th" from Krzysztof Kozlowski:
Fix for Exynos3250 RTC wake-up interrupts after converting PMU
wakeup to stacked domains. This allows waking up the device from
suspend to RAM using S3C RTC driver (the RTC on SoC).
The patch should be applied some time ago, unfortunately
it seems it slipped through fingers.
* tag 'samsung-fixes-4.1-4' of https://github.com/krzk/linux:
ARM: exynos: Fix wake-up interrupts for Exynos3250
Diffstat (limited to 'arch/arm/mach-exynos')
| -rw-r--r-- | arch/arm/mach-exynos/suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index c0b6dccbf7bd..7d23ce04cad5 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -87,8 +87,8 @@ static unsigned int exynos_pmu_spare3; static u32 exynos_irqwake_intmask = 0xffffffff; static const struct exynos_wkup_irq exynos3250_wkup_irq[] = { - { 105, BIT(1) }, /* RTC alarm */ - { 106, BIT(2) }, /* RTC tick */ + { 73, BIT(1) }, /* RTC alarm */ + { 74, BIT(2) }, /* RTC tick */ { /* sentinel */ }, }; |
