From patchwork Wed Sep 12 16:24:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1445781 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (unknown [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 9B9F2DF238 for ; Wed, 12 Sep 2012 17:32:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBqTm-0001Iq-IE; Wed, 12 Sep 2012 17:11:58 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBqTh-0001I2-7h for linux-arm-kernel@lists.infradead.org; Wed, 12 Sep 2012 17:11:55 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MXovv-1T0YbX32Ih-00Wptl; Wed, 12 Sep 2012 19:11:21 +0200 From: Arnd Bergmann To: Linus Walleij Subject: Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions Date: Wed, 12 Sep 2012 16:24:27 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <1347368350-31212-1-git-send-email-arnd@arndb.de> <1347368390-31252-12-git-send-email-arnd@arndb.de> In-Reply-To: MIME-Version: 1.0 Message-Id: <201209121624.27657.arnd@arndb.de> X-Provags-ID: V02:K0:iA+pBoYKuI9MZUIB8SwY24t38NesGrnY+S4jS4/jNGM RprEWLBYxKAnjv8uir/ObXUIUhLdYamagHF9m/+OMxC7X6NbyY rM2tMzqpnRlxqW5bblwvZeV+i44YI00PA1K8cd56UjLbr4JaPC cl7i76SPLjxZqwMujy3A7dvdRWDdo64xnOmOg41oSH/CgJd4Ru EuUnsiunRo8DZICitqU6it/z5SAnaiZIzZ3c8LjCK40Xqfuzu1 gdvbFSOKIuSZT0PpMyhniClzIW63XavktEyI3mkkI0rlFCkXy4 6w72HY/r2VIhvACLp0PusPX+TW9JiWkoxiuC47P585OPM48EDw z5IC1uC8XluYIbz/06VI= X-Spam-Note: CRM114 invocation failed 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.126.186 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: Russell King , Herbert Xu , Srinidhi Kasagar , Greg Kroah-Hartman , Dmitry Torokhov , linux-kernel@vger.kernel.org, Felipe Balbi , Andreas Westin , STEricsson , David Woodhouse , "David S. Miller" , linux-arm-kernel@lists.infradead.org, Alessandro Rubini X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tuesday 11 September 2012, Linus Walleij wrote: > I sent a patch for moving gpio-u300.h like this in commit > 651728507140246e9cf4e809f1877cb2eddbc84e > that is already in linux-next, is this the same patch or > another one? I've dropped that part from my patch now, this is the new version: Arnd From bb95f134f891ff75c5eabf740f93d11ff0ea5eca Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 24 Aug 2012 15:19:33 +0200 Subject: [PATCH 12/16] ARM: nomadik: move platform_data definitions Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the nomadik include directories Signed-off-by: Arnd Bergmann Acked-by: Mark Brown Acked-by: Greg Kroah-Hartman Acked-by: Nicolas Pitre Acked-by: Felipe Balbi Acked-by: Alessandro Rubini Acked-by: Linus Walleij Cc: STEricsson Cc: Srinidhi Kasagar Cc: Herbert Xu Cc: "David S. Miller" Cc: Dmitry Torokhov Cc: David Woodhouse Cc: Andreas Westin --- arch/arm/mach-nomadik/board-nhk8815.c | 2 +- arch/arm/mach-u300/core.c | 2 +- arch/arm/mach-ux500/board-mop500.c | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 2 +- arch/arm/mach-ux500/devices-common.h | 2 +- arch/arm/mach-ux500/usb.c | 2 +- drivers/crypto/ux500/cryp/cryp_core.c | 2 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/input/keyboard/nomadik-ske-keypad.c | 2 +- drivers/mtd/nand/nomadik_nand.c | 2 +- drivers/pinctrl/pinctrl-coh901.c | 2 +- drivers/usb/musb/ux500_dma.c | 2 +- .../include/mach => include/linux/platform_data}/crypto-ux500.h | 0 .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h | 0 .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h | 0 .../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h | 0 17 files changed, 12 insertions(+), 12 deletions(-) rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%) rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%) rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%) rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%) diff --git a/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h similarity index 100% rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h rename to include/linux/platform_data/crypto-ux500.h diff --git a/arch/arm/plat-nomadik/include/plat/ske.h b/include/linux/platform_data/keypad-nomadik-ske.h similarity index 100% rename from arch/arm/plat-nomadik/include/plat/ske.h rename to include/linux/platform_data/keypad-nomadik-ske.h diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/include/linux/platform_data/mtd-nomadik-nand.h similarity index 100% rename from arch/arm/mach-nomadik/include/mach/nand.h rename to include/linux/platform_data/mtd-nomadik-nand.h diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/include/linux/platform_data/usb-musb-ux500.h similarity index 100% rename from arch/arm/mach-ux500/include/mach/usb.h rename to include/linux/platform_data/usb-musb-ux500.h diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index f4535a7..381c080 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include "cpu-8815.h" diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 8674a89..38854d4 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include "ste-dma40-db8500.h" #include "devices-db8500.h" diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index db3c52d..1bef4c3 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "devices-db8500.h" diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index ecdd838..7fbf0ba 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include struct spi_master_cntlr; diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c index a74af38..145482e 100644 --- a/arch/arm/mach-ux500/usb.c +++ b/arch/arm/mach-ux500/usb.c @@ -10,7 +10,7 @@ #include #include -#include +#include #define MUSB_DMA40_RX_CH { \ .mode = STEDMA40_MODE_LOGICAL, \ diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 1c307e1..ef17e38 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -32,7 +32,7 @@ #include -#include +#include #include #include "cryp_p.h" diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 08d5032..0876507 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include "hash_alg.h" diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c index a880e74..49f5fa6 100644 --- a/drivers/input/keyboard/nomadik-ske-keypad.c +++ b/drivers/input/keyboard/nomadik-ske-keypad.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* SKE_CR bits */ #define SKE_KPMLT (0x1 << 6) diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index a86aa81..9ee0c4e 100644 --- a/drivers/mtd/nand/nomadik_nand.c +++ b/drivers/mtd/nand/nomadik_nand.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index d05c7fb..f82246d 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "musb_core.h" struct ux500_dma_channel {