ARM: rmobile: Drop SDHI address macros from Gen3

Since the RCar Gen3 no longer uses the SH SDHI driver, but rather
uses the Matsushita SD driver, which loads all the properties from
device tree, these macros are no longer used, remove them.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/mach-rmobile/include/mach/r8a7795.h b/arch/arm/mach-rmobile/include/mach/r8a7795.h
index 2d004b6a540a561b4a64bcdaa633420f83c2bb69..23e4399479108febfedd1f90350894951a49a8b3 100644 (file)
--- a/arch/arm/mach-rmobile/include/mach/r8a7795.h
+++ b/arch/arm/mach-rmobile/include/mach/r8a7795.h
@@ -26,11 +26,4 @@
 #define MSTP10_BITS    0xFFFEFFE0
 #define MSTP11_BITS    0x00000000
 
-/* SDHI */
-#define CONFIG_SYS_SH_SDHI0_BASE 0xEE100000
-#define CONFIG_SYS_SH_SDHI1_BASE 0xEE120000
-#define CONFIG_SYS_SH_SDHI2_BASE 0xEE140000    /* either MMC0 */
-#define CONFIG_SYS_SH_SDHI3_BASE 0xEE160000    /* either MMC1 */
-#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 4
-
 #endif /* __ASM_ARCH_R8A7795_H */

diff --git a/arch/arm/mach-rmobile/include/mach/r8a7796.h b/arch/arm/mach-rmobile/include/mach/r8a7796.h
index dab60820124dac4e1eb2e54eb5d512cc7ba56556..67e24bcf98010c2f95d2b23253c6ff1f33a889ec 100644 (file)
--- a/arch/arm/mach-rmobile/include/mach/r8a7796.h
+++ b/arch/arm/mach-rmobile/include/mach/r8a7796.h
@@ -26,11 +26,4 @@
 #define MSTP10_BITS    0xFFFEFFE0
 #define MSTP11_BITS    0x000000B7
 
-/* SDHI */
-#define CONFIG_SYS_SH_SDHI0_BASE 0xEE100000
-#define CONFIG_SYS_SH_SDHI1_BASE 0xEE120000
-#define CONFIG_SYS_SH_SDHI2_BASE 0xEE140000    /* either MMC0 */
-#define CONFIG_SYS_SH_SDHI3_BASE 0xEE160000    /* either MMC1 */
-#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 4
-
 #endif /* __ASM_ARCH_R8A7796_H */

diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
index 39726355e67c9341853626cf865f0dbb22c41a92..507859342c167d72e119568afe17ffee6eb2e1a0 100644 (file)
--- a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
+++ b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
@@ -68,12 +68,6 @@
 #define SMSTPCR10              0xE6150998
 #define SMSTPCR11              0xE615099C
 
-/* SDHI */
-#define CONFIG_SYS_SH_SDHI0_BASE       0xEE100000
-#define CONFIG_SYS_SH_SDHI1_BASE       0xEE120000
-#define CONFIG_SYS_SH_SDHI2_BASE       0xEE140000
-#define CONFIG_SYS_SH_SDHI3_BASE       0xEE160000
-
 /* PFC */
 #define PFC_PUEN5      0xE6060414
 #define PUEN_SSI_SDATA4        BIT(17)