From: Simon Horman Date: Thu, 15 May 2014 11:39:33 +0000 (+0900) Subject: ARM: shmobile: marzen: Do not use workaround for scif devices X-Git-Tag: v3.17-rc1~79^2~35^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1a0f9932b66b2298163c31f8ac3f2844476e1c2;p=thirdparty%2Fkernel%2Flinux.git ARM: shmobile: marzen: Do not use workaround for scif devices Now that SCIF devices are initialised using DT it should not be necessary to use the work around to provide clocks any more. Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c index bb2df32f597ad..0a000b74ac6dc 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", "fck", "sh-tmu.0" }, };