From patchwork Wed Apr 22 17:40:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 6257281 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6B5869F313 for ; Wed, 22 Apr 2015 18:19:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B2112034F for ; Wed, 22 Apr 2015 18:19:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9805420328 for ; Wed, 22 Apr 2015 18:19:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753018AbbDVSTe (ORCPT ); Wed, 22 Apr 2015 14:19:34 -0400 Received: from inca-roads.misterjones.org ([213.251.177.50]:38852 "EHLO inca-roads.misterjones.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095AbbDVSTe (ORCPT ); Wed, 22 Apr 2015 14:19:34 -0400 X-Greylist: delayed 2386 seconds by postgrey-1.27 at vger.kernel.org; Wed, 22 Apr 2015 14:19:34 EDT Received: from [93.89.81.133] (helo=why.lan) by cheepnis.misterjones.org with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.80) (envelope-from ) id 1Ykyci-0003g6-VJ; Wed, 22 Apr 2015 19:39:45 +0200 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Chanwoo Choi , Kyungmin Park , Krzysztof Kozlowski , Kukjin Kim Subject: [PATCH] ARM: exynos: Fix wake-up interrupts for Exynos3250 Date: Wed, 22 Apr 2015 18:40:52 +0100 Message-Id: <1429724452-26563-1-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.1.4 X-SA-Exim-Connect-IP: 93.89.81.133 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, cw00.choi@samsung.com, kyungmin.park@samsung.com, k.kozlowski@samsung.com, kgene@kernel.org X-SA-Exim-Mail-From: marc.zyngier@arm.com X-SA-Exim-Scanned: No (on cheepnis.misterjones.org); SAEximRunCond expanded to false Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 8b283c025443 (ARM: exynos4/5: convert pmu wakeup to stacked domains) changed the Exynos PMU code to use stacked domains. This has led to a number of interrupt numbers to be fixed. In the meantime, support for Exynos 3250 was added, missing the required change to this platform. This amounts to revert ace283a04a4a (ARM: EXYNOS: Fix wrong hwirq of RTC interrupt for Exynos3250 SoC), as the initial patch was right, just a bit early... Cc: Chanwoo Choi Cc: Kyungmin Park Cc: Krzysztof Kozlowski Cc: Kukjin Kim Signed-off-by: Marc Zyngier Acked-by: Krzysztof Kozlowski Reviewed-by: Chanwoo Choi --- arch/arm/mach-exynos/suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index 3e6aea7..40dce36 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 */ }, };