From patchwork Sun Mar 17 15:43:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2284181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 7FF0540AF6 for ; Sun, 17 Mar 2013 15:48:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UHFmJ-0006OR-88; Sun, 17 Mar 2013 15:45:43 +0000 Received: from mail-ee0-f49.google.com ([74.125.83.49]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UHFkc-0005Yt-PN for linux-arm-kernel@lists.infradead.org; Sun, 17 Mar 2013 15:44:00 +0000 Received: by mail-ee0-f49.google.com with SMTP id d41so2204876eek.36 for ; Sun, 17 Mar 2013 08:43:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=pWBiwXnDXq0TYe1BtNt++WEJNO3OSI2W93RoB79jkig=; b=FkREebJWmNP0K/k7Wruaaz+xRd9zkb6LeUiORtkRwneUimewrscKCl9EWK3oiyGBk3 H2ZGWH5IerDnXOSxWEwYtAjQFqrOv8zI9eZB5l+NReloHrg+OGHNywjyx33rXD4Rky4Q RjMxEueSkQqTiWLgfkoeMEDLrVaObL15kJkoVl8FnWlXjy9DkmGdADgCwXDBjby1zBfj 5uVf0pyz95QeLCYBbu1TFbbdeyT7aAZWyaXAp7QR4o02+GLa6VTQRQ1EGlSgtJ5zfASm YkIvMKjw6ewcmr2TeCxHXGziTtinxcCILlkZqVeN4ML6StDfOdH8ZGMDTQA040eE9yd0 KClg== X-Received: by 10.14.184.68 with SMTP id r44mr39331428eem.40.1363535036876; Sun, 17 Mar 2013 08:43:56 -0700 (PDT) Received: from localhost.localdomain (p4FD22CAA.dip.t-dialin.net. [79.210.44.170]) by mx.google.com with ESMTPS id r4sm21999781eeo.12.2013.03.17.08.43.55 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 08:43:56 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org Subject: [PATCH v3 7/7] ARM: mach-shmobile: r8a7740: Setup the timer CMT10 using DT Date: Sun, 17 Mar 2013 16:43:51 +0100 Message-Id: <1363535031-21402-7-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363535031-21402-1-git-send-email-hechtb+renesas@gmail.com> References: <1363535031-21402-1-git-send-email-hechtb+renesas@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130317_114359_338061_89E4F43C X-CRM114-Status: GOOD ( 12.95 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (hechtb[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Mark Rutland , Paul Mundt , Magnus Damm , Sergei Shtylyov , linux-arm-kernel@lists.infradead.org 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 We can now use the Device Tree for bringing up our timer device CMT10 on the SoC r8a7740. Signed-off-by: Bastian Hecht --- v3: same (only patch 0003 changed) arch/arm/boot/dts/r8a7740.dtsi | 11 +++++++++++ arch/arm/mach-shmobile/setup-r8a7740.c | 33 -------------------------------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index 798fa35..72f4c80 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -18,4 +18,15 @@ compatible = "arm,cortex-a9"; }; }; + + timer@e6138010 { + compatible = "renesas,cmt-timer"; + interrupt-parent = <&intca>; + reg = <0xe6138010 0xc>; + interrupts = <0x0b00>; + renesas,device-id = <1>; + renesas,channel-id = <0>; + renesas,source-quality = <3>; + renesas,event-quality = <3>; + }; }; diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 30ac79c..9db61a6 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -255,38 +255,6 @@ static struct platform_device scifb_device = { }, }; -/* CMT */ -static struct sh_timer_config cmt10_platform_data = { - .name = "CMT10", - .channel_offset = 0x10, - .timer_bit = 0, - .clockevent_rating = 125, - .clocksource_rating = 125, -}; - -static struct resource cmt10_resources[] = { - [0] = { - .name = "CMT10", - .start = 0xe6138010, - .end = 0xe613801b, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = evt2irq(0x0b00), - .flags = IORESOURCE_IRQ, - }, -}; - -static struct platform_device cmt10_device = { - .name = "sh_cmt", - .id = 10, - .dev = { - .platform_data = &cmt10_platform_data, - }, - .resource = cmt10_resources, - .num_resources = ARRAY_SIZE(cmt10_resources), -}; - /* TMU */ static struct sh_timer_config tmu00_platform_data = { .name = "TMU00", @@ -388,7 +356,6 @@ static struct platform_device *r8a7740_early_devices[] __initdata = { &scif6_device, &scif7_device, &scifb_device, - &cmt10_device, &tmu00_device, &tmu01_device, &tmu02_device,