diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-12 18:15:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 11:18:57 +0200 |
| commit | e35742b034a29a1c00f12ab6d0a7ab779abc8f83 (patch) | |
| tree | 9bb7846ff60840886c918c23ca71d7f5f8ccad0e | |
| parent | a1fd844c6e620f90d5c27713fddcec067abe9572 (diff) | |
ARM: tegra: move sdhci platform_data definition
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This the definitions for the tegra sdhci driver out of
the tegra include directories, which is the last one
for this platform.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-paz00.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/mmc-sdhci-tegra.h (renamed from arch/arm/mach-tegra/include/mach/sdhci.h) | 6 |
5 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index e65e837f401..5f428ff61fe 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -26,6 +26,7 @@ #include <linux/io.h> #include <linux/gpio.h> #include <linux/i2c.h> +#include <linux/platform_data/mmc-sdhci-tegra.h> #include <sound/wm8903.h> @@ -38,7 +39,6 @@ #include <mach/tegra_wm8903_pdata.h> #include <mach/iomap.h> #include <mach/irqs.h> -#include <mach/sdhci.h> #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 4b64af5cab2..112bf683283 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c @@ -31,6 +31,7 @@ #include <linux/i2c.h> #include <linux/gpio.h> #include <linux/rfkill-gpio.h> +#include <linux/platform_data/mmc-sdhci-tegra.h> #include <asm/hardware/gic.h> #include <asm/mach-types.h> @@ -40,7 +41,6 @@ #include <mach/iomap.h> #include <mach/irqs.h> -#include <mach/sdhci.h> #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 776aa9564d5..8d1a66a27e3 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -27,6 +27,7 @@ #include <linux/i2c.h> #include <linux/gpio.h> #include <linux/platform_data/tegra_usb.h> +#include <linux/platform_data/mmc-sdhci-tegra.h> #include <asm/hardware/gic.h> #include <asm/mach-types.h> @@ -34,7 +35,6 @@ #include <asm/setup.h> #include <mach/iomap.h> -#include <mach/sdhci.h> #include "board.h" #include "clock.h" diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 0810ccc23d7..d43e7462941 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -28,7 +28,7 @@ #include <asm/gpio.h> #include <mach/gpio-tegra.h> -#include <mach/sdhci.h> +#include <linux/platform_data/mmc-sdhci-tegra.h> #include "sdhci-pltfm.h" diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/include/linux/platform_data/mmc-sdhci-tegra.h index 4231bc7b865..8f843069768 100644 --- a/arch/arm/mach-tegra/include/mach/sdhci.h +++ b/include/linux/platform_data/mmc-sdhci-tegra.h @@ -1,6 +1,4 @@ /* - * include/asm-arm/arch-tegra/include/mach/sdhci.h - * * Copyright (C) 2009 Palm, Inc. * Author: Yvonne Yip <y@palm.com> * @@ -14,8 +12,8 @@ * GNU General Public License for more details. * */ -#ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H -#define __ASM_ARM_ARCH_TEGRA_SDHCI_H +#ifndef __PLATFORM_DATA_TEGRA_SDHCI_H +#define __PLATFORM_DATA_TEGRA_SDHCI_H #include <linux/mmc/host.h> |