Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753605AbbDBOUj (ORCPT ); Thu, 2 Apr 2015 10:20:39 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:62339 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753579AbbDBOUf (ORCPT ); Thu, 2 Apr 2015 10:20:35 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Nicolas Ferre , Olof Johansson , arm@kernel.org, Boris BREZILLON , Linux Kernel list , Ludovic Desroches , Alexandre Belloni , Jean-Christophe PLAGNIOL-VILLARD Subject: Re: [GIT PULL] at91: multiplatform for 4.1 #1 Date: Thu, 02 Apr 2015 16:17:49 +0200 Message-ID: <4695444.mEPNvRWLFJ@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1426785269-6484-1-git-send-email-nicolas.ferre@atmel.com> References: <1426785269-6484-1-git-send-email-nicolas.ferre@atmel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:zXXS8nv+q7LTBoWBN6abJBu1d3V8g74+KtDwGHlOSDsFqKFq7ht RGO3stqsk51VGphOrpGDsatoj4heUE4h/w0NYqz7somKMWGIqjbaqKWDwFzhItMfvAj2e8K iQ6NgeqzLZ95c79XLZ9gliCa35r+kv7GQDs3CiIibNi8zmiwYi+REj/vOFk4Q3SVtOkyKaT PB0PlsJ8uzgGZ9J+LQnSg== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1478 Lines: 37 On Thursday 19 March 2015 18:14:29 Nicolas Ferre wrote: > Arnd, Olof, Kevin, > > This is the real switch to multi-platform for AT91: after all the preparation > work that has been done, here we are! And there's also an additional cleanup on > top of that... > I stacked this material on top of my previous "at91-cleanup3" tag that I had sent > you earlier this week. As all my cleanup material is also on top of the fixes > tags (that you already have), these patches are also adapted to match this > state and avoid conflicts. > So, you can have this tag in your "multiplatform" branch separated, like I did, > or simply stacked on top or the AT91 cleanup material. I got a build error with legacy (non-multi) platforms when ARCH_AT91 is enabled and needed this change on top: diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index e2cd30f6c23d..fd95f34945f4 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -1,5 +1,6 @@ menuconfig ARCH_AT91 bool "Atmel SoCs" + depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 select ARCH_REQUIRE_GPIOLIB select COMMON_CLK_AT91 select PINCTRL Can you check if that is the right approach and submit it as a proper patch? Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/