From patchwork Tue May 20 08:00:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4207741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BE8659F23C for ; Tue, 20 May 2014 08:00:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A261020304 for ; Tue, 20 May 2014 08:00:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 83AF1201FA for ; Tue, 20 May 2014 08:00:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wmewj-00022a-GV; Tue, 20 May 2014 07:58:49 +0000 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmewY-0001p2-W6 for linux-arm-kernel@lists.infradead.org; Tue, 20 May 2014 07:58:40 +0000 Received: by mail-pa0-f51.google.com with SMTP id kq14so85456pab.38 for ; Tue, 20 May 2014 00:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=1+wudahUdEraJKMG7adk6KgD1rmLTbP0ceOW+Jr10B0=; b=M+V9kzvVPhOvAtYa93zkDo4/trdLVM1FcVY7dHhhJlZs5pGBeSra8WUHsRlu/cqiDg umqvW68Mtu+HYEjlZu36DFYy7MuDdTZ8PArMif7g3dY0IP8K4Oe7Pl7RGwdbxKwjhtTe Nx2RMSc85GJaB89j0zxSRma3LMk8EenWkBSFFIYUewXrdX6z8eYtSCbtekHP9lb8B7RB OQ7lzlcknv7S8Icuzv9bOwNLoHMGpZjkkrKw3cini179SnVOhgwI9E6pgk0WAJf/KmX/ eqm8+tppnurr4vLYw0y2eNqLbD8uLMqlaBVNgiDbb5Ehva+bJjSxFSpupuF6eMOa2dfO jPuA== X-Received: by 10.69.15.2 with SMTP id fk2mr48857304pbd.123.1400572698070; Tue, 20 May 2014 00:58:18 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id om6sm1670840pbc.43.2014.05.20.00.58.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 May 2014 00:58:16 -0700 (PDT) From: Magnus Damm To: olof@lixom.net Date: Tue, 20 May 2014 17:00:17 +0900 Message-Id: <20140520080017.13851.96123.sendpatchset@w520> In-Reply-To: <20140520075949.13851.42995.sendpatchset@w520> References: <20140520075949.13851.42995.sendpatchset@w520> Subject: [PATCH 03/08] ARM: shmobile: Move clock.h X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140520_005839_088279_07E367D1 X-CRM114-Status: GOOD ( 14.87 ) X-Spam-Score: -0.1 (/) Cc: horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Change location of clock.h so it can be used as #include "clock.h" instead of the old style #include . Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-genmai-reference.c | 2 arch/arm/mach-shmobile/board-koelsch-reference.c | 2 arch/arm/mach-shmobile/board-lager-reference.c | 2 arch/arm/mach-shmobile/board-marzen-reference.c | 2 arch/arm/mach-shmobile/clock-r8a73a4.c | 2 arch/arm/mach-shmobile/clock-r8a7740.c | 2 arch/arm/mach-shmobile/clock-r8a7778.c | 2 arch/arm/mach-shmobile/clock-r8a7779.c | 2 arch/arm/mach-shmobile/clock-r8a7790.c | 2 arch/arm/mach-shmobile/clock-r8a7791.c | 2 arch/arm/mach-shmobile/clock-sh7372.c | 2 arch/arm/mach-shmobile/clock-sh73a0.c | 2 arch/arm/mach-shmobile/clock.c | 4 - arch/arm/mach-shmobile/clock.h | 56 ++++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/clock.h | 56 ---------------------- 15 files changed, 70 insertions(+), 70 deletions(-) --- 0001/arch/arm/mach-shmobile/board-genmai-reference.c +++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2014-05-19 23:44:47.000000000 +0900 @@ -20,11 +20,11 @@ #include #include -#include #include #include #include #include +#include "clock.h" /* * This is a really crude hack to provide clkdev support to platform --- 0001/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-05-19 23:45:09.000000000 +0900 @@ -23,12 +23,12 @@ #include #include #include -#include #include #include #include #include #include +#include "clock.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0002/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-05-19 23:45:28.000000000 +0900 @@ -22,12 +22,12 @@ #include #include #include -#include #include #include #include #include #include +#include "clock.h" /* DU */ static struct rcar_du_encoder_data lager_du_encoders[] = { --- 0001/arch/arm/mach-shmobile/board-marzen-reference.c +++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-05-19 23:45:51.000000000 +0900 @@ -23,11 +23,11 @@ #include #include #include -#include #include #include #include #include +#include "clock.h" static void __init marzen_init_timer(void) { --- 0001/arch/arm/mach-shmobile/clock-r8a73a4.c +++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-05-19 23:46:16.000000000 +0900 @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include "clock.h" #define CPG_BASE 0xe6150000 #define CPG_LEN 0x270 --- 0001/arch/arm/mach-shmobile/clock-r8a7740.c +++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-05-19 23:46:48.000000000 +0900 @@ -22,9 +22,9 @@ #include #include #include -#include #include #include +#include "clock.h" /* * | MDx | XTAL1/EXTAL1 | System | EXTALR | --- 0001/arch/arm/mach-shmobile/clock-r8a7778.c +++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-05-19 23:47:09.000000000 +0900 @@ -39,8 +39,8 @@ #include #include #include -#include #include +#include "clock.h" #define MSTPCR0 IOMEM(0xffc80030) #define MSTPCR1 IOMEM(0xffc80034) --- 0001/arch/arm/mach-shmobile/clock-r8a7779.c +++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-05-19 23:47:31.000000000 +0900 @@ -24,9 +24,9 @@ #include #include #include -#include #include #include +#include "clock.h" /* * MD1 = 1 MD1 = 0 --- 0001/arch/arm/mach-shmobile/clock-r8a7790.c +++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-05-19 23:47:50.000000000 +0900 @@ -22,9 +22,9 @@ #include #include #include -#include #include #include +#include "clock.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0001/arch/arm/mach-shmobile/clock-r8a7791.c +++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-05-19 23:48:36.000000000 +0900 @@ -23,9 +23,9 @@ #include #include #include -#include #include #include +#include "clock.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0001/arch/arm/mach-shmobile/clock-sh7372.c +++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-05-19 23:48:53.000000000 +0900 @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include "clock.h" /* SH7372 registers */ #define FRQCRA IOMEM(0xe6150000) --- 0001/arch/arm/mach-shmobile/clock-sh73a0.c +++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-05-19 23:49:11.000000000 +0900 @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include "clock.h" #define FRQCRA IOMEM(0xe6150000) #define FRQCRB IOMEM(0xe6150004) --- 0001/arch/arm/mach-shmobile/clock.c +++ work/arch/arm/mach-shmobile/clock.c 2014-05-19 23:49:57.000000000 +0900 @@ -25,7 +25,7 @@ #ifdef CONFIG_COMMON_CLK #include #include -#include +#include "clock.h" void __init shmobile_clk_workaround(const struct clk_name *clks, int nr_clks, bool enable) @@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(cons #else /* CONFIG_COMMON_CLK */ #include #include -#include #include +#include "clock.h" unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk) { --- /dev/null +++ work/arch/arm/mach-shmobile/clock.h 2014-05-19 23:43:52.000000000 +0900 @@ -0,0 +1,56 @@ +#ifndef CLOCK_H +#define CLOCK_H + +#ifdef CONFIG_COMMON_CLK +/* temporary clock configuration helper for platform devices */ + +struct clk_name { + const char *clk; + const char *con_id; + const char *dev_id; +}; + +void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks, + bool enable); + +#else /* CONFIG_COMMON_CLK */ +/* legacy clock implementation */ + +struct clk; +unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk); +extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops; + +/* clock ratio */ +struct clk_ratio { + int mul; + int div; +}; + +#define SH_CLK_RATIO(name, m, d) \ +static struct clk_ratio name ##_ratio = { \ + .mul = m, \ + .div = d, \ +} + +#define SH_FIXED_RATIO_CLKg(name, p, r) \ +struct clk name = { \ + .parent = &p, \ + .ops = &shmobile_fixed_ratio_clk_ops,\ + .priv = &r ## _ratio, \ +} + +#define SH_FIXED_RATIO_CLK(name, p, r) \ +static SH_FIXED_RATIO_CLKg(name, p, r) + +#define SH_FIXED_RATIO_CLK_SET(name, p, m, d) \ + SH_CLK_RATIO(name, m, d); \ + SH_FIXED_RATIO_CLK(name, p, name) + +#define SH_CLK_SET_RATIO(p, m, d) \ +do { \ + (p)->mul = m; \ + (p)->div = d; \ +} while (0) + +#endif /* CONFIG_COMMON_CLK */ +#endif --- 0001/arch/arm/mach-shmobile/include/mach/clock.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,56 +0,0 @@ -#ifndef CLOCK_H -#define CLOCK_H - -#ifdef CONFIG_COMMON_CLK -/* temporary clock configuration helper for platform devices */ - -struct clk_name { - const char *clk; - const char *con_id; - const char *dev_id; -}; - -void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks, - bool enable); - -#else /* CONFIG_COMMON_CLK */ -/* legacy clock implementation */ - -struct clk; -unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk); -extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops; - -/* clock ratio */ -struct clk_ratio { - int mul; - int div; -}; - -#define SH_CLK_RATIO(name, m, d) \ -static struct clk_ratio name ##_ratio = { \ - .mul = m, \ - .div = d, \ -} - -#define SH_FIXED_RATIO_CLKg(name, p, r) \ -struct clk name = { \ - .parent = &p, \ - .ops = &shmobile_fixed_ratio_clk_ops,\ - .priv = &r ## _ratio, \ -} - -#define SH_FIXED_RATIO_CLK(name, p, r) \ -static SH_FIXED_RATIO_CLKg(name, p, r) - -#define SH_FIXED_RATIO_CLK_SET(name, p, m, d) \ - SH_CLK_RATIO(name, m, d); \ - SH_FIXED_RATIO_CLK(name, p, name) - -#define SH_CLK_SET_RATIO(p, m, d) \ -do { \ - (p)->mul = m; \ - (p)->div = d; \ -} while (0) - -#endif /* CONFIG_COMMON_CLK */ -#endif