From patchwork Tue May 11 09:36:32 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Magnus Damm <magnus.damm@gmail.com>
X-Patchwork-Id: 98672
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4B9YQFT007399
	for <patchwork-sh@patchwork.kernel.org>; Tue, 11 May 2010 09:35:21 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932359Ab0EKJfU (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Tue, 11 May 2010 05:35:20 -0400
Received: from mail-px0-f174.google.com ([209.85.212.174]:38941 "EHLO
	mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1757724Ab0EKJfT (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Tue, 11 May 2010 05:35:19 -0400
Received: by mail-px0-f174.google.com with SMTP id 5so2114444pxi.19
	for <linux-sh@vger.kernel.org>; Tue, 11 May 2010 02:35:19 -0700 (PDT)
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=77AsBeevPB1YsvXmWYJ68geqkPm7i5VArvTpTgGzBnE=;
	b=EwvpD1jY8qcJixn4xvDHT1AGSLJvY1h16GePJRotkxgA7Z8ZuSU64wmLqKm/UlnQaI
	dcZu5ZXmz3E1gLatpcojUEv6zQGLQFqSn9Q1EDshdpcEpbdRUyX7sFsPtiyBRAO4ZzmM
	UWsHD0Hw5VM/WsKdvGQ7ruPeFbaNNdssFRQes=
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=rq1DnOZbmgulR9/SA2bX6FPIPOHf2BAdUqbORNN5BxYK7RvbtL7TuAvi8PhGS8n2Hp
	+tWG1Rky9l9Up6Lo6Qkx6MWzgmg/2mhRpftsHN7reoNjJrnW2DU/40bHTNS8eQ+3h+01
	UiiOlmThCtAKp8K6mFIod07fljTYRRlCVcL/s=
Received: by 10.114.188.16 with SMTP id l16mr4242088waf.87.1273570519164;
	Tue, 11 May 2010 02:35:19 -0700 (PDT)
Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49])
	by mx.google.com with ESMTPS id
	r20sm33644041wam.17.2010.05.11.02.35.17
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Tue, 11 May 2010 02:35:18 -0700 (PDT)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>, lethal@linux-sh.org
Date: Tue, 11 May 2010 18:36:32 +0900
Message-Id: <20100511093632.28210.43133.sendpatchset@t400s>
In-Reply-To: <20100511093504.28210.25670.sendpatchset@t400s>
References: <20100511093504.28210.25670.sendpatchset@t400s>
Subject: [PATCH 10/15] sh: switch sh7763 to clkdev
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Tue, 11 May 2010 09:35:21 +0000 (UTC)


--- 0001/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
+++ work/arch/sh/kernel/cpu/sh4a/clock-sh7763.c	2010-05-11 17:30:53.000000000 +0900
@@ -12,6 +12,8 @@
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/io.h>
+#include <asm/clkdev.h>
 #include <asm/clock.h>
 #include <asm/freq.h>
 #include <asm/io.h>
@@ -77,7 +79,6 @@ static struct clk_ops sh7763_shyway_clk_
 };
 
 static struct clk sh7763_shyway_clk = {
-	.name		= "shyway_clk",
 	.flags		= CLK_ENABLE_ON_INIT,
 	.ops		= &sh7763_shyway_clk_ops,
 };
@@ -90,6 +91,13 @@ static struct clk *sh7763_onchip_clocks[
 	&sh7763_shyway_clk,
 };
 
+#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
+
+static struct clk_lookup lookups[] = {
+	/* main clocks */
+	CLKDEV_CON_ID("shyway_clk", &sh7763_shyway_clk),
+};
+
 int __init arch_clk_init(void)
 {
 	struct clk *clk;
@@ -107,5 +115,7 @@ int __init arch_clk_init(void)
 
 	clk_put(clk);
 
+	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
+
 	return ret;
 }