| From c366a4885dfd784d89f01a7cd6d5ad5ba8a133af Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 17 Apr 2013 05:17:56 +0000 |
| Subject: ARM: shmobile: bockw: add SDHI0 support |
| |
| This patch is directly accessing to PUPR4 register which can |
| control SDHI0 CD/WP pin pull-up setting. |
| It should be replaced in the future. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit ca7bb309485e4ec89a9addd47beaa1d079841b7d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bockw.c | 29 +++++++++++++++++++++++++++++ |
| 1 file changed, 29 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c |
| index 4d657159..2b6103e5 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw.c |
| +++ b/arch/arm/mach-shmobile/board-bockw.c |
| @@ -18,6 +18,8 @@ |
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| */ |
| |
| +#include <linux/mfd/tmio.h> |
| +#include <linux/mmc/host.h> |
| #include <linux/pinctrl/machine.h> |
| #include <linux/platform_device.h> |
| #include <linux/regulator/fixed.h> |
| @@ -54,16 +56,28 @@ static struct resource smsc911x_resources[] = { |
| DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */ |
| }; |
| |
| +/* SDHI */ |
| +static struct sh_mobile_sdhi_info sdhi0_info = { |
| + .tmio_caps = MMC_CAP_SD_HIGHSPEED, |
| + .tmio_ocr_mask = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34, |
| + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, |
| +}; |
| + |
| static const struct pinctrl_map bockw_pinctrl_map[] = { |
| /* SCIF0 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778", |
| "scif0_data_a", "scif0"), |
| PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778", |
| "scif0_ctrl", "scif0"), |
| + /* SDHI0 */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", |
| + "sdhi0", "sdhi0"), |
| }; |
| |
| #define FPGA 0x18200000 |
| #define IRQ0MR 0x30 |
| +#define PFC 0xfffc0000 |
| +#define PUPR4 0x110 |
| static void __init bockw_init(void) |
| { |
| void __iomem *base; |
| @@ -76,6 +90,7 @@ static void __init bockw_init(void) |
| ARRAY_SIZE(bockw_pinctrl_map)); |
| r8a7778_pinmux_init(); |
| |
| + /* for SMSC */ |
| base = ioremap_nocache(FPGA, SZ_1M); |
| if (base) { |
| /* |
| @@ -98,6 +113,20 @@ static void __init bockw_init(void) |
| smsc911x_resources, ARRAY_SIZE(smsc911x_resources), |
| &smsc911x_data, sizeof(smsc911x_data)); |
| } |
| + |
| + /* for SDHI */ |
| + base = ioremap_nocache(PFC, 0x200); |
| + if (base) { |
| + /* |
| + * FIXME |
| + * |
| + * SDHI CD/WP pin needs pull-up |
| + */ |
| + iowrite32(ioread32(base + PUPR4) | (3 << 26), base + PUPR4); |
| + iounmap(base); |
| + |
| + r8a7778_sdhi_init(0, &sdhi0_info); |
| + } |
| } |
| |
| static const char *bockw_boards_compat_dt[] __initdata = { |
| -- |
| 1.8.4.3.gca3854a |
| |