From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 31 Aug 2012 01:39:58 +0200 (CEST) Received: from avon.wwwdotorg.org ([70.85.31.133]:57771 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903269Ab2H3Xjx (ORCPT ); Fri, 31 Aug 2012 01:39:53 +0200 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 43C73625C; Thu, 30 Aug 2012 17:47:16 -0600 (MDT) Received: from springbank2.nvidia.com (unknown [38.96.16.75]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 71C1BE40E5; Thu, 30 Aug 2012 17:39:44 -0600 (MDT) Message-ID: <503FF9E9.4020701@wwwdotorg.org> Date: Thu, 30 Aug 2012 16:40:25 -0700 From: Stephen Warren User-Agent: Mozilla/5.0 (X11; Linux armv7l; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: Mark Brown CC: Arnd Bergmann , Russell King , Haavard Skinnemoen , Hans-Christian Egtvedt , Ralf Baechle , Benjamin Herrenschmidt , Paul Mackerras , Guan Xuetao , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH] clk: Make the generic clock API available by default References: <1346186104-4083-1-git-send-email-broonie@opensource.wolfsonmicro.com> <503E8E6E.1010101@wwwdotorg.org> <20120830171918.GE4356@opensource.wolfsonmicro.com> In-Reply-To: <20120830171918.GE4356@opensource.wolfsonmicro.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean X-archive-position: 34387 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: swarren@wwwdotorg.org Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Return-Path: On 08/30/12 10:19, Mark Brown wrote: > On Wed, Aug 29, 2012 at 02:49:34PM -0700, Stephen Warren wrote: >> On 08/28/12 13:35, Mark Brown wrote: > >>> @@ -674,6 +676,7 @@ config ARCH_TEGRA >>> select GENERIC_CLOCKEVENTS >>> select GENERIC_GPIO >>> select HAVE_CLK >>> + select HAVE_CUSTOM_CLK > >> For 3.7, Tegra will switch to the common clock framework. I think >> this patch would then disable that. How should we resolve this - >> rebase the Tegra common-clk tree on top of any branch containing >> this patch in order to remove that select statement? > > I'd expect this to be applied on a separate branch so you should be able > to rebase your conversion on top of it or merge it into your branch > which should deal with things well enough I think? That should work. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from avon.wwwdotorg.org (avon.wwwdotorg.org [IPv6:2001:470:1f0f:bd7::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE00D2C0302 for ; Fri, 31 Aug 2012 09:39:52 +1000 (EST) Message-ID: <503FF9E9.4020701@wwwdotorg.org> Date: Thu, 30 Aug 2012 16:40:25 -0700 From: Stephen Warren MIME-Version: 1.0 To: Mark Brown Subject: Re: [PATCH] clk: Make the generic clock API available by default References: <1346186104-4083-1-git-send-email-broonie@opensource.wolfsonmicro.com> <503E8E6E.1010101@wwwdotorg.org> <20120830171918.GE4356@opensource.wolfsonmicro.com> In-Reply-To: <20120830171918.GE4356@opensource.wolfsonmicro.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Cc: linux-mips@linux-mips.org, Guan Xuetao , Russell King , Arnd Bergmann , linux-kernel@vger.kernel.org, Ralf Baechle , Paul Mackerras , Haavard Skinnemoen , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Hans-Christian Egtvedt List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 08/30/12 10:19, Mark Brown wrote: > On Wed, Aug 29, 2012 at 02:49:34PM -0700, Stephen Warren wrote: >> On 08/28/12 13:35, Mark Brown wrote: > >>> @@ -674,6 +676,7 @@ config ARCH_TEGRA >>> select GENERIC_CLOCKEVENTS >>> select GENERIC_GPIO >>> select HAVE_CLK >>> + select HAVE_CUSTOM_CLK > >> For 3.7, Tegra will switch to the common clock framework. I think >> this patch would then disable that. How should we resolve this - >> rebase the Tegra common-clk tree on top of any branch containing >> this patch in order to remove that select statement? > > I'd expect this to be applied on a separate branch so you should be able > to rebase your conversion on top of it or merge it into your branch > which should deal with things well enough I think? That should work. From mboxrd@z Thu Jan 1 00:00:00 1970 From: swarren@wwwdotorg.org (Stephen Warren) Date: Thu, 30 Aug 2012 16:40:25 -0700 Subject: [PATCH] clk: Make the generic clock API available by default In-Reply-To: <20120830171918.GE4356@opensource.wolfsonmicro.com> References: <1346186104-4083-1-git-send-email-broonie@opensource.wolfsonmicro.com> <503E8E6E.1010101@wwwdotorg.org> <20120830171918.GE4356@opensource.wolfsonmicro.com> Message-ID: <503FF9E9.4020701@wwwdotorg.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 08/30/12 10:19, Mark Brown wrote: > On Wed, Aug 29, 2012 at 02:49:34PM -0700, Stephen Warren wrote: >> On 08/28/12 13:35, Mark Brown wrote: > >>> @@ -674,6 +676,7 @@ config ARCH_TEGRA >>> select GENERIC_CLOCKEVENTS >>> select GENERIC_GPIO >>> select HAVE_CLK >>> + select HAVE_CUSTOM_CLK > >> For 3.7, Tegra will switch to the common clock framework. I think >> this patch would then disable that. How should we resolve this - >> rebase the Tegra common-clk tree on top of any branch containing >> this patch in order to remove that select statement? > > I'd expect this to be applied on a separate branch so you should be able > to rebase your conversion on top of it or merge it into your branch > which should deal with things well enough I think? That should work.