From patchwork Wed Nov 25 08:12:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 62719 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAP8JIBn013580 for ; Wed, 25 Nov 2009 08:19:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934553AbZKYISV (ORCPT ); Wed, 25 Nov 2009 03:18:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758370AbZKYIST (ORCPT ); Wed, 25 Nov 2009 03:18:19 -0500 Received: from mail-yw0-f182.google.com ([209.85.211.182]:56547 "EHLO mail-yw0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934553AbZKYISP (ORCPT ); Wed, 25 Nov 2009 03:18:15 -0500 Received: by mail-yw0-f182.google.com with SMTP id 12so7304094ywh.21 for ; Wed, 25 Nov 2009 00:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=/aTwDWyTwuK84LLLtkhQlG0u4X/hME5Y8zdmYyjZJus=; b=lApsCwdEswxKGTS0VrL2muZ05BOf98skFD5+9tUTOh/mYBrlouDfKDYZnKm7pF/myT pMjP4QuR3+NHDHnzeyU3ZhOu5VCspg6xCIlg3ywQ4VYgt1fLCVmhtfcVTHzVO90avr4w JIE0lsZBddVzIhIsp3kSWk+zVq9PiEgaGJrrw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=GDCzMJA0GEf9K+L8ITxzZkgo1Rflbwq2ILCVtl5NpN6WPm5HYYUDeR9WPXGd1/vYlo 3I4rn6gWiSvO9yWTbePj5StlnaJ93i/u+Wj2Yu5Pcw4zQzPQh8y0XEuWLshVUZJezcWs q6wvs1IIju2+2xBFkFGVi74hT9DMhHpPJQEIQ= Received: by 10.91.161.31 with SMTP id n31mr3015038ago.29.1259137102477; Wed, 25 Nov 2009 00:18:22 -0800 (PST) Received: from rxone.opensource.se (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 6sm2783596yxg.30.2009.11.25.00.18.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 25 Nov 2009 00:18:22 -0800 (PST) From: Magnus Damm To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, linux-sh@vger.kernel.org, johnstul@us.ibm.com, lethal@linux-sh.org, Magnus Damm , tglx@linutronix.de Date: Wed, 25 Nov 2009 17:12:55 +0900 Message-Id: <20091125081255.25416.85126.sendpatchset@rxone.opensource.se> In-Reply-To: <20091125081235.25416.32481.sendpatchset@rxone.opensource.se> References: <20091125081235.25416.32481.sendpatchset@rxone.opensource.se> Subject: [PATCH 02/02] clocksource: Start CMT at clocksource resume Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org --- 0001/drivers/clocksource/sh_cmt.c +++ work/drivers/clocksource/sh_cmt.c 2009-11-25 16:02:52.000000000 +0900 @@ -432,6 +432,13 @@ static void sh_cmt_clocksource_disable(s sh_cmt_stop(cs_to_sh_cmt(cs), FLAG_CLOCKSOURCE); } +static void sh_cmt_clocksource_resume(struct clocksource *cs) +{ + struct sh_cmt_priv *p = cs_to_sh_cmt(cs); + + sh_cmt_start(p, FLAG_CLOCKSOURCE); +} + static int sh_cmt_register_clocksource(struct sh_cmt_priv *p, char *name, unsigned long rating) { @@ -442,6 +449,7 @@ static int sh_cmt_register_clocksource(s cs->read = sh_cmt_clocksource_read; cs->enable = sh_cmt_clocksource_enable; cs->disable = sh_cmt_clocksource_disable; + cs->resume = sh_cmt_clocksource_resume; cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8); cs->flags = CLOCK_SOURCE_IS_CONTINUOUS; pr_info("sh_cmt: %s used as clock source\n", cs->name);