From patchwork Tue Sep 11 12:59:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11321 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 B473C23EFE for ; Tue, 11 Sep 2012 13:17:44 +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 498E6A18FF5 for ; Tue, 11 Sep 2012 13:17:44 +0000 (UTC) Received: by ieak11 with SMTP id k11so828783iea.11 for ; Tue, 11 Sep 2012 06:17:43 -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=ehc45shdMmVEZ2+KEpPLRfvtVoCjdSZ/etK7fSvFSqc=; b=YqJIG+nGrnilMlujPdZTZznQA7/TGFaYd4APPXYjnJMvfGojlc/4zT5gyGxyIFfNcI oZVuNfYwdrGGFDx9PYtOGPROCdgbyyR1n1DIA4ILsguM2rlM0hOAHLF0q1tEqHQPieSa 0J+QsT2xS8d4uFDAtVvP/etf0k4gninpefx/I5SM8fQY8dn3LsCEixcN0H87cAzDL1DD 3HC6fF4DYqe5zMOeyj2qtebKz5pTpR42KYIGVkjeupIpYakdN9C7pB8awtIfeAyEQrGT +DQ9rR2bE3td2sLPdpzD0DjT5/QWOgXQoaWYh/oZQ6cqfD6Bn2Upz5PLtAkgsV5pecl4 kuJw== Received: by 10.50.191.227 with SMTP id hb3mr8518429igc.43.1347369463659; Tue, 11 Sep 2012 06:17:43 -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 ex8csp12878igc; Tue, 11 Sep 2012 06:17:42 -0700 (PDT) Received: by 10.216.140.104 with SMTP id d82mr10939303wej.130.1347369461777; Tue, 11 Sep 2012 06:17:41 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTP id r4si3492869wif.16.2012.09.11.06.17.40; Tue, 11 Sep 2012 06:17:41 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 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 0Lpis6-1TnU6p0EMA-00fO86; Tue, 11 Sep 2012 15:00:01 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Russell King , Arnd Bergmann , Colin Cross , Olof Johansson , Stephen Warren , Dmitry Torokhov , Chris Ball , Liam Girdwood , Mark Brown , linux-tegra@vger.kernel.org Subject: [PATCH 09/16] ARM: tegra: move platform_data definitions Date: Tue, 11 Sep 2012 14:59:43 +0200 Message-Id: <1347368390-31252-9-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:ZvSd7q2kXToQg9Q2Venj8/osXFOl8hqdK0aREhK9+An nllm4VENkldRwH7zlFc3nz1J0VM5TJvSQVdRIF3ktQ8VYF5xXj 5XLqzyI7mzBn4zcVAU+7o16Ucbux5/kA9VjDbdJES/bg2txD2D S27a/qOv6lJc+ItpP7UtoH4TBDn8rNIZWiMj/u2MJ+ceRTi1Fp AOoK4bqinO3M68ArC+kwKMnp6ih+e6IIoupiMZFWI7m1nYVOvZ i7pSHiLqKgdH2TjEPepPfeuXL5KOpSkmF4i6UsO1tqQvTVNQBn O9pel4r7n+TMo9ID+DUrDK9kJcNri6+C+s/QVzbiDXYOY7YUkG 3CAgBMyBpu97DNpt55Os9iggJrbjngUUeVGEyNLEePn1dmO8g4 Gu+oK8MM0DHR7Wmlle0wLsQGTrqyJ09V00= X-Gm-Message-State: ALoCoQnLbGJ547jHxj5b18WX/DsSXPphUhx3dUSRAGYIw1rGnFlSnE0l6uYEbe/+4y1dPAWZ7uBm 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 tegra include directories Signed-off-by: Arnd Bergmann Cc: Colin Cross Cc: Olof Johansson Cc: Stephen Warren Cc: Dmitry Torokhov Cc: Chris Ball Cc: Liam Girdwood Cc: Mark Brown Cc: linux-tegra@vger.kernel.org --- arch/arm/mach-tegra/board-harmony.c | 4 ++-- arch/arm/mach-tegra/board-paz00.c | 2 +- arch/arm/mach-tegra/board-trimslice.c | 2 +- drivers/input/keyboard/tegra-kbc.c | 2 +- drivers/mmc/host/sdhci-tegra.c | 2 +- .../linux/platform_data/asoc-tegra_wm8903.h | 0 .../mach/kbc.h => include/linux/platform_data/keyboard-tegra-kbc.h | 0 .../mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h | 0 sound/soc/tegra/tegra_wm8903.c | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/linux/platform_data/asoc-tegra_wm8903.h (100%) rename arch/arm/mach-tegra/include/mach/kbc.h => include/linux/platform_data/keyboard-tegra-kbc.h (100%) rename arch/arm/mach-tegra/include/mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h (100%) diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index e65e837..31b3b72 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -35,10 +35,10 @@ #include #include -#include +#include #include #include -#include +#include #include "board.h" #include "board-harmony.h" diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index 4b64af5..6dd6854 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c @@ -40,7 +40,7 @@ #include #include -#include +#include #include "board.h" #include "board-paz00.h" diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 776aa95..fb80c8f 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "board.h" #include "clock.h" diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index 2c1c9ed..40aded8 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define KBC_MAX_DEBOUNCE_CNT 0x3ffu diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 0810ccc..d43e746 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "sdhci-pltfm.h" diff --git a/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h b/include/linux/platform_data/asoc-tegra_wm8903.h similarity index 100% rename from arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h rename to include/linux/platform_data/asoc-tegra_wm8903.h diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/include/linux/platform_data/keyboard-tegra-kbc.h similarity index 100% rename from arch/arm/mach-tegra/include/mach/kbc.h rename to include/linux/platform_data/keyboard-tegra-kbc.h diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/include/linux/platform_data/mmc-sdhci-tegra.h similarity index 100% rename from arch/arm/mach-tegra/include/mach/sdhci.h rename to include/linux/platform_data/mmc-sdhci-tegra.h diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index d4f14e4..8deedf5 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include