| From 7629d6863509b356b8632e587f8d89607a53e338 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Tue, 19 Nov 2013 01:05:33 -0800 |
| Subject: ARM: shmobile: sh7372: tidyup clock table order |
| |
| SuperH lookups clock is using CLKDEV_CON/DEV/ICK_ID() macro |
| for a long term. |
| But in these days, the ICK clock is defined in random place. |
| This patch arranges it. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 8af3f18b7b42e32387b54d2e2f8300589b0198e9) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-sh7372.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c |
| index 5390c6bbbc02..28489978b09c 100644 |
| --- a/arch/arm/mach-shmobile/clock-sh7372.c |
| +++ b/arch/arm/mach-shmobile/clock-sh7372.c |
| @@ -504,10 +504,6 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_CON_ID("spu_clk", &div6_clks[DIV6_SPU]), |
| CLKDEV_CON_ID("vou_clk", &div6_clks[DIV6_VOU]), |
| CLKDEV_CON_ID("hdmi_clk", &div6_reparent_clks[DIV6_HDMI]), |
| - CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]), |
| - CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]), |
| - CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]), |
| - CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]), |
| |
| /* MSTP32 clocks */ |
| CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* IIC2 */ |
| @@ -574,6 +570,11 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */ |
| CLKDEV_DEV_ID("sh_cmt.2", &mstp_clks[MSTP400]), /* CMT2 */ |
| |
| + /* ICK */ |
| + CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]), |
| + CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]), |
| + CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]), |
| + CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]), |
| CLKDEV_ICK_ID("hdmi", "sh_mobile_lcdc_fb.1", |
| &div6_reparent_clks[DIV6_HDMI]), |
| CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]), |
| -- |
| 1.8.5.rc3 |
| |
