From patchwork Wed Jul 6 01:18:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 947232 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 p661FwEi016076 for ; Wed, 6 Jul 2011 01:18:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755408Ab1GFBSN (ORCPT ); Tue, 5 Jul 2011 21:18:13 -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 S1753878Ab1GFBSM (ORCPT ); Tue, 5 Jul 2011 21:18:12 -0400 Received: by mail-pz0-f46.google.com with SMTP id 9so2928268pzk.19 for ; Tue, 05 Jul 2011 18:18:12 -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=NOk4AyMXZiiYE4QVdxTj+VJSfhLmcIqOF4RRpiB97d8=; b=whtCDvz2GV7JtqujsW0EInJj2QwKOUSynfhFZJr5suO7f1Jllcwl4XxrcyxNUu6M9r Kl9Xg6w4LLjjumdOYym/8JtQNgHn18H7UB8wf3TqUYaz8gD8CxTpbo+UYTfDmgSfoWHT 6KAJrWHYoQKRr003hvg3nkR+M5BrH1NCKkDCY= Received: by 10.142.74.13 with SMTP id w13mr3573491wfa.60.1309915092546; Tue, 05 Jul 2011 18:18:12 -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 i9sm4704606pbk.36.2011.07.05.18.18.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jul 2011 18:18:12 -0700 (PDT) Date: Tue, 05 Jul 2011 18:18:12 -0700 (PDT) Message-ID: <87r564jjfx.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 3/8] sh: clock-sh7343: 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:13 +0000 (UTC) Signed-off-by: Kuninori Morimoto --- arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c index a6d1348..16e151f 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c @@ -196,6 +196,7 @@ static struct clk mstp_clks[MSTP_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 */ @@ -234,27 +235,12 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("rwdt0", &mstp_clks[MSTP013]), CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]), CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]), - { - /* SCIF0 */ - .dev_id = "sh-sci.0", - .con_id = "sci_fck", - .clk = &mstp_clks[MSTP007], - }, { - /* SCIF1 */ - .dev_id = "sh-sci.1", - .con_id = "sci_fck", - .clk = &mstp_clks[MSTP006], - }, { - /* SCIF2 */ - .dev_id = "sh-sci.2", - .con_id = "sci_fck", - .clk = &mstp_clks[MSTP005], - }, { - /* SCIF3 */ - .dev_id = "sh-sci.3", - .con_id = "sci_fck", - .clk = &mstp_clks[MSTP004], - }, + + CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP007]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP006]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP005]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP004]), + CLKDEV_CON_ID("sio0", &mstp_clks[MSTP003]), CLKDEV_CON_ID("siof0", &mstp_clks[MSTP002]), CLKDEV_CON_ID("siof1", &mstp_clks[MSTP001]),