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: 11313 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AADBC23F26 for ; Tue, 11 Sep 2012 13:00:42 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 35336A18BF3 for ; Tue, 11 Sep 2012 13:00:42 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so796870iea.11 for ; Tue, 11 Sep 2012 06:00:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=O5ZvLNF1CGvDQ8QjZp7aj01INgj9Ss39m0tSPftSEVk=; b=UKMnw9ZimDBI0b41aFaa7HUro3ycpttHsO8aDBHSqa2/kggSO1XJKz2k0lLmNmvnhx 63vhQILBbIUl+TfkVmiRgnDOLyQ3bEA+eW+BTxWKgFxEdT8Ls1+VOGDdO9zR2D2uLIHV oviVEfJYHeochdeTIF2IE1o8Hyq/ReZRsOFEnmZ+xwIi9p0KGPdwlYQ/9bVXP+oyuAQK miT2C4dsIca9H2D+rNDSmwzgZMmeUxC546+TfOKmYI+CWRmjDx6WDia0sjYPsWY6RIzn N0s83iWazIrO2lp09TOLMnDbyOM40IRyTm2Njc7OaMXn3h4TPhRZ5fcdNMBdoje4Zge+ 3FXw== Received: by 10.50.45.162 with SMTP id o2mr17003363igm.0.1347368441977; Tue, 11 Sep 2012 06:00:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp11898igc; Tue, 11 Sep 2012 06:00:40 -0700 (PDT) Received: by 10.216.182.195 with SMTP id o45mr10455983wem.185.1347368439836; Tue, 11 Sep 2012 06:00:39 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTP id i9si3389343wiy.24.2012.09.11.06.00.39; Tue, 11 Sep 2012 06:00:39 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.9; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de 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 Cc: linux-kernel@vger.kernel.org, Russell King , Arnd Bergmann , Wan ZongShun , "Ben Dooks (embedded platforms)" , "Wolfram Sang (embedded platforms)" , Dmitry Torokhov , Grant Likely , Florian Tobias Schandinat , Mark Brown 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-Gm-Message-State: ALoCoQkA/rO+tJmJgMiCtDmDIW6rOlEsAnpoIRijNp4FRCEYefzM/DzFN+QmwBMSndJ59TLVS47p 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,