From patchwork Tue May 11 09:35:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 98664 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 o4B9XnTM006818 for ; Tue, 11 May 2010 09:34:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932345Ab0EKJeI (ORCPT ); Tue, 11 May 2010 05:34:08 -0400 Received: from mail-pz0-f204.google.com ([209.85.222.204]:63199 "EHLO mail-pz0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932341Ab0EKJeH (ORCPT ); Tue, 11 May 2010 05:34:07 -0400 Received: by pzk42 with SMTP id 42so628689pzk.4 for ; Tue, 11 May 2010 02:34:06 -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=qlCmw48OeUACOfFqIh1hJrgEbD+77ubZRt5PPH5oMcA=; b=v4dLeweFsQglY0e+abPqxudHtJfg3AxNfcWy6dj4Bkn+TwNPY5uyBRc1UL09mx8L2S cExy0aNXgWhMfbFv8abL7koLo+xxK3nKotNMAcN8N9Fzjl+4zvPIJ6o11/OX+dxX7AjO gOo78eYg8SEhbCq3o3of4p5sZckc+5xIGCl7Y= 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=xcMAb4PyN5eKWWw7CalQOSRDhbayu7WQA2ymR8XM8AReMva9gM3u9HoYVZNTZE5zbR 5gTe0ICC99TuiQvJaTWQGIMQc18mIfyv4qvPhTxfEvLrCZ9mD38Y5YfLtaur7hRspPf1 NBvjUUOXgKPX6TY5HF4GP5niIJnTNzw01fOAU= Received: by 10.114.237.21 with SMTP id k21mr4217052wah.141.1273570446380; Tue, 11 May 2010 02:34:06 -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 b6sm33641283wam.9.2010.05.11.02.34.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 11 May 2010 02:34:05 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Tue, 11 May 2010 18:35:19 +0900 Message-Id: <20100511093519.28210.46226.sendpatchset@t400s> In-Reply-To: <20100511093504.28210.25670.sendpatchset@t400s> References: <20100511093504.28210.25670.sendpatchset@t400s> Subject: [PATCH 02/15] sh: switch sh7724 to clkdev Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: 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:34:10 +0000 (UTC) --- 0019/arch/sh/kernel/cpu/sh4a/clock-sh7724.c +++ work/arch/sh/kernel/cpu/sh4a/clock-sh7724.c 2010-05-11 16:25:21.000000000 +0900 @@ -41,8 +41,6 @@ /* Fixed 32 KHz root clock for RTC and Power Management purposes */ static struct clk r_clk = { - .name = "rclk", - .id = -1, .rate = 32768, }; @@ -51,8 +49,6 @@ static struct clk r_clk = { * from the platform code. */ struct clk extal_clk = { - .name = "extal", - .id = -1, .rate = 33333333, }; @@ -76,8 +72,6 @@ static struct clk_ops fll_clk_ops = { }; static struct clk fll_clk = { - .name = "fll_clk", - .id = -1, .ops = &fll_clk_ops, .parent = &r_clk, .flags = CLK_ENABLE_ON_INIT, @@ -98,8 +92,6 @@ static struct clk_ops pll_clk_ops = { }; static struct clk pll_clk = { - .name = "pll_clk", - .id = -1, .ops = &pll_clk_ops, .flags = CLK_ENABLE_ON_INIT, }; @@ -115,8 +107,6 @@ static struct clk_ops div3_clk_ops = { }; static struct clk div3_clk = { - .name = "div3_clk", - .id = -1, .ops = &div3_clk_ops, .parent = &pll_clk, }; @@ -234,6 +224,13 @@ static struct clk mstp_clks[HWBLK_NR] = #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } static struct clk_lookup lookups[] = { + /* main clocks */ + CLKDEV_CON_ID("rclk", &r_clk), + CLKDEV_CON_ID("extal", &extal_clk), + CLKDEV_CON_ID("fll_clk", &fll_clk), + CLKDEV_CON_ID("pll_clk", &pll_clk), + CLKDEV_CON_ID("div3_clk", &div3_clk), + /* DIV4 clocks */ CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]), CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),