From patchwork Tue Apr 23 15:46:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2479611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 1A8773FCA5 for ; Tue, 23 Apr 2013 18:20:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfUv-0007cy-Rl; Tue, 23 Apr 2013 15:51:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfTI-0004OL-Gx; Tue, 23 Apr 2013 15:49:32 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfT4-0004NJ-3q for linux-arm-kernel@lists.infradead.org; Tue, 23 Apr 2013 15:49:19 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MLP00KPHT9O4980@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 24 Apr 2013 00:49:17 +0900 (KST) X-AuditID: cbfee61b-b7f8e6d000000f44-b0-5176ad7d8284 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 3F.B0.03908.D7DA6715; Wed, 24 Apr 2013 00:49:17 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MLP0032TT5SFQ80@mmp1.samsung.com>; Wed, 24 Apr 2013 00:49:16 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 10/13] ARM: SAMSUNG: Do not register legacy timer interrupts on Exynos Date: Tue, 23 Apr 2013 17:46:31 +0200 Message-id: <1366731994-7478-11-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1366731994-7478-1-git-send-email-t.figa@samsung.com> References: <1366731994-7478-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t9jAd3atWWBBh+fs1v8nXSM3WLSugNM FgdmP2S1OPNb16J3wVU2i7NNb9gtNj2+xmox4/w+Jou1R+6yW5y6/pnNYv2M1ywWmzdNZbY4 NmMJo8WqXX8YHfg8fv+axOjxd9ULZo+ds+6ye9y5tofN4925c+wem5fUe5yfsZDR48qJJlaP vi2rGD0+b5IL4IrisklJzcksSy3St0vgyjj+5Q1LwQyBih9XzjM2MK7i7WLk5JAQMJFYvH07 M4QtJnHh3nq2LkYuDiGBRYwSnz7eZ4RwupgkzrYvZgOpYhNQk/jc8AjMFhHQkJjS9ZgdpIhZ 4BKTxPxdm1hBEsIC0RIrG2+D2SwCqhKL/6xhB7F5BZwkdvZsg1onL/H0fh/YIE6Q+NGHYLaQ gKPE0b/tTBMYeRcwMqxiFE0tSC4oTkrPNdIrTswtLs1L10vOz93ECA7mZ9I7GFc1WBxiFOBg VOLhfTGrLFCINbGsuDL3EKMEB7OSCK/1bKAQb0piZVVqUX58UWlOavEhRmkOFiVx3oOt1oFC AumJJanZqakFqUUwWSYOTqkGRrlGoYMMfS8P+rb0Xeft6MhbbLLFr+J7bqszo236nNCzx6sK 7uyvE/vjNLtict6tNXE/H5Q4iJZIfDsjtzglKH6JL+upsPLlq2uW+k4p+qU/kX/eThZR70xV Y+cPk5U/n54Xu3OLg9i7uzo3fZpcd9vvtVGJYSp88YxZbEE53/bFQkeKFK8eU2Ipzkg01GIu Kk4EAMF7Cb9iAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130423_114918_470847_E4C16540 X-CRM114-Status: GOOD ( 11.43 ) X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kgene.kim@samsung.com, arnd@arndb.de, devicetree-discuss@lists.ozlabs.org, tomasz.figa@gmail.com, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, john.stultz@linaro.org, ben-linux@fluff.org, olof@lixom.net, thomas.abraham@linaro.org, tglx@linutronix.de, Tomasz Figa , m.szyprowski@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch removes legacy PWM timer interrupt initialization from exynos{4,5}_init_irq() functions, since it conflicts with internal interrupt handling of the new PWM clocksource driver. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/common.c | 15 --------------- arch/arm/plat-samsung/Kconfig | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 64ef39e..9574498 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -492,13 +492,6 @@ void __init exynos4_init_irq(void) combiner_init(S5P_VA_COMBINER_BASE, NULL, max_combiner_nr(), COMBINER_IRQ(0, 0)); - /* - * The parameters of s5p_init_irq() are for VIC init. - * Theses parameters should be NULL and 0 because EXYNOS4 - * uses GIC instead of VIC. - */ - s5p_init_irq(NULL, 0); - gic_arch_extn.irq_set_wake = s3c_irq_wake; } @@ -507,14 +500,6 @@ void __init exynos5_init_irq(void) #ifdef CONFIG_OF irqchip_init(); #endif - /* - * The parameters of s5p_init_irq() are for VIC init. - * Theses parameters should be NULL and 0 because EXYNOS4 - * uses GIC instead of VIC. - */ - if (!of_machine_is_compatible("samsung,exynos5440")) - s5p_init_irq(NULL, 0); - gic_arch_extn.irq_set_wake = s3c_irq_wake; } diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 53e7eeb..04410da 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -97,9 +97,9 @@ config SAMSUNG_IRQ_VIC_TIMER Internal configuration to build the VIC timer interrupt code. config S5P_IRQ - def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) + def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210) help - Support common interrup part for ARCH_S5P and ARCH_EXYNOS SoCs + Support common interrupt part for ARCH_S5P SoCs config S5P_EXT_INT bool