diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-27 09:40:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-27 09:40:06 -0700 |
| commit | 6e76538b9ef2b2a14ad9b57d65dc35d151765917 (patch) | |
| tree | abb95e720792583a5656137650eb0549c8967c10 /arch/arm/plat-samsung/include/plat/sdhci.h | |
| parent | dadb3660a3ad162ac6e76be7262c72f48177f1aa (diff) | |
| parent | 9b4d1cbb1391ae603c20cbf8c0beb66e38397196 (diff) | |
| download | talos-obmc-linux-6e76538b9ef2b2a14ad9b57d65dc35d151765917.tar.gz talos-obmc-linux-6e76538b9ef2b2a14ad9b57d65dc35d151765917.zip | |
Merge branch 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability
ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined
ARM: EXYNOS: Fix resource on dev-dwmci.c
ARM: S3C24XX: Fix build warning for S3C2410_PM
ARM: mini2440_defconfig: Fix build error
ARM: EXYNOS: Fix incorrect initialization of GIC
ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/sdhci.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/sdhci.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index 317e246ffc56..e834c5ef437c 100644 --- a/arch/arm/plat-samsung/include/plat/sdhci.h +++ b/arch/arm/plat-samsung/include/plat/sdhci.h @@ -18,6 +18,8 @@ #ifndef __PLAT_S3C_SDHCI_H #define __PLAT_S3C_SDHCI_H __FILE__ +#include <plat/devs.h> + struct platform_device; struct mmc_host; struct mmc_card; @@ -356,4 +358,30 @@ static inline void exynos4_default_sdhci3(void) { } #endif /* CONFIG_EXYNOS4_SETUP_SDHCI */ +static inline void s3c_sdhci_setname(int id, char *name) +{ + switch (id) { +#ifdef CONFIG_S3C_DEV_HSMMC + case 0: + s3c_device_hsmmc0.name = name; + break; +#endif +#ifdef CONFIG_S3C_DEV_HSMMC1 + case 1: + s3c_device_hsmmc1.name = name; + break; +#endif +#ifdef CONFIG_S3C_DEV_HSMMC2 + case 2: + s3c_device_hsmmc2.name = name; + break; +#endif +#ifdef CONFIG_S3C_DEV_HSMMC3 + case 3: + s3c_device_hsmmc3.name = name; + break; +#endif + } +} + #endif /* __PLAT_S3C_SDHCI_H */ |
