From patchwork Wed Jul 6 01:18:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 947252 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 p661FwEk016076 for ; Wed, 6 Jul 2011 01:18:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754650Ab1GFBS2 (ORCPT ); Tue, 5 Jul 2011 21:18:28 -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 S1753878Ab1GFBS2 (ORCPT ); Tue, 5 Jul 2011 21:18:28 -0400 Received: by mail-pz0-f46.google.com with SMTP id 9so2928268pzk.19 for ; Tue, 05 Jul 2011 18:18:28 -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=Bd0JvmCXhMrmclxvM8Y042KJEYvCTmX1O6boI7NHQq4=; b=Js6TKZNlPJfYus6p6aUxzMCFY2N4yvaQKmuXD1GKwpJjwM5wkbSZJoU2fwtAWKy/Y6 BLEGYcpeqfztp7G49Os6NADhWaFegR8Xa14uSag8hg6c+ewdoBkL1A8bvGrVyGc9HKWc QguRSquuAKGaSlIHkCn82DFydK4Fe+5uFdW3Y= Received: by 10.142.169.19 with SMTP id r19mr3626442wfe.33.1309915107904; Tue, 05 Jul 2011 18:18:27 -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 z20sm5113008wff.19.2011.07.05.18.18.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jul 2011 18:18:27 -0700 (PDT) Date: Tue, 05 Jul 2011 18:18:27 -0700 (PDT) Message-ID: <87oc18jjfi.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 5/8] sh: clock-sh7757: 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:29 +0000 (UTC) Signed-off-by: Kuninori Morimoto --- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 35 +++++++------------------------ 1 files changed, 8 insertions(+), 27 deletions(-) diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c index eedddad..86bf188 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c @@ -102,6 +102,7 @@ static struct clk mstp_clks[MSTP_NR] = { }; #define CLKDEV_CON_ID(_id, _clk) { .con_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 */ @@ -116,33 +117,13 @@ static struct clk_lookup lookups[] = { /* MSTP32 clocks */ CLKDEV_CON_ID("sdhi0", &mstp_clks[MSTP004]), CLKDEV_CON_ID("riic", &mstp_clks[MSTP000]), - { - /* TMU0 */ - .dev_id = "sh_tmu.0", - .con_id = "tmu_fck", - .clk = &mstp_clks[MSTP113], - }, { - /* TMU1 */ - .dev_id = "sh_tmu.1", - .con_id = "tmu_fck", - .clk = &mstp_clks[MSTP114], - }, - { - /* SCIF4 (But, ID is 2) */ - .dev_id = "sh-sci.2", - .con_id = "sci_fck", - .clk = &mstp_clks[MSTP112], - }, { - /* SCIF3 */ - .dev_id = "sh-sci.1", - .con_id = "sci_fck", - .clk = &mstp_clks[MSTP111], - }, { - /* SCIF2 */ - .dev_id = "sh-sci.0", - .con_id = "sci_fck", - .clk = &mstp_clks[MSTP110], - }, + + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.0", &mstp_clks[MSTP113]), + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.1", &mstp_clks[MSTP114]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP112]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP111]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP110]), + CLKDEV_CON_ID("usb0", &mstp_clks[MSTP102]), CLKDEV_CON_ID("mmc0", &mstp_clks[MSTP220]), };