arm: rmobile: silk: Add support SDHI

This adds GPIO configuration and initialization function of SDHI on Silk board

Signed-off-by: Vladimir Barinov <vladimir.barinov+renesas@cogentembedded.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 1838c4ba4a5b62795f6e1de0bc43f896d40ab884..021baabc657a961cad0eeeeba6663001c0207948 100644 (file)
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -20,6 +20,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <asm/arch/mmc.h>
+#include <asm/arch/sh_sdhi.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
@@ -47,6 +48,10 @@ void s_init(void)
 #define ETHER_MSTP813  (1 << 13)
 #define IIC1_MSTP323   (1 << 23)
 #define MMC0_MSTP315   (1 << 15)
+#define SDHI1_MSTP312  (1 << 12)
+
+#define SD1CKCR                0xE6150078
+#define SD1_97500KHZ   0x7
 
 int board_early_init_f(void)
 {
@@ -66,6 +71,16 @@ int board_early_init_f(void)
        /* MMC */
        mstp_clrbits_le32(MSTPSR3, SMSTPCR3, MMC0_MSTP315);
 #endif
+
+#ifdef CONFIG_SH_SDHI
+       /* SDHI1 */
+       mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SDHI1_MSTP312);
+
+       /*
+        * Set SD1 to the 97.5MHz
+        */
+       writel(SD1_97500KHZ, SD1CKCR);
+#endif
        return 0;
 }
 
@@ -139,7 +154,7 @@ int board_eth_init(bd_t *bis)
 
 int board_mmc_init(bd_t *bis)
 {
-       int ret = 0;
+       int ret = -ENODEV;
 
 #ifdef CONFIG_SH_MMCIF
        /* MMC0 */
@@ -148,6 +163,24 @@ int board_mmc_init(bd_t *bis)
 
        ret = mmcif_mmc_init();
 #endif
+
+#ifdef CONFIG_SH_SDHI
+       gpio_request(GPIO_FN_SD1_DATA0, NULL);
+       gpio_request(GPIO_FN_SD1_DATA1, NULL);
+       gpio_request(GPIO_FN_SD1_DATA2, NULL);
+       gpio_request(GPIO_FN_SD1_DATA3, NULL);
+       gpio_request(GPIO_FN_SD1_CLK, NULL);
+       gpio_request(GPIO_FN_SD1_CMD, NULL);
+       gpio_request(GPIO_FN_SD1_CD, NULL);
+
+       /* SDHI 1 */
+       gpio_request(GPIO_GP_4_26, NULL);
+       gpio_request(GPIO_GP_4_29, NULL);
+       gpio_direction_output(GPIO_GP_4_26, 1);
+       gpio_direction_output(GPIO_GP_4_29, 1);
+
+       ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI1_BASE, 1, 0);
+#endif
        return ret;
 }
 

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 3130e93e25589cc3c1295bbdac28c68ebb3106f2..23d4f5849cd38bce98d87f47e62c9ec7aa098397 100644 (file)
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -3,3 +3,4 @@ CONFIG_RMOBILE=y
 CONFIG_TARGET_SILK=y
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
+CONFIG_SH_SDHI=y

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 00a3158d3b2996c32bcdff8d21496d56e28bb11f..161e0a5e2690d59e1dbff1c850e6617b882e5059 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -101,6 +101,9 @@
 #define CONFIG_SH_MMCIF_ADDR   0xee200000
 #define CONFIG_SH_MMCIF_CLK    48000000
 
+/* SDHI */
+#define CONFIG_SH_SDHI_FREQ    97500000
+
 /* Module stop status bits */
 /* INTC-RT */
 #define CONFIG_SMSTP0_ENA      0x00400000