aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-11 02:35:34 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 03:24:21 -0500
commit79990c164dcc7514398ca824a609c74cb5f563da (patch)
treeeb6e03c1e1d0d4ea77665f28921b29e5e639f7f6 /arch/arm
parentb6d3eba338b4a24e49947fc45542fca7b76dda9a (diff)
ARM: shmobile: bockw: add pin pull-up setting for SDHI
SDHI CD/WP pin needs pull-up Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/board-bockw-reference.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
index c7b217d4d1c1..6586f5c40af2 100644
--- a/arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -38,9 +38,13 @@ static const struct pinctrl_map bockw_pinctrl_map[] = {
38#define FPGA 0x18200000 38#define FPGA 0x18200000
39#define IRQ0MR 0x30 39#define IRQ0MR 0x30
40#define COMCTLR 0x101c 40#define COMCTLR 0x101c
41
42#define PFC 0xfffc0000
43#define PUPR4 0x110
41static void __init bockw_init(void) 44static void __init bockw_init(void)
42{ 45{
43 void __iomem *fpga; 46 void __iomem *fpga;
47 void __iomem *pfc;
44 48
45 r8a7778_clock_init(); 49 r8a7778_clock_init();
46 r8a7778_init_irq_extpin_dt(1); 50 r8a7778_init_irq_extpin_dt(1);
@@ -66,6 +70,17 @@ static void __init bockw_init(void)
66 iounmap(fpga); 70 iounmap(fpga);
67 } 71 }
68 72
73 pfc = ioremap_nocache(PFC, 0x200);
74 if (pfc) {
75 /*
76 * FIXME
77 *
78 * SDHI CD/WP pin needs pull-up
79 */
80 iowrite32(ioread32(pfc + PUPR4) | (3 << 26), pfc + PUPR4);
81 iounmap(pfc);
82 }
83
69 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 84 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
70} 85}
71 86