diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-16 12:54:30 +0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 06:05:41 +0400 |
commit | 7f917a8df68985aa38a90b7110b5f42bfa0d7cda (patch) | |
tree | 1b7f0449267b5f573ccf0b51df0616a4f5533159 /arch/arm/mach-imx/mach-mx31moboard.c | |
parent | 27b76486a3e5be1cfd19dc59452e4185c5d43dff (diff) | |
download | linux-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-mx31moboard.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx31moboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index e719c767bf68..31c7d05cc33c 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c @@ -175,11 +175,11 @@ static const struct spi_imx_master moboard_spi1_pdata __initconst = { static struct regulator_consumer_supply sdhc_consumers[] = { { - .dev_name = "mxc-mmc.0", + .dev_name = "imx31-mmc.0", .supply = "sdhc0_vcc", }, { - .dev_name = "mxc-mmc.1", + .dev_name = "imx31-mmc.1", .supply = "sdhc1_vcc", }, }; |