From patchwork Tue Jun 17 07:47:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4364641 Return-Path: X-Original-To: patchwork-linux-sh@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 679BD9F36A for ; Tue, 17 Jun 2014 07:45:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F1EF2020A for ; Tue, 17 Jun 2014 07:45:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED9EB20204 for ; Tue, 17 Jun 2014 07:45:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916AbaFQHpQ (ORCPT ); Tue, 17 Jun 2014 03:45:16 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:48455 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752798AbaFQHpP (ORCPT ); Tue, 17 Jun 2014 03:45:15 -0400 Received: by mail-pb0-f49.google.com with SMTP id rr13so2313470pbb.36 for ; Tue, 17 Jun 2014 00:45:15 -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=av/P7sLRmhRbFCudVsprAoCcgVeMRJwWdizjwouq4y8=; b=WOKljOFcbyABGn5i+02n822xYSXuwwIQAHwOI37ENxfnue8hBg9dt3LbPZLI1ChLe5 bwlVQKGSL/l6bugQhFjy7ZLHozYw3A0FmROx6wsrkhGeYdiO0nbndbaFXuiO1pHiz2Rw oWqpdskb44MTf6i5wkzv5NnD1O29EQdIbA61B36vAGGUUTcgZGbz2j9cPXudVbR2p03t VQkvu9i26Gz3yrr+X7eVN/gSqKd37OOQefuCmh141aUzNaPRDPIapfXqAbnJPTYpM9u3 ZB58zWJTokkUKXMXDOOK/iPMhK5JBDNzWoRNrCN+c3HiWI2DXeIrJNC4bVQUJIuPXtvV Wueg== X-Received: by 10.66.251.233 with SMTP id zn9mr30842892pac.67.1402991115077; Tue, 17 Jun 2014 00:45:15 -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 ia2sm22516312pbb.32.2014.06.17.00.45.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 00:45:14 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: arnd@arndb.de, horms@verge.net.au, geert@linux-m68k.org, olof@lixom.net, Magnus Damm , linux-arm-kernel@lists.infradead.org Date: Tue, 17 Jun 2014 16:47:21 +0900 Message-Id: <20140617074721.30008.36134.sendpatchset@w520> In-Reply-To: <20140617074658.30008.53021.sendpatchset@w520> References: <20140617074658.30008.53021.sendpatchset@w520> Subject: [PATCH v2 03/08] ARM: shmobile: Move clock.h Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Acked-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- Changes since V1: - rebased to v3.16-rc1 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/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 ---------------------- 14 files changed, 69 insertions(+), 69 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/board-genmai-reference.c +++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2014-06-17 16:01:17.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-06-17 16:01:17.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[] = { --- 0001/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:01:17.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/clock-r8a73a4.c +++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-06-17 16:01:17.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-06-17 16:01:17.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-06-17 16:01:17.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-06-17 16:02:28.000000000 +0900 @@ -23,8 +23,8 @@ #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-06-17 16:01:17.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-06-17 16:01:17.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-06-17 16:01:17.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-06-17 16:01:17.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-06-17 16:01:17.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-06-17 16:01:17.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