From patchwork Wed Jul 6 01:18:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 947222 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p661FwEh016076 for ; Wed, 6 Jul 2011 01:18:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755069Ab1GFBSF (ORCPT ); Tue, 5 Jul 2011 21:18:05 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:57763 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753878Ab1GFBSE (ORCPT ); Tue, 5 Jul 2011 21:18:04 -0400 Received: by pzk9 with SMTP id 9so2928268pzk.19 for ; Tue, 05 Jul 2011 18:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:sender:message-id:to:cc:in-reply-to:references:user-agent :mime-version:from:subject:content-type; bh=zT884vig5AZqsBu6B/WxWZfdXwykPmXy0/3WEM2qGRM=; b=nh1lZmw7T7tjldcthRcBVUypK17AzmfemT3+OvF7LZpfFuCjRch2tS7yxl2TQiaNTS ipnSznrM0UFlptXmdtVxPVtA4gvtEUSN/6E3PHYfDnTaV9s/7vVJwIUvYJgOoUzZa9u+ uHWioKJaDoTiuRT3Y2jnAhbIAJVPfCwiy96Tg= Received: by 10.68.1.103 with SMTP id 7mr9851028pbl.81.1309915084231; Tue, 05 Jul 2011 18:18:04 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id d3sm1349460pbh.21.2011.07.05.18.18.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jul 2011 18:18:03 -0700 (PDT) Date: Tue, 05 Jul 2011 18:18:03 -0700 (PDT) Message-ID: <87sjqkjjg6.wl%kuninori.morimoto.gx@renesas.com> To: Paul , Magnus Cc: linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87vcvgjjhj.wl%kuninori.morimoto.gx@renesas.com> References: <87vcvgjjhj.wl%kuninori.morimoto.gx@renesas.com> User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29q?= =?ISO-2022-JP-2?B?GyQoRCtXGyhC?=) APEL/10.8 Emacs/23.2 (i686-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") From: Kuninori Morimoto Subject: [RFC][PATCH 2/8] sh: clock-sh7722: add CLKDEV_ICK_ID for cleanup 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.6 (demeter2.kernel.org [140.211.167.43]); Wed, 06 Jul 2011 01:18:06 +0000 (UTC) Signed-off-by: Kuninori Morimoto --- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 43 ++++++++----------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c index e0e80d2..d39fcfb 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c @@ -177,6 +177,7 @@ static struct clk mstp_clks[HWBLK_NR] = { #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } #define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk } +#define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk } static struct clk_lookup lookups[] = { /* main clocks */ @@ -202,41 +203,19 @@ static struct clk_lookup lookups[] = { /* MSTP clocks */ CLKDEV_CON_ID("uram0", &mstp_clks[HWBLK_URAM]), CLKDEV_CON_ID("xymem0", &mstp_clks[HWBLK_XYMEM]), - { - /* TMU0 */ - .dev_id = "sh_tmu.0", - .con_id = "tmu_fck", - .clk = &mstp_clks[HWBLK_TMU], - }, { - /* TMU1 */ - .dev_id = "sh_tmu.1", - .con_id = "tmu_fck", - .clk = &mstp_clks[HWBLK_TMU], - }, { - /* TMU2 */ - .dev_id = "sh_tmu.2", - .con_id = "tmu_fck", - .clk = &mstp_clks[HWBLK_TMU], - }, + + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.0", &mstp_clks[HWBLK_TMU]), + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.1", &mstp_clks[HWBLK_TMU]), + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.2", &mstp_clks[HWBLK_TMU]), + CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]), CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]), CLKDEV_CON_ID("flctl0", &mstp_clks[HWBLK_FLCTL]), - { - /* SCIF0 */ - .dev_id = "sh-sci.0", - .con_id = "sci_fck", - .clk = &mstp_clks[HWBLK_SCIF0], - }, { - /* SCIF1 */ - .dev_id = "sh-sci.1", - .con_id = "sci_fck", - .clk = &mstp_clks[HWBLK_SCIF1], - }, { - /* SCIF2 */ - .dev_id = "sh-sci.2", - .con_id = "sci_fck", - .clk = &mstp_clks[HWBLK_SCIF2], - }, + + CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[HWBLK_SCIF0]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]), + CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[HWBLK_IIC]), CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]), CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI]),