From patchwork Tue May 11 09:36:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 98669 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 o4B9YQFQ007399 for ; Tue, 11 May 2010 09:34:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932351Ab0EKJe4 (ORCPT ); Tue, 11 May 2010 05:34:56 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:50772 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932359Ab0EKJez (ORCPT ); Tue, 11 May 2010 05:34:55 -0400 Received: by pvb32 with SMTP id 32so437552pvb.19 for ; Tue, 11 May 2010 02:34:55 -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=x5vSJQieffYpUJiFMtrhAnYoSrIkHLdgWKmtiS779Iw=; b=CXQnjLjjTanC+4NNmsvoymik7bM3ePzSMuZPRCBhiSVg6F33jqSrl4YbH0OOvkSrGT lTwPaZISSFTBUCII45d3VB7du7XBNeRu75fCv8zSIUr5Ejl0+Z1rs5RCgA1sY98lR/2j u8mrfdO8jP+KvJ4EINo2xKN1Kdx0DklVwseg0= 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=dUJOUYfi2ZyxzonitGRZFaR/EJLjB2QJOklR9awmYGQQWEarZ78E4UKVqEoxPNtqCt bnwKDrX7My+yPDoeiSqzTN7Gu/gVfIapL4b/YsGpyiDDregHZ4bl0o0hBxTlkfqYf1oE 5ZcZC+7JStSzPQJ1r00Q/+gYagqRxCsvsCq6c= Received: by 10.115.113.31 with SMTP id q31mr4267790wam.1.1273570490271; Tue, 11 May 2010 02:34:50 -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 n29sm3241747wae.4.2010.05.11.02.34.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 11 May 2010 02:34:49 -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:03 +0900 Message-Id: <20100511093603.28210.42441.sendpatchset@t400s> In-Reply-To: <20100511093504.28210.25670.sendpatchset@t400s> References: <20100511093504.28210.25670.sendpatchset@t400s> Subject: [PATCH 07/15] sh: switch sh7785 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:56 +0000 (UTC) --- 0019/arch/sh/kernel/cpu/sh4a/clock-sh7785.c +++ work/arch/sh/kernel/cpu/sh4a/clock-sh7785.c 2010-05-11 17:02:48.000000000 +0900 @@ -24,8 +24,6 @@ * from the platform code. */ static struct clk extal_clk = { - .name = "extal", - .id = -1, .rate = 33333333, }; @@ -43,8 +41,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, @@ -123,6 +119,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]),