diff options
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 9e5d51bee94a..9bd4b3452453 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -817,13 +817,13 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
817 | case 3: | 817 | case 3: |
818 | if (!cpu_is_omap44xx()) | 818 | if (!cpu_is_omap44xx()) |
819 | return; | 819 | return; |
820 | base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET; | 820 | base = OMAP4_MMC4_BASE; |
821 | irq = OMAP44XX_IRQ_MMC4; | 821 | irq = OMAP44XX_IRQ_MMC4; |
822 | break; | 822 | break; |
823 | case 4: | 823 | case 4: |
824 | if (!cpu_is_omap44xx()) | 824 | if (!cpu_is_omap44xx()) |
825 | return; | 825 | return; |
826 | base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET; | 826 | base = OMAP4_MMC5_BASE; |
827 | irq = OMAP44XX_IRQ_MMC5; | 827 | irq = OMAP44XX_IRQ_MMC5; |
828 | break; | 828 | break; |
829 | default: | 829 | default: |
@@ -834,10 +834,8 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
834 | size = OMAP2420_MMC_SIZE; | 834 | size = OMAP2420_MMC_SIZE; |
835 | name = "mmci-omap"; | 835 | name = "mmci-omap"; |
836 | } else if (cpu_is_omap44xx()) { | 836 | } else if (cpu_is_omap44xx()) { |
837 | if (i < 3) { | 837 | if (i < 3) |
838 | base += OMAP4_MMC_REG_OFFSET; | ||
839 | irq += OMAP44XX_IRQ_GIC_START; | 838 | irq += OMAP44XX_IRQ_GIC_START; |
840 | } | ||
841 | size = OMAP4_HSMMC_SIZE; | 839 | size = OMAP4_HSMMC_SIZE; |
842 | name = "mmci-omap-hs"; | 840 | name = "mmci-omap-hs"; |
843 | } else { | 841 | } else { |