From patchwork Fri May 31 22:22:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2645751 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 82E7B3FD4E for ; Fri, 31 May 2013 22:23:36 +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 1UiXjS-0006iZ-Ku; Fri, 31 May 2013 22:23:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXjP-0004CI-Mi; Fri, 31 May 2013 22:23:31 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXjK-0004AD-LP for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 22:23:28 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LcrJc-1U0eGf0DUe-00iC94; Sat, 01 Jun 2013 00:23:05 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH 14/15] clk: tegra: provide tegra_periph_reset_assert alternative Date: Sat, 1 Jun 2013 00:22:51 +0200 Message-Id: <1370038972-2318779-15-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1370038972-2318779-1-git-send-email-arnd@arndb.de> References: <1370038972-2318779-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:tJKJpeb/bVl8ok/1wq+MklOorXp37J3zVgk7j7mRB13 FATnMpgbmJrE3cB45lFIhTu+Ac+kYBRfn17lhVOk09gXcSptWb eHP9NAou9PgSEKbPjUCWXHZ5fQoUaqxqSzmIdVWUhrBJiryZcv G5a5i2a2w5QIlpB+ERbmEDivMQgYozWZiSItPeH6jhFsSnTPtI G0OJhM0Vj13xzJP61r24MKd3VM8JBSlsBNjMDwPaNG8pzXdK0P eg/daSMhMpL3IfY5kHj5X1QgMK3bBttU4XxcEwgJYZ+37z7Pcc yDfM6nxXcIKoIZl+IgAoT87qX72137CNgZM8XpWmNqQm8F+21v NFg5G8VbE8GZIkdZQ6R3rF8XO2x0MlX2i7o7IyqoS X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_182326_941565_185FFAD3 X-CRM114-Status: UNSURE ( 7.98 ) 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.9 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: patches@lists.linaro.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.org 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 We have some tegra device drivers that are written to be platform independent but still use the tegra specific tegra_periph_reset_assert function. In order to build and link them without errors, this provides a static inline version of these functions that does nothing when Tegra support is disabled. Signed-off-by: Arnd Bergmann --- include/linux/clk/tegra.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h index 642789b..1397190 100644 --- a/include/linux/clk/tegra.h +++ b/include/linux/clk/tegra.h @@ -120,8 +120,13 @@ static inline void tegra_cpu_clock_resume(void) } #endif +#ifdef ARCH_TEGRA void tegra_periph_reset_deassert(struct clk *c); void tegra_periph_reset_assert(struct clk *c); +#else +static inline void tegra_periph_reset_deassert(struct clk *c) {} +static inline void tegra_periph_reset_assert(struct clk *c) {} +#endif void tegra_clocks_init(void); void tegra_clocks_apply_init_table(void);