From 667d13fbfa0cc75eafcb3fb6d764b91bf07be9f8 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 15 Sep 2017 21:12:18 +0200 Subject: [PATCH] ARM: rmobile: Remove SD clock configuration from board files The configuration is now fully performed by the SD and clk drivers, so remove it from the board file. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/salvator-x/salvator-x.c | 18 ------------------ board/renesas/ulcb/ulcb.c | 17 ----------------- 2 files changed, 35 deletions(-) diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 37fcbbd448..9718a49d59 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -51,17 +51,8 @@ void s_init(void) #define SCIF2_MSTP310 BIT(10) /* SCIF2 */ #define ETHERAVB_MSTP812 BIT(12) #define DVFS_MSTP926 BIT(26) -#define SD0_MSTP314 BIT(14) -#define SD1_MSTP313 BIT(13) -#define SD2_MSTP312 BIT(12) /* either MMC0 */ -#define SD3_MSTP311 BIT(11) /* either MMC1 */ #define HSUSB_MSTP704 BIT(4) /* HSUSB */ -#define SD0CKCR 0xE6150074 -#define SD1CKCR 0xE6150078 -#define SD2CKCR 0xE6150268 -#define SD3CKCR 0xE615026C - int board_early_init_f(void) { /* TMU0,1 */ /* which use ? */ @@ -70,15 +61,6 @@ int board_early_init_f(void) mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SCIF2_MSTP310); /* EHTERAVB */ mstp_clrbits_le32(MSTPSR8, SMSTPCR8, ETHERAVB_MSTP812); - /* eMMC */ - mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD1_MSTP313 | SD2_MSTP312); - /* SDHI0, 3 */ - mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD0_MSTP314 | SD3_MSTP311); - - writel(1, SD0CKCR); - writel(1, SD1CKCR); - writel(1, SD2CKCR); - writel(1, SD3CKCR); #if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH) /* DVFS for reset */ diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 578b14be7b..522fecee53 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -50,16 +50,8 @@ void s_init(void) #define SCIF2_MSTP310 BIT(10) /* SCIF2 */ #define ETHERAVB_MSTP812 BIT(12) #define DVFS_MSTP926 BIT(26) -#define SD0_MSTP314 BIT(14) -#define SD1_MSTP313 BIT(13) -#define SD2_MSTP312 BIT(12) /* either MMC0 */ #define HSUSB_MSTP704 BIT(4) /* HSUSB */ -#define SD0CKCR 0xE6150074 -#define SD1CKCR 0xE6150078 -#define SD2CKCR 0xE6150268 -#define SD3CKCR 0xE615026C - int board_early_init_f(void) { /* TMU0,1 */ /* which use ? */ @@ -68,15 +60,6 @@ int board_early_init_f(void) mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SCIF2_MSTP310); /* EHTERAVB */ mstp_clrbits_le32(MSTPSR8, SMSTPCR8, ETHERAVB_MSTP812); - /* eMMC */ - mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD1_MSTP313 | SD2_MSTP312); - /* SDHI0 */ - mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD0_MSTP314); - - writel(1, SD0CKCR); - writel(1, SD1CKCR); - writel(1, SD2CKCR); - writel(1, SD3CKCR); #if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH) /* DVFS for reset */ -- 2.25.1