From 2766ca3dcc0a3fb76436d08c1ee240defc675e63 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Sun, 10 Jul 2011 10:11:57 +0200 Subject: [PATCH] --- yaml --- r: 256934 b: refs/heads/master c: a41b64665a79b8be980d450f6e5b9354d7511700 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 1 + trunk/arch/arm/mach-shmobile/board-mackerel.c | 1 + trunk/arch/arm/mach-shmobile/clock-sh7372.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 201152984e7c..edb9437779f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c47586b6d36ef2d5d7dc39afc44b75e31bc1a671 +refs/heads/master: a41b64665a79b8be980d450f6e5b9354d7511700 diff --git a/trunk/arch/arm/mach-shmobile/board-ap4evb.c b/trunk/arch/arm/mach-shmobile/board-ap4evb.c index a26f895cdc89..4226db6a0b8b 100644 --- a/trunk/arch/arm/mach-shmobile/board-ap4evb.c +++ b/trunk/arch/arm/mach-shmobile/board-ap4evb.c @@ -1414,6 +1414,7 @@ static void __init ap4evb_init(void) hdmi_init_pm_clock(); fsi_init_pm_clock(); sh7372_pm_init(); + pm_clk_add(&fsi_device.dev, "spu2"); } static void __init ap4evb_timer_init(void) diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c index cc1ccd899cde..362b88308741 100644 --- a/trunk/arch/arm/mach-shmobile/board-mackerel.c +++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c @@ -1587,6 +1587,7 @@ static void __init mackerel_init(void) hdmi_init_pm_clock(); sh7372_pm_init(); + pm_clk_add(&fsi_device.dev, "spu2"); } static void __init mackerel_timer_init(void) diff --git a/trunk/arch/arm/mach-shmobile/clock-sh7372.c b/trunk/arch/arm/mach-shmobile/clock-sh7372.c index c0800d83971e..91f5779abdd3 100644 --- a/trunk/arch/arm/mach-shmobile/clock-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/clock-sh7372.c @@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = { CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]), CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]), CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]), + CLKDEV_ICK_ID("spu2", "sh_fsi2", &mstp_clks[MSTP223]), }; void __init sh7372_clock_init(void)