From patchwork Thu Apr 4 16:37:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2394011 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D82CD3FD8C for ; Thu, 4 Apr 2013 16:39:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763071Ab3DDQj3 (ORCPT ); Thu, 4 Apr 2013 12:39:29 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:28340 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762468Ab3DDQj3 (ORCPT ); Thu, 4 Apr 2013 12:39:29 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKQ005UKOXPDM60@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 05 Apr 2013 01:39:28 +0900 (KST) X-AuditID: cbfee61a-b7fa86d0000045ae-8e-515dacbfd910 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A2.98.17838.FBCAD515; Fri, 05 Apr 2013 01:39:27 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MKQ00F2OOU1P170@mmp1.samsung.com>; Fri, 05 Apr 2013 01:39:27 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Cc: devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org, sameo@linux.intel.com, kgene.kim@samsung.com, kyungmin.park@samsung.com, linux@simtec.co.uk, broonie@opensource.wolfsonmicro.com, kwangwoo.lee@gmail.com, jacmet@sunsite.dk, augulis.darius@gmail.com, mcuelenaere@gmail.com, linux@arm.linux.org.uk, sylvester.nawrocki@gmail.com, buserror@gmail.com, christer@weinigel.se, jekhor@gmail.com, ghcstop@gmail.com, mark.rutland@arm.com, tomasz.figa@gmail.com, heiko@sntech.de, robherring2@gmail.com, m.szyprowski@samsung.com, arnd@arndb.de, john.stultz@linaro.org, tglx@linutronix.de, Tomasz Figa Subject: [PATCH v4 11/14] clocksource: samsung-time: Use clk_prepare_enable Date: Thu, 04 Apr 2013 18:37:08 +0200 Message-id: <1365093431-30621-12-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1365093431-30621-1-git-send-email-t.figa@samsung.com> References: <1365093431-30621-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWRXUxScQDF+18u9yKL7Y6w7nTVxtI1S8ty65+WNnq5mz3Ias1crkjv0CVI 4EfwEprZJL+nZTlJLZ04zUKkdGqI2ipR/FjkKmuBHxmmNDZaUpjgevvtnLNzHg6LwW1FQ1iZ 0hxaLhVl8TE2OuZzEJEvO1KFh4ebY+Df6lc4HPjhA9BX/xaDH9x2HD7T/cSgqf4rE46WxsMN u5MJx6ZtAA49aWFCizcSljW+w2BbzyQKxwtXcKh32JiwzjqIwI8zHOg1FqCwc2QOhy3vpxA4 rS1E4S+PB4Njd5hQ6+5FYFedE4Xd+loGbO/7A06FUh3aDkAV3SzFKO96NaB6H8zh1CdbP0at TkzglPaNkOp+fIOy1jUBarnKi1HlhnZAWVdqUeq5Tcug7jqtGOXW76Gcs/UgiUhhn0inszLz aPmh+MvsjPGmSNkCdv1+jUANHEwNCGKRRAzZWuJgbPFOcvJzF+ZnLtEMyJmpXA1gb7IGIX3O WcRvYEQ46VbbAyEesZ+s0ThwPzOIEibZd4/n5x1EIllhrAzkUSKM7DY2Az9ziNNkWWcZvjW2 l1z4Uh7oCdrUN8ZdyNawgCz2mkEl4DSCbe0gmJalyRRXxJLoKIVIosiViqPSsiV6EHhvMeQF 0KmhGRAswN/OyShPFXKZojyFUmIGJIvB53FGizYlTrpIqaLl2ZfkuVm0wgxCWSh/F8d0K07I JcSiHPoqTcto+X8XYQWFqMFAMmNerULOrq+edz06OaEFDcHDIieIizUJHvLc8n06q9HAKrY0 ILIqPNbA6zm4OyXxdcLQrHRtamn+2vLI0QtL3+GZ265zyZa1A/nfErIL+iRtF497iiJUg5L+ ZI3umCXMpfSYeh6plGi4qmC14oihViCWPc3/bU+aTFrko4oMUXQEQ64Q/QN1JWKsuQIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch modifies the driver to use clk_prepare_enable instead of clk_enable, as required to be compliant with Common Clock Framework. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- drivers/clocksource/samsung-time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/samsung-time.c b/drivers/clocksource/samsung-time.c index e617d37..7674882 100644 --- a/drivers/clocksource/samsung-time.c +++ b/drivers/clocksource/samsung-time.c @@ -383,7 +383,7 @@ static void __init samsung_timer_resources(void) if (IS_ERR(timerclk)) panic("failed to get timers clock for timer"); - clk_enable(tin_source); + clk_prepare_enable(timerclk); timer_source.tcnt_max = (1UL << pwm->variant.bits) - 1; if (pwm->variant.bits == 16) {