From patchwork Tue Sep 11 12:59:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1437811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id C76234025E for ; Tue, 11 Sep 2012 13:05:33 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBQ5L-00012A-0N; Tue, 11 Sep 2012 13:00:59 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBQ4W-0000nI-Ks for linux-arm-kernel@lists.infradead.org; Tue, 11 Sep 2012 13:00:12 +0000 Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Mefpk-1Sw52g16ka-00OHHU; Tue, 11 Sep 2012 15:00:02 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/16] ARM: w90x900: move platform_data definitions Date: Tue, 11 Sep 2012 14:59:45 +0200 Message-Id: <1347368390-31252-11-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1347368390-31252-1-git-send-email-arnd@arndb.de> References: <1347368350-31212-1-git-send-email-arnd@arndb.de> <1347368390-31252-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:YCk8GqGnh4Zk4XY6F9tbtr3/N+BZgJV7iEG0jgfTOEq Jr2gItqmJ2zD75+q41fA+QBVWieMesK0DWhwRENQr/mGUWLi8s njZbuq1/WD9r8aPAv08GtnjtJ3TiF4ILbu/H+5+dcuEJ0JYfac 6bg+g/CjqerQFWqm5QcHRDqQ5dyA2579xl/3sKzvufeqofS1zK doXRaVbwzN7YSZBBYUrlqm9ZStw10ELUi2FXNXm+CqQstqHTqr khrlXAEVbHIVmfgQuB3Iao4mtUNGjuSqf43QuMD9zuDIz6g3wY 1pzAB41PIu1E1hYOuly7sVjpGtnhJR2D89ns1re1qeixfy9SBI YOobXnQqYJEBI8Ad61ElvMwK1e9dsnPCwMy/zu2U+E6RhS8PZt HNWteDP+mQvI9713gRi5eRy+p4vieCGBQM= 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.17.9 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: Mark Brown , Russell King , Arnd Bergmann , Wan ZongShun , Florian Tobias Schandinat , Dmitry Torokhov , linux-kernel@vger.kernel.org, "Wolfram Sang \(embedded platforms\)" , Grant Likely , "Ben Dooks \(embedded platforms\)" 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 w90x900 include directories Signed-off-by: Arnd Bergmann Cc: Wan ZongShun Cc: "Ben Dooks (embedded platforms)" Cc: "Wolfram Sang (embedded platforms)" Cc: Dmitry Torokhov Cc: Grant Likely Cc: Florian Tobias Schandinat Cc: Mark Brown --- arch/arm/mach-w90x900/dev.c | 6 +++--- arch/arm/mach-w90x900/mach-nuc950evb.c | 2 +- drivers/i2c/busses/i2c-nuc900.c | 2 +- drivers/input/keyboard/w90p910_keypad.c | 2 +- drivers/spi/spi-nuc900.c | 2 +- drivers/video/nuc900fb.c | 2 +- drivers/video/nuc900fb.h | 2 +- .../mach/i2c.h => include/linux/platform_data/i2c-nuc900.h | 0 .../linux/platform_data/keypad-w90p910.h | 0 .../nuc900_spi.h => include/linux/platform_data/spi-nuc900.h | 0 .../mach/fb.h => include/linux/platform_data/video-nuc900fb.h | 0 11 files changed, 9 insertions(+), 9 deletions(-) rename arch/arm/mach-w90x900/include/mach/i2c.h => include/linux/platform_data/i2c-nuc900.h (100%) rename arch/arm/mach-w90x900/include/mach/w90p910_keypad.h => include/linux/platform_data/keypad-w90p910.h (100%) rename arch/arm/mach-w90x900/include/mach/nuc900_spi.h => include/linux/platform_data/spi-nuc900.h (100%) rename arch/arm/mach-w90x900/include/mach/fb.h => include/linux/platform_data/video-nuc900fb.h (100%) diff --git a/arch/arm/mach-w90x900/include/mach/i2c.h b/include/linux/platform_data/i2c-nuc900.h similarity index 100% rename from arch/arm/mach-w90x900/include/mach/i2c.h rename to include/linux/platform_data/i2c-nuc900.h diff --git a/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h b/include/linux/platform_data/keypad-w90p910.h similarity index 100% rename from arch/arm/mach-w90x900/include/mach/w90p910_keypad.h rename to include/linux/platform_data/keypad-w90p910.h diff --git a/arch/arm/mach-w90x900/include/mach/nuc900_spi.h b/include/linux/platform_data/spi-nuc900.h similarity index 100% rename from arch/arm/mach-w90x900/include/mach/nuc900_spi.h rename to include/linux/platform_data/spi-nuc900.h diff --git a/arch/arm/mach-w90x900/include/mach/fb.h b/include/linux/platform_data/video-nuc900fb.h similarity index 100% rename from arch/arm/mach-w90x900/include/mach/fb.h rename to include/linux/platform_data/video-nuc900fb.h diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c index 48f5b9f..7abdb96 100644 --- a/arch/arm/mach-w90x900/dev.c +++ b/arch/arm/mach-w90x900/dev.c @@ -34,11 +34,11 @@ #include #include -#include +#include #include -#include +#include #include -#include +#include #include "cpu.h" diff --git a/arch/arm/mach-w90x900/mach-nuc950evb.c b/arch/arm/mach-w90x900/mach-nuc950evb.c index 067d8f9..500fe59 100644 --- a/arch/arm/mach-w90x900/mach-nuc950evb.c +++ b/arch/arm/mach-w90x900/mach-nuc950evb.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "nuc950.h" diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c index a26dfb8..f41502e 100644 --- a/drivers/i2c/busses/i2c-nuc900.c +++ b/drivers/i2c/busses/i2c-nuc900.c @@ -29,7 +29,7 @@ #include #include -#include +#include /* nuc900 i2c registers offset */ diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c index 085ede4..e0f6cd1 100644 --- a/drivers/input/keyboard/w90p910_keypad.c +++ b/drivers/input/keyboard/w90p910_keypad.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* Keypad Interface Control Registers */ #define KPI_CONF 0x00 diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c index dae8be2..a6eca6f 100644 --- a/drivers/spi/spi-nuc900.c +++ b/drivers/spi/spi-nuc900.c @@ -26,7 +26,7 @@ #include #include -#include +#include /* usi registers offset */ #define USI_CNT 0x00 diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c index e10f551..9338755 100644 --- a/drivers/video/nuc900fb.c +++ b/drivers/video/nuc900fb.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "nuc900fb.h" diff --git a/drivers/video/nuc900fb.h b/drivers/video/nuc900fb.h index bc7c930..9a1ca6d 100644 --- a/drivers/video/nuc900fb.h +++ b/drivers/video/nuc900fb.h @@ -16,7 +16,7 @@ #define __NUC900FB_H #include -#include +#include enum nuc900_lcddrv_type { LCDDRV_NUC910,