From 46831c1a4cda75d92f7ad18d4e2b1eb196c62b2f Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Mon, 17 Apr 2017 08:09:37 -0500 Subject: omap_hsmmc: update struct hsmmc to accommodate omap3 from DT This patch changes the way DM_MMC calculates offset to the base register of MMC. Previously this was through an #ifdef but that wasn't necessary for OMAP3. This patch will now add in the offset to the base address based on the .compatible flags. Signed-off-by: Adam Ford V2: Remove ifdef completely and reference offset from the omap_hsmmc_ids table. V1: Change ifdef to ignore OMAP3 Reviewed-by: Lokesh Vutla Reviewed-by: Simon Glass --- arch/arm/include/asm/omap_mmc.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch') diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h index f2bf645b33b..93e003a368f 100644 --- a/arch/arm/include/asm/omap_mmc.h +++ b/arch/arm/include/asm/omap_mmc.h @@ -26,9 +26,6 @@ #define OMAP_MMC_H_ struct hsmmc { -#ifdef CONFIG_DM_MMC - unsigned char res0[0x100]; -#endif unsigned char res1[0x10]; unsigned int sysconfig; /* 0x10 */ unsigned int sysstatus; /* 0x14 */ -- cgit v1.3.1