This patch fixes and issue where DM_MMC adds a 0x100 byte offset to the base register. This is necessary for AM33xx, OMAP4+ and newer devices, but it is not necessary for OMAP34XX boards.
This patch will now only apply the x100 byte offset correction if DM_MMC is enabled and the device is not OMAP34XX.
Fixes 11e1582506c6 ("omap_hsmmc: update struct hsmmc to accomodate base address from DT")
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h index f2bf645..5b44c40 100644 --- a/arch/arm/include/asm/omap_mmc.h +++ b/arch/arm/include/asm/omap_mmc.h @@ -26,7 +26,7 @@ #define OMAP_MMC_H_
struct hsmmc { -#ifdef CONFIG_DM_MMC +#if defined(CONFIG_DM_MMC) && !defined(CONFIG_OMAP34XX) unsigned char res0[0x100]; #endif unsigned char res1[0x10];