From patchwork Sat Jun 22 18:06:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 2765981 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 DC608C0AB1 for ; Sat, 22 Jun 2013 18:06:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECC5120106 for ; Sat, 22 Jun 2013 18:06:58 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B950B20105 for ; Sat, 22 Jun 2013 18:06:57 +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 1UqSD9-0001bR-EH; Sat, 22 Jun 2013 18:06:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UqSD6-00027V-O3; Sat, 22 Jun 2013 18:06:52 +0000 Received: from mail-pd0-x233.google.com ([2607:f8b0:400e:c02::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UqSD3-000270-CR for linux-arm-kernel@lists.infradead.org; Sat, 22 Jun 2013 18:06:50 +0000 Received: by mail-pd0-f179.google.com with SMTP id q10so148462pdj.38 for ; Sat, 22 Jun 2013 11:06:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:to:from :in-reply-to:cc:references:message-id:user-agent:subject:date :x-gm-message-state; bh=XgsBqQb6neegPshq0zgmjERFC4w/kanspTwCBPQJ7l4=; b=YM9k3BSeWopez7u7bvz1J0qUsFKq2NvN3xL3vFSD7BGYPQpUi4Mh05voaIU6mhtR8Q 0NiTWb3n8a99a1bQI4YsMtWzykix+cRMkCiNqsydGrN6g8dIcQ2yNWYMl5Iv+xVEQQql eTQzphC5YRXBslv3F0i6BUfzvkiWczqJYa/HhUnS/LI2DBt+emLCcmEbViKR8DT0a8LY 3qbfa0kH9e/rQ9TOdjYuUt3npIrzBw+I9EoZ7mCBYMfEtCF8CaE2WtJBPExfrXwZ2P66 +BP1Tjh6Th7p9kr2PZUotF1GQrhs0WwKQnKWQugGDyRDYdbp0tVkP3e4vwE1/coIT7TY h9rQ== X-Received: by 10.68.170.227 with SMTP id ap3mr7733044pbc.194.1371924386854; Sat, 22 Jun 2013 11:06:26 -0700 (PDT) Received: from localhost ([2601:9:7e80:c0:ca60:ff:fe0a:8a36]) by mx.google.com with ESMTPSA id dj5sm10129669pbc.25.2013.06.22.11.06.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 22 Jun 2013 11:06:26 -0700 (PDT) MIME-Version: 1.0 To: Stephen Warren , Arnd Bergmann From: Mike Turquette In-Reply-To: <51C4C377.5090408@wwwdotorg.org> References: <201306212232.27026.arnd@arndb.de> <51C4C377.5090408@wwwdotorg.org> Message-ID: <20130622180623.20448.27045@quantum> User-Agent: alot/0.3.4 Subject: Re: [PATCH] clk: tegra: provide tegra_periph_reset_assert alternative Date: Sat, 22 Jun 2013 11:06:23 -0700 X-Gm-Message-State: ALoCoQmT+u/XpM/hTzU//X67vI/ZBuB5Lo2W8nEivfLjPS4LmxvKauKYHO7GEGhXNnT++jb6CXSZ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130622_140649_502030_08975B06 X-CRM114-Status: GOOD ( 16.14 ) X-Spam-Score: -1.9 (-) Cc: Linux ARM Kernel List 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Quoting Stephen Warren (2013-06-21 14:19:51) > On 06/21/2013 02:32 PM, Arnd Bergmann wrote: > > 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. > > Oh, I thought this had been applied already. > > Acked-by: Stephen Warren > > Hopefully we'll be replacing these custom APIs with the standard module > reset APIs soon (post 3.11 though). I've seen internally the first round > of patches from Prashant for this, so chances are good they'll be > finalized and sent upstream in the not-too-distant future. This fix has been taken into clk-next for 3.11. tegra_clocks_init() is missing in the clock tree so the patch below is what actually got merged. Thanks, Mike commit 7064f6bd86278029348c36d30bd325e7e05b6fee Author: Arnd Bergmann Date: Fri Jun 21 22:32:26 2013 +0200 clk: tegra: provide tegra_periph_reset_assert alternative 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 Acked-by: Stephen Warren Signed-off-by: Mike Turquette [mturquette@linaro.org: fixed up trivial merge issue] diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h index 3670a4f..e3cc872 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_apply_init_table(void); #endif /* __LINUX_CLK_TEGRA_H_ */