From patchwork Tue May 11 09:35:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 98666 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 o4B9YQFN007399 for ; Tue, 11 May 2010 09:34:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932346Ab0EKJe0 (ORCPT ); Tue, 11 May 2010 05:34:26 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:59471 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932341Ab0EKJeZ (ORCPT ); Tue, 11 May 2010 05:34:25 -0400 Received: by pwi5 with SMTP id 5so2125507pwi.19 for ; Tue, 11 May 2010 02:34:24 -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=NdEe2DqOA68gmujlbPAd2Afo37vGkiR+V8xOlLOW+/c=; b=xyT94j+Scdf7/DfcP/Rzvw6FMX50ML4+U0m/J43bluTXJASZ7RS3zsrqiWoxnBo94s VzP2/uknqtCX53Yt9qi9d5allZEGhhfy+KSMYZt2NENu6Q+ibaY2h9TjscJdF0FJj8nm 6IBszXLpuChec8z2Mmh9m+xuA7x8bfjPVcvSY= 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=vFVKdDrC6Hw/oki3YrUSm9gy7umcS3s1CG/lZ5lYQCwnxpJyhOpoGFKuHxR86hSiJh 7Wjz9QAYNX+6lny+jGve+9+fs70xpMOOP2yDkUrqJwAdX3YsorZfrlUwrKDe89/8jBX3 hA3OPq6syOhXC6LHyozQVSHMQexU5svEf0e/s= Received: by 10.114.87.17 with SMTP id k17mr4209674wab.215.1273570464646; Tue, 11 May 2010 02:34:24 -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 f11sm33640936wai.11.2010.05.11.02.34.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 11 May 2010 02:34:24 -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:38 +0900 Message-Id: <20100511093538.28210.72241.sendpatchset@t400s> In-Reply-To: <20100511093504.28210.25670.sendpatchset@t400s> References: <20100511093504.28210.25670.sendpatchset@t400s> Subject: [PATCH 04/15] sh: switch sh7722 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:27 +0000 (UTC) --- 0019/arch/sh/kernel/cpu/sh4a/clock-sh7722.c +++ work/arch/sh/kernel/cpu/sh4a/clock-sh7722.c 2010-05-11 16:32:56.000000000 +0900 @@ -37,8 +37,6 @@ /* Fixed 32 KHz root clock for RTC and Power Management purposes */ static struct clk r_clk = { - .name = "rclk", - .id = -1, .rate = 32768, }; @@ -47,8 +45,6 @@ static struct clk r_clk = { * from the platform code. */ struct clk extal_clk = { - .name = "extal", - .id = -1, .rate = 33333333, }; @@ -70,8 +66,6 @@ static struct clk_ops dll_clk_ops = { }; static struct clk dll_clk = { - .name = "dll_clk", - .id = -1, .ops = &dll_clk_ops, .parent = &r_clk, .flags = CLK_ENABLE_ON_INIT, @@ -95,8 +89,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, }; @@ -186,6 +178,12 @@ 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("dll_clk", &dll_clk), + CLKDEV_CON_ID("pll_clk", &pll_clk), + /* DIV4 clocks */ CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]), CLKDEV_CON_ID("umem_clk", &div4_clks[DIV4_U]),