From patchwork Wed Mar 19 19:28:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3860821 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0EEC5BF540 for ; Wed, 19 Mar 2014 19:43:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 470CC201F4 for ; Wed, 19 Mar 2014 19:43:14 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 4E4FF2010E for ; Wed, 19 Mar 2014 19:43:13 +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 1WQMMD-0005GQ-2v; Wed, 19 Mar 2014 19:40:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMLE-0006Jc-OF; Wed, 19 Mar 2014 19:39:56 +0000 Received: from moutng.kundenserver.de ([212.227.17.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMF6-0005ni-S4 for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:33:38 +0000 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0LgosA-1WwcgQ2Www-00oIYS; Wed, 19 Mar 2014 20:30:32 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 02/62] ARM: at91: don't provide dt init code for at91x40 Date: Wed, 19 Mar 2014 20:28:59 +0100 Message-Id: <1395257399-359545-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:KqtZXEXHzLz4M+YKrqrkba5UPsAS+hTlKdm92sieCGA e4SoQ03ktt0w+EuAsQX9+VTAd4xAHtbFHpgjxZ3WD7vM3HsOOg CSOzAuX8tOVp9Xj7VDfSbWlPfTXTEK3Fra3PnuZeJ4h6hWa2iq hq1cqr4FKfR3MwOb3XfrBUEEAAoEFBZf5sAPT9ZJVul28cjYvl WdQqmODf4/JOVYbpQFDyi+TbbDO2/LV3gK+cg2aNtLgK5U0qvr quQQiPp0TtZnPxKzrbAGc/9m8W74psMdt0Wf0156OmiW/vbpR6 JJ3C23VC8vpe5suE++lRdWzzBJbeDE2qVcu6P2sN7Z3K56c7O3 H+gaaLJ3j4Nt9YWJByS8E0TVWHgF92jxKmCfc/KpZ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153337_167553_72BA8DAF X-CRM114-Status: GOOD ( 10.96 ) X-Spam-Score: -1.9 (-) Cc: Jean-Christophe Plagniol-Villard , Nicolas Ferre , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Andrew Victor 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 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 at91x40 has no support for device tree, but Kconfig allows us to enable CONFIG_OF anyway, causing a link error in the at91 reset controller initialization. The easiest fix is to adapt the existing #ifdef to omit the broken code on at91x40 where it is never called anyway. Signed-off-by: Arnd Bergmann Cc: Andrew Victor Cc: Nicolas Ferre Cc: Jean-Christophe Plagniol-Villard Acked-by: Nicolas Ferre --- arch/arm/mach-at91/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index f7ca97b..f7a07a5 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -351,7 +351,7 @@ void __init at91_ioremap_matrix(u32 base_addr) panic("Impossible to ioremap at91_matrix_base\n"); } -#if defined(CONFIG_OF) +#if defined(CONFIG_OF) && !defined(CONFIG_ARCH_AT91X40) static struct of_device_id rstc_ids[] = { { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9_alt_restart }, { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },