From 5231ebf5637aed9b56a108b478df5b9252cb98af Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 6 Nov 2008 09:06:21 -0800 Subject: [PATCH] HSMMC: Build fixes for earlier patches Build fixes for "HSMMC: Improve the interface for hsmmc_init()". The header file needs to work without MMC support enabled, and some board files needed to include it. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-2430sdp.c | 3 +++ arch/arm/mach-omap2/board-ldp.c | 3 +++ arch/arm/mach-omap2/board-omap2evm.c | 3 +++ arch/arm/mach-omap2/board-omap3beagle.c | 2 ++ arch/arm/mach-omap2/board-omap3evm.c | 2 ++ arch/arm/mach-omap2/board-omap3pandora.c | 2 ++ arch/arm/mach-omap2/mmc-twl4030.h | 8 ++++---- 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index e3a3131e698..237492fd232 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -44,6 +44,9 @@ #include +#include "mmc-twl4030.h" + + #define SDP2430_FLASH_CS 0 #define SDP2430_SMC91X_CS 5 diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index cf79de8d6cb..3ec8264ed19 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -41,6 +41,9 @@ #include #include +#include "mmc-twl4030.h" + + #define CONFIG_DISABLE_HFCLK 1 #define ENABLE_VAUX1_DEDICATED 0x03 diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c index 4cb85df2977..1ad727e35ec 100644 --- a/arch/arm/mach-omap2/board-omap2evm.c +++ b/arch/arm/mach-omap2/board-omap2evm.c @@ -41,6 +41,9 @@ #include #include +#include "mmc-twl4030.h" + + #define GPMC_OFF_CONFIG1_0 0x60 static struct mtd_partition omap2evm_nand_partitions[] = { diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 0f1c841a29b..a4dc140ab3e 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -44,6 +44,8 @@ #include #include "twl4030-generic-scripts.h" +#include "mmc-twl4030.h" + #define GPMC_CS0_BASE 0x60 #define GPMC_CS_SIZE 0x30 diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index eb21bc56517..dd8077e009f 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -40,6 +40,8 @@ #include "sdram-micron-mt46h32m32lf-6.h" #include "twl4030-generic-scripts.h" +#include "mmc-twl4030.h" + static struct resource omap3evm_smc911x_resources[] = { [0] = { diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 12f032786cb..9fd3499f71a 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -47,6 +47,8 @@ #include #include "sdram-micron-mt46h32m32lf-6.h" +#include "mmc-twl4030.h" + #define NAND_BLOCK_SIZE SZ_128K #define GPMC_CS0_BASE 0x60 diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h index 5777d3369fb..5d2f7801a31 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/mmc-twl4030.h @@ -6,20 +6,20 @@ * published by the Free Software Foundation. */ -#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ - defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) - struct twl4030_hsmmc_info { u8 mmc; /* controller 1/2/3 */ u8 wires; /* 1/4/8 wires */ int gpio_cd; /* or -EINVAL */ }; +#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ + defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) + void hsmmc_init(struct twl4030_hsmmc_info *); #else -static inline void hsmmc_init(struct twl4030_hsmmc_info *) +static inline void hsmmc_init(struct twl4030_hsmmc_info *info) { } -- 2.41.0