From 0a35914fbc29584fba95ba68a7eca74322580c7c Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Fri, 27 Nov 2009 05:16:21 +0000 Subject: [PATCH] --- yaml --- r: 173505 b: refs/heads/master c: 2ebe0ff7e669e7d5fc51c2add74dd71692d7bc8d h: refs/heads/master i: 173503: db816d3cca89c8e6e4958f8684495535dbc5c654 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bce3cd665886..a739c2e5e961 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98779ad8226c6f6e301fa186c07247e78c6f7253 +refs/heads/master: 2ebe0ff7e669e7d5fc51c2add74dd71692d7bc8d diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c index 9c3cc8f638b6..16e18749ac1b 100644 --- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c +++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c @@ -941,6 +941,9 @@ static struct { /* RWDT */ unsigned short rwtcnt; unsigned short rwtcsr; + /* CPG */ + unsigned long irdaclk; + unsigned long spuclk; } sh7724_rstandby_state; static int sh7724_pre_sleep_notifier_call(struct notifier_block *nb, @@ -998,6 +1001,10 @@ static int sh7724_pre_sleep_notifier_call(struct notifier_block *nb, sh7724_rstandby_state.rwtcsr |= 0xa500; __raw_writew(sh7724_rstandby_state.rwtcsr & 0x07, 0xa4520004); + /* CPG */ + sh7724_rstandby_state.irdaclk = __raw_readl(0xa4150018); /* IRDACLKCR */ + sh7724_rstandby_state.spuclk = __raw_readl(0xa415003c); /* SPUCLKCR */ + return NOTIFY_DONE; } @@ -1052,6 +1059,10 @@ static int sh7724_post_sleep_notifier_call(struct notifier_block *nb, __raw_writew(sh7724_rstandby_state.rwtcnt, 0xa4520000); /* RWTCNT */ __raw_writew(sh7724_rstandby_state.rwtcsr, 0xa4520004); /* RWTCSR */ + /* CPG */ + __raw_writel(sh7724_rstandby_state.irdaclk, 0xa4150018); /* IRDACLKCR */ + __raw_writel(sh7724_rstandby_state.spuclk, 0xa415003c); /* SPUCLKCR */ + return NOTIFY_DONE; }