From patchwork Thu Apr 4 16:37:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2394041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 10D4CDF25A for ; Thu, 4 Apr 2013 16:39:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UNnCc-0001qM-6w for patchwork-linux-arm@patchwork.kernel.org; Thu, 04 Apr 2013 16:39:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UNnBM-0003Hs-QS; Thu, 04 Apr 2013 16:38:36 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UNnAv-0002tO-9z for linux-arm-kernel@lists.infradead.org; Thu, 04 Apr 2013 16:38:10 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKQ00MG5OVKXAA0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2013 01:38:08 +0900 (KST) X-AuditID: cbfee61b-b7f076d0000034b6-5b-515dac6fc346 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 39.FA.13494.F6CAD515; Fri, 05 Apr 2013 01:38:08 +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:38:07 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 03/14] clocksource: samsung-time: Use local register definitions Date: Thu, 04 Apr 2013 18:37:00 +0200 Message-id: <1365093431-30621-4-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: H4sIAAAAAAAAAzWRa0hTcRjG+2/ntungOC1PGhXDJCztQuAfCulCcCCT7CIliE09qeV0bCrZ zaUWuFR0NJWs4RXcWIkzNUeztrLwuqk0o5yiklpTU1Z2mc7cpG+/93l+L++Hl2Dz1UgAkZqe yUjShWkCjIv0uqbIULE2Lnr/Qj4OVxXvcGiYdwHoqurB4CfHJA6b1UsYfF01gcKuogi4NmlH Ye+QFUDjswYU9jlDYXH1Bww2tloQ2J83h0PdlBWFleZOFvw8zIPOtrsIfPrWhsOGkUEWHFLl IfDX8jIGex+gUOXoYMGmSjsCW3RKNtToV8DRQFqr0gK6IL8Io51/FYDueGTD6VHrS4xeGBjA aVV3NN1Sn0ubK2sA/bXMidElzzWANs8pEbrdqmLT5XYzRjt022n7xypwhozlHkli0lKzGcm+ iMvclLbfSlxcT17XqzpYMjDBkwMOQZGHqInan/gGb6EsY02YHHAJPlkLKKu9Fd0Y5CxqcPYP cFsYGUw5ZJOYm/3I3dRD+ZRnm00WopS+ws/NvuQFarxJyXIzQu6ibLOlHp9HHqc0/eXoxrUd 1JfxEk/OIU9Qa/2LHp+/7tx3mkAp4FWDTRqwmREniqUJyaKDYVKhSJqVnhyWmCHSAc8DpwNf AI0MmgBJAIE3L6UkLpqPCrOlOSIToAi2wI/XVbAe8ZKEOTcYSUa8JCuNkZpAIIEI/HnGe4ej +WSyMJO5xjBiRvK/ZRGcABk41aiNn+4U4K2nFZtiM30S6tsjsyTBxSHqyJ6hK3pyz8xCFLtO v6LBusNr9r4xhAUtLY4331KPUU8sr/K2Oh/7np25fVXvtVrI6iv2ZyrC52N+jFoTjSe/Kb2M MceGXZz3Ksu2XEPUxfN43feboT6mS8adI96GMsW5rjtGW1CnAJGmCA+EsCVS4T9UoNukvAIA AA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130404_123809_601147_DED0A635 X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] 1.7 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -2.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: mark.rutland@arm.com, heiko@sntech.de, Tomasz Figa , tomasz.figa@gmail.com, buserror@gmail.com, jacmet@sunsite.dk, augulis.darius@gmail.com, christer@weinigel.se, sylvester.nawrocki@gmail.com, m.szyprowski@samsung.com, kgene.kim@samsung.com, linux@arm.linux.org.uk, sameo@linux.intel.com, kwangwoo.lee@gmail.com, mcuelenaere@gmail.com, arnd@arndb.de, devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org, john.stultz@linaro.org, ghcstop@gmail.com, linux@simtec.co.uk, broonie@opensource.wolfsonmicro.com, jekhor@gmail.com, kyungmin.park@samsung.com, tglx@linutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch copies PWM timer register definitions to samsung-time.c. The original header in plat is being kept for now, since it is also used by other code that also needs to be reworked to be multiplatform-friendly. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- drivers/clocksource/samsung-time.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/samsung-time.c b/drivers/clocksource/samsung-time.c index d4d7e3e..bccc291 100644 --- a/drivers/clocksource/samsung-time.c +++ b/drivers/clocksource/samsung-time.c @@ -24,9 +24,43 @@ #include #include -#include #include +#define S3C_TIMERREG(x) (S3C_VA_TIMER + (x)) +#define S3C_TIMERREG2(tmr,reg) S3C_TIMERREG((reg)+0x0c+((tmr)*0x0c)) + +#define S3C2410_TCON S3C_TIMERREG(0x08) +#define S3C64XX_TINT_CSTAT S3C_TIMERREG(0x44) + +/* for each timer, we have an count buffer, an compare buffer and + * an observation buffer +*/ + +/* WARNING - timer 4 has no buffer reg, and it's observation is at +4 */ + +#define S3C2410_TCNTB(tmr) S3C_TIMERREG2(tmr, 0x00) +#define S3C2410_TCMPB(tmr) S3C_TIMERREG2(tmr, 0x04) + +#define S3C2410_TCON_T4RELOAD (1<<22) +#define S3C2410_TCON_T4MANUALUPD (1<<21) +#define S3C2410_TCON_T4START (1<<20) + +#define S3C2410_TCON_T3RELOAD (1<<19) +#define S3C2410_TCON_T3MANUALUPD (1<<17) +#define S3C2410_TCON_T3START (1<<16) + +#define S3C2410_TCON_T2RELOAD (1<<15) +#define S3C2410_TCON_T2MANUALUPD (1<<13) +#define S3C2410_TCON_T2START (1<<12) + +#define S3C2410_TCON_T1RELOAD (1<<11) +#define S3C2410_TCON_T1MANUALUPD (1<<9) +#define S3C2410_TCON_T1START (1<<8) + +#define S3C2410_TCON_T0RELOAD (1<<3) +#define S3C2410_TCON_T0MANUALUPD (1<<1) +#define S3C2410_TCON_T0START (1<<0) + static struct clk *tin_event; static struct clk *tin_source; static struct clk *tdiv_event;