diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-07-10 04:11:57 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-07-10 04:11:57 -0400 |
commit | a41b64665a79b8be980d450f6e5b9354d7511700 (patch) | |
tree | 5975e1edf38bde5155ca89967a6240ee5cc3543a /arch/arm | |
parent | c47586b6d36ef2d5d7dc39afc44b75e31bc1a671 (diff) |
ARM: mach-shmobile: sh7372: make sure that fsi is peripheral of spu2
FSI act as peripheral circuits of the SPU2.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/clock-sh7372.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index a26f895cdc89..4226db6a0b8b 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -1414,6 +1414,7 @@ static void __init ap4evb_init(void) | |||
1414 | hdmi_init_pm_clock(); | 1414 | hdmi_init_pm_clock(); |
1415 | fsi_init_pm_clock(); | 1415 | fsi_init_pm_clock(); |
1416 | sh7372_pm_init(); | 1416 | sh7372_pm_init(); |
1417 | pm_clk_add(&fsi_device.dev, "spu2"); | ||
1417 | } | 1418 | } |
1418 | 1419 | ||
1419 | static void __init ap4evb_timer_init(void) | 1420 | static void __init ap4evb_timer_init(void) |
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index cc1ccd899cde..362b88308741 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -1587,6 +1587,7 @@ static void __init mackerel_init(void) | |||
1587 | 1587 | ||
1588 | hdmi_init_pm_clock(); | 1588 | hdmi_init_pm_clock(); |
1589 | sh7372_pm_init(); | 1589 | sh7372_pm_init(); |
1590 | pm_clk_add(&fsi_device.dev, "spu2"); | ||
1590 | } | 1591 | } |
1591 | 1592 | ||
1592 | static void __init mackerel_timer_init(void) | 1593 | static void __init mackerel_timer_init(void) |
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c index c0800d83971e..91f5779abdd3 100644 --- a/arch/arm/mach-shmobile/clock-sh7372.c +++ b/arch/arm/mach-shmobile/clock-sh7372.c | |||
@@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = { | |||
662 | CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]), | 662 | CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]), |
663 | CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]), | 663 | CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]), |
664 | CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]), | 664 | CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]), |
665 | CLKDEV_ICK_ID("spu2", "sh_fsi2", &mstp_clks[MSTP223]), | ||
665 | }; | 666 | }; |
666 | 667 | ||
667 | void __init sh7372_clock_init(void) | 668 | void __init sh7372_clock_init(void) |