Updating oh_name for MMC controller with "mmcx" instead of "mmcx_hwmod".
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@xxxxxx>
---
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 4 ++--
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 6df1e52..5b0e171 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -756,7 +756,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
int idx = i - 1;
l = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN,
- "mmc%d_hwmod", i);
+ "mmc%d", i);
WARN(l >= MAX_OMAP_MMC_HWMOD_NAME_LEN,
"String buffer overflow in MMC%d device setup\n", i);
oh = omap_hwmod_lookup(oh_name);
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index d342f58..2eb6868 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -440,7 +440,7 @@ static struct omap_hwmod_ocp_if *omap2430_mmc1_slaves[] = {
};
static struct omap_hwmod omap2430_mmc1_hwmod = {
- .name = "mmc1_hwmod",
+ .name = "mmc1",
.mpu_irqs = mmc1_mpu_irqs,
.mpu_irqs_cnt = ARRAY_SIZE(mmc1_mpu_irqs),
.sdma_reqs = mmc1_sdma_reqs,
@@ -488,7 +488,7 @@ static struct omap_hwmod_ocp_if *omap2430_mmc2_slaves[] = {
};
static struct omap_hwmod omap2430_mmc2_hwmod = {
- .name = "mmc2_hwmod",
+ .name = "mmc2",
.mpu_irqs = mmc2_mpu_irqs,
.mpu_irqs_cnt = ARRAY_SIZE(mmc2_mpu_irqs),
.sdma_reqs = mmc2_sdma_reqs,
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 6412cc4..990638e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -567,7 +567,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc1_slaves[] = {
};
static struct omap_hwmod omap3xxx_mmc1_hwmod = {
- .name = "mmc1_hwmod",
+ .name = "mmc1",
.mpu_irqs = mmc1_mpu_irqs,
.mpu_irqs_cnt = ARRAY_SIZE(mmc1_mpu_irqs),
.sdma_reqs = mmc1_sdma_reqs,
@@ -615,7 +615,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc2_slaves[] = {
};
static struct omap_hwmod omap3xxx_mmc2_hwmod = {
- .name = "mmc2_hwmod",
+ .name = "mmc2",
.mpu_irqs = mmc2_mpu_irqs,
.mpu_irqs_cnt = ARRAY_SIZE(mmc2_mpu_irqs),
.sdma_reqs = mmc2_sdma_reqs,
@@ -661,7 +661,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc3_slaves[] = {
};
static struct omap_hwmod omap3xxx_mmc3_hwmod = {
- .name = "mmc3_hwmod",
+ .name = "mmc3",
.mpu_irqs = mmc3_mpu_irqs,
.mpu_irqs_cnt = ARRAY_SIZE(mmc3_mpu_irqs),
.sdma_reqs = mmc3_sdma_reqs,
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
