From patchwork Mon Mar 2 20:40:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5917171 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 25232BF440 for ; Mon, 2 Mar 2015 20:43:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 60636201EF for ; Mon, 2 Mar 2015 20:43:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D428201EC for ; Mon, 2 Mar 2015 20:43:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSX9E-0003Fk-QB; Mon, 02 Mar 2015 20:41:04 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSX8v-0002tX-1b for linux-arm-kernel@lists.infradead.org; Mon, 02 Mar 2015 20:40:46 +0000 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0MLyNI-1YPFLf0l1Y-007mC2; Mon, 02 Mar 2015 21:40:15 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 0/5] ARM: orion5k/mv78xx0/dove multiplatform support Date: Mon, 02 Mar 2015 21:40:14 +0100 Message-ID: <3759703.9ZVN3LdzHt@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1425328618-894030-1-git-send-email-arnd@arndb.de> References: <1425328618-894030-1-git-send-email-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:2KjA5ud3BkW5R1jPxAu9Drx3FsP/fVIcnslqxm6ZxavixNZxLuJ Dvr9zdnPitPXWehJtYEwy0AJS9V/HPHnua+PwaU3uLbXunAtNaNHq3h2XZRtN3PKUw4iSPF 8LEXTvt9GuUodhIRb10YvWWfniPHlw5Mj41CNBJmGyg/JshugOZYkEZeClxgAPz7N9iyFrw Ywl47yF6ZGC8Y7tvE6dQg== X-UI-Out-Filterresults: notjunk:1; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150302_124045_538384_39DAC220 X-CRM114-Status: GOOD ( 11.20 ) X-Spam-Score: -0.0 (/) Cc: Thomas Petazzoni , Andrew Lunn , Ezequiel Garcia , Jason Cooper , Gregory Clement , Russell King , Sebastian Hesselbarth X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 On Monday 02 March 2015 21:36:53 Arnd Bergmann wrote: > This is build tested so far and survives a randconfig builder > for a few hundred builds without regressions, but I have not > done any runtime testing. Any help in testing or reviewing would > be much appreciated. It would help to send out the version that I have actually tested. If you want to give it a try, please apply the patch below to actually get mach-dove to build. Arnd diff --git a/arch/arm/mach-dove/irq.c b/arch/arm/mach-dove/irq.c index c9d68dbbdc08..c0d5f52713b7 100644 --- a/arch/arm/mach-dove/irq.c +++ b/arch/arm/mach-dove/irq.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-dove/irq.c b/arch/arm/mach-dove/irq.c index c0d5f52713b7..eed251513ca5 100644 --- a/arch/arm/mach-dove/irq.c +++ b/arch/arm/mach-dove/irq.c @@ -161,7 +161,7 @@ void __init dove_init_irq(void) writel(0, PMU_INTERRUPT_MASK); writel(0, PMU_INTERRUPT_CAUSE); - for (i = IRQ_DOVE_PMU_START; i < NR_IRQS; i++) { + for (i = IRQ_DOVE_PMU_START; i < DOVE_NR_IRQS; i++) { irq_set_chip_and_handler(i, &pmu_irq_chip, handle_level_irq); irq_set_status_flags(i, IRQ_LEVEL); set_irq_flags(i, IRQF_VALID); diff --git a/arch/arm/mach-dove/pm.h b/arch/arm/mach-dove/pm.h index 584954d26241..3e2712a89c61 100644 --- a/arch/arm/mach-dove/pm.h +++ b/arch/arm/mach-dove/pm.h @@ -61,7 +61,7 @@ static inline int pmu_to_irq(int pin) static inline int irq_to_pmu(int irq) { - if (IRQ_DOVE_PMU_START <= irq && irq < NR_IRQS) + if (IRQ_DOVE_PMU_START <= irq && irq < DOVE_NR_IRQS) return irq - IRQ_DOVE_PMU_START; return -EINVAL;