[PATCH v2 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()
The patch removes all the uses of cpu_is_mx(). Instead, it utilizes
platform_device_id to distinguish the esdhc differences among SoCs.
Signed-off-by: Shawn Guo shawn@linaro.org
Cc: Wolfram Sang w.s...@pengutronix.de
Cc: Chris Ball c...@laptop.org
---
arch/arm/mach-imx/clock-imx25.c|4 +-
arch/arm/mach-imx/clock-imx35.c|6 +-
arch/arm/mach-mx5/clock-mx51-mx53.c| 16 +++---
arch/arm/mach-mx5/mx51_efika.c |4 +-
.../plat-mxc/devices/platform-sdhci-esdhc-imx.c| 17 +++---
arch/arm/plat-mxc/include/mach/devices-common.h|1 +
drivers/mmc/host/sdhci-esdhc-imx.c | 60 ++-
7 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c
index a65838f..2955afa 100644
--- a/arch/arm/mach-imx/clock-imx25.c
+++ b/arch/arm/mach-imx/clock-imx25.c
@@ -300,8 +300,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK(imx2-wdt.0, NULL, wdt_clk)
_REGISTER_CLOCK(imx-ssi.0, NULL, ssi1_clk)
_REGISTER_CLOCK(imx-ssi.1, NULL, ssi2_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx25.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx25.1, NULL, esdhc2_clk)
_REGISTER_CLOCK(mx2-camera.0, NULL, csi_clk)
_REGISTER_CLOCK(NULL, audmux, audmux_clk)
_REGISTER_CLOCK(flexcan.0, NULL, can1_clk)
diff --git a/arch/arm/mach-imx/clock-imx35.c b/arch/arm/mach-imx/clock-imx35.c
index 5a4cc1e..2f80f14 100644
--- a/arch/arm/mach-imx/clock-imx35.c
+++ b/arch/arm/mach-imx/clock-imx35.c
@@ -458,9 +458,9 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK(imx-epit.0, NULL, epit1_clk)
_REGISTER_CLOCK(imx-epit.1, NULL, epit2_clk)
_REGISTER_CLOCK(NULL, esai, esai_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.2, NULL, esdhc3_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx35.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx35.1, NULL, esdhc2_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx35.2, NULL, esdhc3_clk)
_REGISTER_CLOCK(fec.0, NULL, fec_clk)
_REGISTER_CLOCK(NULL, gpio, gpio1_clk)
_REGISTER_CLOCK(NULL, gpio, gpio2_clk)
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c
b/arch/arm/mach-mx5/clock-mx51-mx53.c
index 699b0d2..fd60e2c 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1453,10 +1453,10 @@ static struct clk_lookup mx51_lookups[] = {
_REGISTER_CLOCK(imx51-ecspi.0, NULL, ecspi1_clk)
_REGISTER_CLOCK(imx51-ecspi.1, NULL, ecspi2_clk)
_REGISTER_CLOCK(imx51-cspi.0, NULL, cspi_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.2, NULL, esdhc3_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.3, NULL, esdhc4_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.1, NULL, esdhc2_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.2, NULL, esdhc3_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.3, NULL, esdhc4_clk)
_REGISTER_CLOCK(NULL, cpu_clk, cpu_clk)
_REGISTER_CLOCK(NULL, iim_clk, iim_clk)
_REGISTER_CLOCK(imx2-wdt.0, NULL, dummy_clk)
@@ -1480,10 +1480,10 @@ static struct clk_lookup mx53_lookups[] = {
_REGISTER_CLOCK(imx-i2c.0, NULL, i2c1_clk)
_REGISTER_CLOCK(imx-i2c.1, NULL, i2c2_clk)
_REGISTER_CLOCK(imx-i2c.2, NULL, i2c3_mx53_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_mx53_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.2, NULL, esdhc3_mx53_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.3, NULL, esdhc4_mx53_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.1, NULL, esdhc2_mx53_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.2, NULL, esdhc3_mx53_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.3, NULL, esdhc4_mx53_clk)
_REGISTER_CLOCK(imx53-ecspi.0, NULL, ecspi1_clk)
_REGISTER_CLOCK(imx53-ecspi.1, NULL, ecspi2_clk)
_REGISTER_CLOCK(imx53-cspi.0, NULL, cspi_clk)
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index 56739c2..4435e03 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -260,8 +260,8 @@ static struct regulator_consumer_supply vvideo_consumers[]
= {
};
static struct regulator_consumer_supply vsd_consumers[] = {
- REGULATOR_SUPPLY(vmmc, sdhci-esdhc-imx.0),
- REGULATOR_SUPPLY(vmmc, sdhci-esdhc-imx.1),
+ REGULATOR_SUPPLY(vmmc, sdhci-esdhc-imx51.0),
+ REGULATOR_SUPPLY(vmmc,
Re: [PATCH v2 1/3] mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()
On Tue, Jul 5, 2011 at 9:26 AM, Shawn Guo shawn@linaro.org wrote:
The patch removes all the uses of cpu_is_mx(). Instead, it utilizes
platform_device_id to distinguish the esdhc differences among SoCs.
Signed-off-by: Shawn Guo shawn@linaro.org
Cc: Wolfram Sang w.s...@pengutronix.de
Cc: Chris Ball c...@laptop.org
Acked-by: Grant Likely grant.lik...@secretlab.ca
---
arch/arm/mach-imx/clock-imx25.c | 4 +-
arch/arm/mach-imx/clock-imx35.c | 6 +-
arch/arm/mach-mx5/clock-mx51-mx53.c | 16 +++---
arch/arm/mach-mx5/mx51_efika.c | 4 +-
.../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 17 +++---
arch/arm/plat-mxc/include/mach/devices-common.h | 1 +
drivers/mmc/host/sdhci-esdhc-imx.c | 60 ++-
7 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c
index a65838f..2955afa 100644
--- a/arch/arm/mach-imx/clock-imx25.c
+++ b/arch/arm/mach-imx/clock-imx25.c
@@ -300,8 +300,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK(imx2-wdt.0, NULL, wdt_clk)
_REGISTER_CLOCK(imx-ssi.0, NULL, ssi1_clk)
_REGISTER_CLOCK(imx-ssi.1, NULL, ssi2_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx25.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx25.1, NULL, esdhc2_clk)
_REGISTER_CLOCK(mx2-camera.0, NULL, csi_clk)
_REGISTER_CLOCK(NULL, audmux, audmux_clk)
_REGISTER_CLOCK(flexcan.0, NULL, can1_clk)
diff --git a/arch/arm/mach-imx/clock-imx35.c b/arch/arm/mach-imx/clock-imx35.c
index 5a4cc1e..2f80f14 100644
--- a/arch/arm/mach-imx/clock-imx35.c
+++ b/arch/arm/mach-imx/clock-imx35.c
@@ -458,9 +458,9 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK(imx-epit.0, NULL, epit1_clk)
_REGISTER_CLOCK(imx-epit.1, NULL, epit2_clk)
_REGISTER_CLOCK(NULL, esai, esai_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.2, NULL, esdhc3_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx35.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx35.1, NULL, esdhc2_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx35.2, NULL, esdhc3_clk)
_REGISTER_CLOCK(fec.0, NULL, fec_clk)
_REGISTER_CLOCK(NULL, gpio, gpio1_clk)
_REGISTER_CLOCK(NULL, gpio, gpio2_clk)
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c
b/arch/arm/mach-mx5/clock-mx51-mx53.c
index 699b0d2..fd60e2c 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1453,10 +1453,10 @@ static struct clk_lookup mx51_lookups[] = {
_REGISTER_CLOCK(imx51-ecspi.0, NULL, ecspi1_clk)
_REGISTER_CLOCK(imx51-ecspi.1, NULL, ecspi2_clk)
_REGISTER_CLOCK(imx51-cspi.0, NULL, cspi_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.2, NULL, esdhc3_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.3, NULL, esdhc4_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.1, NULL, esdhc2_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.2, NULL, esdhc3_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx51.3, NULL, esdhc4_clk)
_REGISTER_CLOCK(NULL, cpu_clk, cpu_clk)
_REGISTER_CLOCK(NULL, iim_clk, iim_clk)
_REGISTER_CLOCK(imx2-wdt.0, NULL, dummy_clk)
@@ -1480,10 +1480,10 @@ static struct clk_lookup mx53_lookups[] = {
_REGISTER_CLOCK(imx-i2c.0, NULL, i2c1_clk)
_REGISTER_CLOCK(imx-i2c.1, NULL, i2c2_clk)
_REGISTER_CLOCK(imx-i2c.2, NULL, i2c3_mx53_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.0, NULL, esdhc1_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.1, NULL, esdhc2_mx53_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.2, NULL, esdhc3_mx53_clk)
- _REGISTER_CLOCK(sdhci-esdhc-imx.3, NULL, esdhc4_mx53_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.0, NULL, esdhc1_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.1, NULL, esdhc2_mx53_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.2, NULL, esdhc3_mx53_clk)
+ _REGISTER_CLOCK(sdhci-esdhc-imx53.3, NULL, esdhc4_mx53_clk)
_REGISTER_CLOCK(imx53-ecspi.0, NULL, ecspi1_clk)
_REGISTER_CLOCK(imx53-ecspi.1, NULL, ecspi2_clk)
_REGISTER_CLOCK(imx53-cspi.0, NULL, cspi_clk)
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index 56739c2..4435e03 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -260,8 +260,8 @@ static struct regulator_consumer_supply
vvideo_consumers[] = {
};
static struct regulator_consumer_supply vsd_consumers[] = {
-
