From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [PATCH 3/6] arm/tegra: prepare early init for multiple tegra variants Date: Fri, 28 Oct 2011 17:19:34 +0100 Message-ID: <20111028161933.GK23539@mudshark.cambridge.arm.com> References: <1319561644-6160-1-git-send-email-pdeschrijver@nvidia.com> <1319561644-6160-4-git-send-email-pdeschrijver@nvidia.com> <74CDBE0F657A3D45AFBB94109FB122FF173E1B49B2@HQMAIL01.nvidia.com> <20111027201657.GP19187@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20111027201657.GP19187@n2100.arm.linux.org.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Russell King - ARM Linux Cc: Stephen Warren , Peter De Schrijver , "linux-kernel@vger.kernel.org" , Olof Johansson , Colin Cross , "linux-tegra@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" List-Id: linux-tegra@vger.kernel.org On Thu, Oct 27, 2011 at 09:16:57PM +0100, Russell King - ARM Linux wrote: > On Thu, Oct 27, 2011 at 01:06:13PM -0700, Stephen Warren wrote: > > Peter De Schrijver wrote at Tuesday, October 25, 2011 10:54 AM: > > > -static __initdata struct tegra_clk_init_table common_clk_init_table[] = { > > > +void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset; > > > > I'm not sure why you moved that, but I suppose it's fine. > > Note that Nicolas has a patch set during KS which cleans the arch_reset > business out of mach/system.h, and effectively gets rid of arch_reset > entirely, so this probably conflicts with those changes. I've spammed the ARM list with this patch series now, so the state of the conflicts should be evident. Will From mboxrd@z Thu Jan 1 00:00:00 1970 From: will.deacon@arm.com (Will Deacon) Date: Fri, 28 Oct 2011 17:19:34 +0100 Subject: [PATCH 3/6] arm/tegra: prepare early init for multiple tegra variants In-Reply-To: <20111027201657.GP19187@n2100.arm.linux.org.uk> References: <1319561644-6160-1-git-send-email-pdeschrijver@nvidia.com> <1319561644-6160-4-git-send-email-pdeschrijver@nvidia.com> <74CDBE0F657A3D45AFBB94109FB122FF173E1B49B2@HQMAIL01.nvidia.com> <20111027201657.GP19187@n2100.arm.linux.org.uk> Message-ID: <20111028161933.GK23539@mudshark.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Oct 27, 2011 at 09:16:57PM +0100, Russell King - ARM Linux wrote: > On Thu, Oct 27, 2011 at 01:06:13PM -0700, Stephen Warren wrote: > > Peter De Schrijver wrote at Tuesday, October 25, 2011 10:54 AM: > > > -static __initdata struct tegra_clk_init_table common_clk_init_table[] = { > > > +void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset; > > > > I'm not sure why you moved that, but I suppose it's fine. > > Note that Nicolas has a patch set during KS which cleans the arch_reset > business out of mach/system.h, and effectively gets rid of arch_reset > entirely, so this probably conflicts with those changes. I've spammed the ARM list with this patch series now, so the state of the conflicts should be evident. Will From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933020Ab1J1QTu (ORCPT ); Fri, 28 Oct 2011 12:19:50 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:59282 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756016Ab1J1QTt (ORCPT ); Fri, 28 Oct 2011 12:19:49 -0400 Date: Fri, 28 Oct 2011 17:19:34 +0100 From: Will Deacon To: Russell King - ARM Linux Cc: Stephen Warren , Peter De Schrijver , "linux-kernel@vger.kernel.org" , "linux-tegra@vger.kernel.org" , Colin Cross , Olof Johansson , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH 3/6] arm/tegra: prepare early init for multiple tegra variants Message-ID: <20111028161933.GK23539@mudshark.cambridge.arm.com> References: <1319561644-6160-1-git-send-email-pdeschrijver@nvidia.com> <1319561644-6160-4-git-send-email-pdeschrijver@nvidia.com> <74CDBE0F657A3D45AFBB94109FB122FF173E1B49B2@HQMAIL01.nvidia.com> <20111027201657.GP19187@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111027201657.GP19187@n2100.arm.linux.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 27, 2011 at 09:16:57PM +0100, Russell King - ARM Linux wrote: > On Thu, Oct 27, 2011 at 01:06:13PM -0700, Stephen Warren wrote: > > Peter De Schrijver wrote at Tuesday, October 25, 2011 10:54 AM: > > > -static __initdata struct tegra_clk_init_table common_clk_init_table[] = { > > > +void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset; > > > > I'm not sure why you moved that, but I suppose it's fine. > > Note that Nicolas has a patch set during KS which cleans the arch_reset > business out of mach/system.h, and effectively gets rid of arch_reset > entirely, so this probably conflicts with those changes. I've spammed the ARM list with this patch series now, so the state of the conflicts should be evident. Will