aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-04 02:30:19 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-03-12 13:13:22 -0400
commit195f96220143dc2672bfb84db9aad3ee536a6c98 (patch)
treeb7892003332ca60ffd9b43e5df8b91cf5e7c70f5
parentdbe95ad00b95a8baaedd87ce84996d95e5811055 (diff)
ARM: shmobile: tidyup chip series definition order for r8a7740/r8a7779
move r8a7740_meram_workaround() to r8a7740 area from r8a7779 area Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/include/mach/common.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index 1ca1ad938d19..86fcdf9fde1b 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -50,6 +50,7 @@ extern struct clk sh73a0_extal2_clk;
50extern struct clk sh73a0_extcki_clk; 50extern struct clk sh73a0_extcki_clk;
51extern struct clk sh73a0_extalr_clk; 51extern struct clk sh73a0_extalr_clk;
52 52
53extern void r8a7740_meram_workaround(void);
53extern void r8a7740_init_irq(void); 54extern void r8a7740_init_irq(void);
54extern void r8a7740_map_io(void); 55extern void r8a7740_map_io(void);
55extern void r8a7740_add_early_devices(void); 56extern void r8a7740_add_early_devices(void);
@@ -69,8 +70,6 @@ extern void r8a7779_add_standard_devices_dt(void);
69extern void r8a7779_clock_init(void); 70extern void r8a7779_clock_init(void);
70extern void r8a7779_pinmux_init(void); 71extern void r8a7779_pinmux_init(void);
71extern void r8a7779_pm_init(void); 72extern void r8a7779_pm_init(void);
72extern void r8a7740_meram_workaround(void);
73
74extern void r8a7779_register_twd(void); 73extern void r8a7779_register_twd(void);
75 74
76#ifdef CONFIG_SUSPEND 75#ifdef CONFIG_SUSPEND