summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mach-pcm038.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-16 12:54:30 +0400
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 06:05:41 +0400
commit7f917a8df68985aa38a90b7110b5f42bfa0d7cda (patch)
tree1b7f0449267b5f573ccf0b51df0616a4f5533159 /arch/arm/mach-imx/mach-pcm038.c
parent27b76486a3e5be1cfd19dc59452e4185c5d43dff (diff)
downloadlinux-7f917a8df68985aa38a90b7110b5f42bfa0d7cda.tar.xz
mmc: mxcmmc: remove cpu_is_xxx by using platform_device_id
It changes the driver to use platform_device_id rather than cpu_is_xxx to determine the controller type, and updates the platform code accordingly. As the result, mach/hardware.h inclusion gets removed from the driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Chris Ball <cjb@laptop.org> Tested-by: Javier Martin <javier.martin@vista-silicon.com> Cc: linux-mmc@vger.kernel.org
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm038.c')
-rw-r--r--arch/arm/mach-imx/mach-pcm038.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c
index 4a5234003f39..8bf95f5741c4 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -212,7 +212,7 @@ static const struct spi_imx_master pcm038_spi0_data __initconst = {
static struct regulator_consumer_supply sdhc1_consumers[] = {
{
- .dev_name = "mxc-mmc.1",
+ .dev_name = "imx21-mmc.1",
.supply = "sdhc_vcc",
},
};