From patchwork Tue May 11 09:36:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 98670 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 o4B9YQFR007399 for ; Tue, 11 May 2010 09:35:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757720Ab0EKJfE (ORCPT ); Tue, 11 May 2010 05:35:04 -0400 Received: from mail-pz0-f204.google.com ([209.85.222.204]:42395 "EHLO mail-pz0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757672Ab0EKJfD (ORCPT ); Tue, 11 May 2010 05:35:03 -0400 Received: by pzk42 with SMTP id 42so629033pzk.4 for ; Tue, 11 May 2010 02:35:03 -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=wmdJ0KWj9LM46kfMJuzgSUWxYwa8Mbn7wekjUzRdBpw=; b=buzmr/Kqozie2r+zfGSGMoCpfHziTVQp4e2TGNfu0hWhTbW44ItyWfJlKjtOKzfhbg 8Sv4iEOsJjfGuZ57Mksa1MoZMfe4zr2BLUjxCulJPVi7EmhlZyxrvHAxP9VV498rAPxv BRpdGKq+rwgsUb73mqDLtSl/bV7/oG6NboUEw= 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=FUKaA+0TJnc62t17qvfpSz7ETrUBOQfy64d28neRE4INYzg8aUH7XNwosPZ5wjeyzq juBOhRz+3QPTdPPa51BveHTH6hksalDsyoAGzy34HcbCopzpMzOXSHdLsRApXRGkFZtk kM3Ug30eAmCDHwSyXdexpipqSVnCZbpsNj1Tw= Received: by 10.114.186.40 with SMTP id j40mr4226539waf.93.1273570502921; Tue, 11 May 2010 02:35:02 -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 n32sm33643502wae.10.2010.05.11.02.35.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 11 May 2010 02:35:02 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Tue, 11 May 2010 18:36:16 +0900 Message-Id: <20100511093616.28210.87336.sendpatchset@t400s> In-Reply-To: <20100511093504.28210.25670.sendpatchset@t400s> References: <20100511093504.28210.25670.sendpatchset@t400s> Subject: [PATCH 08/15] sh: switch sh7786 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:35:05 +0000 (UTC) --- 0019/arch/sh/kernel/cpu/sh4a/clock-sh7786.c +++ work/arch/sh/kernel/cpu/sh4a/clock-sh7786.c 2010-05-11 17:05:22.000000000 +0900 @@ -23,8 +23,6 @@ * from the platform code. */ static struct clk extal_clk = { - .name = "extal", - .id = -1, .rate = 33333333, }; @@ -46,8 +44,6 @@ static struct clk_ops pll_clk_ops = { }; static struct clk pll_clk = { - .name = "pll_clk", - .id = -1, .ops = &pll_clk_ops, .parent = &extal_clk, .flags = CLK_ENABLE_ON_INIT, @@ -133,6 +129,10 @@ static struct clk mstp_clks[MSTP_NR] = { #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } static struct clk_lookup lookups[] = { + /* main clocks */ + CLKDEV_CON_ID("extal", &extal_clk), + CLKDEV_CON_ID("pll_clk", &pll_clk), + /* DIV4 clocks */ CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]), CLKDEV_CON_ID("du_clk", &div4_clks[DIV4_DU]),