[PATCH 4/4] ARM: shmobile: marzen: Use disabled variant of clock workaround for scif devices

Simon Horman
2014-04-29T07:43:26Z

Now that SCIF devices are initialised using DT it should
be sufficient to use the disabled variant of the clock workaround.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 6d34baf..1f14d80 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -40,12 +40,6 @@ static void __init marzen_init_timer(void)
* devices until they get moved to DT.
*/
static const struct clk_name clk_names[] __initconst = {
- { "scif0", NULL, "sh-sci.0" },
- { "scif1", NULL, "sh-sci.1" },
- { "scif2", NULL, "sh-sci.2" },
- { "scif3", NULL, "sh-sci.3" },
- { "scif4", NULL, "sh-sci.4" },
- { "scif5", NULL, "sh-sci.5" },
{ "tmu0", NULL, "sh_tmu.0" },
{ "tmu1", NULL, "sh_tmu.1" },
{ "tmu2", NULL, "sh_tmu.2" },
@@ -55,6 +49,12 @@ static const struct clk_name clk_names[] __initconst = {
* This is a really crude hack to work around core platform clock issues
*/
static const struct clk_name clk_enables[] __initconst = {
+ { "scif0", NULL, "sh-sci.0" },
+ { "scif1", NULL, "sh-sci.1" },
+ { "scif2", NULL, "sh-sci.2" },
+ { "scif3", NULL, "sh-sci.3" },
+ { "scif4", NULL, "sh-sci.4" },
+ { "scif5", NULL, "sh-sci.5" },
{ "sdhi0", NULL, "ffe4c000.sd" },
{ "thermal", NULL, "ffc48000.thermal" },
};
--
1.8.5.2