From patchwork Thu May 2 21:02:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2513871 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 E0FAA3FCA5 for ; Thu, 2 May 2013 21:06:49 +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 1UY0gL-0006Mv-0e; Thu, 02 May 2013 21:04:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0fe-000263-4u; Thu, 02 May 2013 21:04:06 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0en-0001yC-4T for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 21:03:18 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Meu09-1UwPG23DY1-00ODHz; Thu, 02 May 2013 23:02:39 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/9] ARM: imx: reset_controller may be disabled Date: Thu, 2 May 2013 23:02:54 +0200 Message-Id: <1367528578-518090-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1367528578-518090-1-git-send-email-arnd@arndb.de> References: <1367528578-518090-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:qTlPtFgRcDwSbd39ilDQG0KDhOPr6EYAKB5ZYU6h2Vj g5m8O7DfP6xFUjVAaOq42I484yxRdtL3R2A4rn8stbysIcrh0k +YWHOVkJE1BbiHS9SeOhsGbrM21+sclJf2g6ODaRHiy6jycfMI /mGSJJz54839ZiwP4V+iQrn2k4lTb6AUhvpK84gXKtROOeSy69 vKfY8Gq/ypkAtN2ynXtHwm9WCpVauL3jA7RXhySfJmf1CXTmGv ta2Evk3lW/9tqwDwBd1CUc24Ytg+E6CL37nD68YBrYOy7lQgy9 Hb7aBYjLaBTDJZA0licrCFEaaYuFhY1UbYmjjb6GZ80RgKhKo2 +a1jHeHPrvO0E4418X16wMsFzVesFAbIfIBRr7vXH X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_170313_608586_8F50A4CE X-CRM114-Status: UNSURE ( 8.61 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, Sascha Hauer , Arnd Bergmann 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 The new reset controller API is optional, so if that is disabled, we must not call it from platform code. arch/arm/mach-imx/built-in.o: In function `imx_src_init': /git/arm-soc/arch/arm/mach-imx/src.c:144: undefined reference to `reset_controller_register' Cc: Sascha Hauer Signed-off-by: Arnd Bergmann --- arch/arm/mach-imx/src.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c index dc101898..10a6b1a 100644 --- a/arch/arm/mach-imx/src.c +++ b/arch/arm/mach-imx/src.c @@ -141,7 +141,8 @@ void __init imx_src_init(void) WARN_ON(!src_base); imx_reset_controller.of_node = np; - reset_controller_register(&imx_reset_controller); + if (IS_ENABLED(CONFIG_RESET_CONTROLLER)) + reset_controller_register(&imx_reset_controller); /* * force warm reset sources to generate cold reset