From patchwork Mon May 10 11:24:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 98159 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 o4ABM6eB015818 for ; Mon, 10 May 2010 11:23:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756822Ab0EJLXI (ORCPT ); Mon, 10 May 2010 07:23:08 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:38524 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756800Ab0EJLXH (ORCPT ); Mon, 10 May 2010 07:23:07 -0400 Received: by pwi5 with SMTP id 5so1601541pwi.19 for ; Mon, 10 May 2010 04:23:06 -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=+3QFh3UQ3W6eskmijeFVIu3zYKWuLAEqxqRodgdhEps=; b=USKWtRsEqL8gh7P0oYHfxa25KhS7jk3EXS5XM2jIwkNKwR/NQgv2DkGpEvyhZF7O1r aY4C9GuGX4d5/QAdfBivvqcDuDHIJw3l/clnWqggFJ/YRCwjWJLUnhBARPthL95PGLGp 5oUVAXnnhhtZ4/ZaD4/hp04k3USqJw53yzkME= 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=mbAhrH3oc/kqPWiaGZRSze8LMR7k8iAlcfbo5rp9MBJSwCl40uZB+GZ7kYUrDsTNKO aDhj17FwsqrL+wjn5tZQV1LJ42T1YTp+96FznaOwmDiXy+SkxfZMYGB7j+KBOKFVNNwY 5Ko4KS9lKRLHr17tHTI1IlXSsjSclPfOj/m0s= Received: by 10.115.132.31 with SMTP id j31mr3004267wan.114.1273490586658; Mon, 10 May 2010 04:23:06 -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 b6sm25145453wam.21.2010.05.10.04.23.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 10 May 2010 04:23:06 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Mon, 10 May 2010 20:24:20 +0900 Message-Id: <20100510112420.14587.34514.sendpatchset@t400s> In-Reply-To: <20100510112318.14587.10085.sendpatchset@t400s> References: <20100510112318.14587.10085.sendpatchset@t400s> Subject: [PATCH 08/13] sh: Get rid of sh7724 div6 clock names 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]); Mon, 10 May 2010 11:23:08 +0000 (UTC) --- 0001/arch/sh/include/asm/clock.h +++ work/arch/sh/include/asm/clock.h 2010-05-10 19:18:09.000000000 +0900 @@ -151,9 +151,8 @@ int sh_clk_div4_enable_register(struct c int sh_clk_div4_reparent_register(struct clk *clks, int nr, struct clk_div4_table *table); -#define SH_CLK_DIV6(_name, _parent, _reg, _flags) \ +#define SH_CLK_DIV6(_parent, _reg, _flags) \ { \ - .name = _name, \ .parent = _parent, \ .enable_reg = (void __iomem *)_reg, \ .flags = _flags, \ --- 0008/arch/sh/kernel/cpu/sh4a/clock-sh7724.c +++ work/arch/sh/kernel/cpu/sh4a/clock-sh7724.c 2010-05-10 19:18:54.000000000 +0900 @@ -166,15 +166,12 @@ struct clk div4_clks[DIV4_NR] = { enum { DIV6_V, DIV6_FA, DIV6_FB, DIV6_I, DIV6_S, DIV6_NR }; -#define DIV6(_str, _reg, _flags) \ - SH_CLK_DIV6(_str, &div3_clk, _reg, _flags) - struct clk div6_clks[DIV6_NR] = { - [DIV6_V] = DIV6("video_clk", VCLKCR, 0), - [DIV6_FA] = DIV6("fsia_clk", FCLKACR, 0), - [DIV6_FB] = DIV6("fsib_clk", FCLKBCR, 0), - [DIV6_I] = DIV6("irda_clk", IRDACLKCR, 0), - [DIV6_S] = DIV6("spu_clk", SPUCLKCR, CLK_ENABLE_ON_INIT), + [DIV6_V] = SH_CLK_DIV6(&div3_clk, VCLKCR, 0), + [DIV6_FA] = SH_CLK_DIV6(&div3_clk, FCLKACR, 0), + [DIV6_FB] = SH_CLK_DIV6(&div3_clk, FCLKBCR, 0), + [DIV6_I] = SH_CLK_DIV6(&div3_clk, IRDACLKCR, 0), + [DIV6_S] = SH_CLK_DIV6(&div3_clk, SPUCLKCR, CLK_ENABLE_ON_INIT), }; #define R_CLK (&r_clk)