From patchwork Tue Dec 17 11:52:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kgene@kernel.org X-Patchwork-Id: 3360951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89E93C0D4A for ; Tue, 17 Dec 2013 11:55:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 542DC201BD for ; Tue, 17 Dec 2013 11:55:52 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 6CD6C200DE for ; Tue, 17 Dec 2013 11:55:47 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VstDo-0000Ra-HO; Tue, 17 Dec 2013 11:53:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VstDJ-0001I8-4N; Tue, 17 Dec 2013 11:53:25 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VstCr-0001DC-DH for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 11:53:00 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXY00125904A550@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 20:52:53 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.51]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id D0.02.02798.41B30B25; Tue, 17 Dec 2013 20:52:52 +0900 (KST) X-AuditID: cbfee690-b7f206d000000aee-32-52b03b14fe4b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 2D.9B.20899.41B30B25; Tue, 17 Dec 2013 20:52:52 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.120.199]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MXY00J7W904FJ40@mmp2.samsung.com>; Tue, 17 Dec 2013 20:52:52 +0900 (KST) From: kgene@kernel.org To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 08/11] cpufreq: exynos: move definitions for exynos-cpufreq into drivers/cpufreq/ Date: Tue, 17 Dec 2013 20:52:52 +0900 Message-id: <116601cefb1e$84396e30$8cac4a90$@kernel.org> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac77HoQdW8UA0gjnRBuWrDh0sC9SxQ== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsVy+t8zY10R6w1BBvMXWVpsenyN1WLG+X1M FmdOX2K12PjVw4HF4861PWwem5fUe2y52s7i8XmTXABLFJdNSmpOZllqkb5dAlfG71Uz2Qru K1X09DczNjC+l+1i5OSQEDCROLplCxuELSZx4d56MFtIYBmjxOU+qS5GDrCalx1JXYxcQOHp jBI9L19B1fxllJh1Kwqkhg2od+oTaZCwsICWxMItTSwgYREBb4nl1xRBwswCehK9l66ygoSF BZIl+s7rgYRZBFQlel/NYAGxeQUsJHbt3A9lC0r8mHyPBaJVS2L9zuNMELa8xOY1b5khDlaQ 2HH2NSOILQI0fuH5OcwQNSIS+168Y4So2ccu0XpOCmKXgMS3yYdYIJ6Sldh0AGqMpMTBFTdY JjCKz0KyeRaSzbOQbJ6FZMMCRpZVjKKpBckFxUnpRSZ6xYm5xaV56XrJ+bmbGCHxNmEH470D 1ocYk4HWT2SWEk3OB8ZrXkm8obGZkYWpiamxkbmlGWnCSuK8ao+SgoQE0hNLUrNTUwtSi+KL SnNSiw8xMnFwSjUwaqi4yll9W/bqgzrjxPtdin/tg8tnZrlHWVsvvKVVKfCqQE64Uik2odrx lG3jNpMPAqtFlyk8rHD/rLEzYnWMXKyrfk3JqRYzqyXxU82bhUNn2j5nztrX4ckh5hquekFq 15m1ufztzd9WZu/b6C1w/MEX7cUhq/n+t9SUH9biEf3nUMK3aIISS3FGoqEWc1FxIgAKYSx3 zQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJKsWRmVeSWpSXmKPExsVy+t9jQV0R6w1BBhtfm1hsenyN1WLG+X1M FmdOX2K12PjVw4HF4861PWwem5fUe2y52s7i8XmTXABLVAOjTUZqYkpqkUJqXnJ+SmZeuq2S d3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7QRiWFssScUqBQQGJxsZK+HaYJoSFuuhYw jRG6viFBcD1GBmggYR1jxu9VM9kK7itV9PQ3MzYwvpftYuTgkBAwkXjZkdTFyAlkiklcuLee rYuRi0NIYDqjRM/LV2wgCSGBv4wSs25FgdSzARVNfSINEhYW0JJYuKWJBSQsIuAtsfyaIkiY WUBPovfSVVaQsLBAskTfeT2QMIuAqkTvqxksIDavgIXErp37oWxBiR+T77FAtGpJrN95nAnC lpfYvOYtM8RlChI7zr5mBLFFgMYvPD+HGaJGRGLfi3eMExgFZyEZNQvJqFlIRs1C0rKAkWUV o2hqQXJBcVJ6rpFecWJucWleul5yfu4mRnBEP5PewbiqweIQowAHoxIPL8fs9UFCrIllxZW5 hxglOJiVRHilrDYECfGmJFZWpRblxxeV5qQWH2JMBvp0IrOUaHI+MNnklcQbGpuYGVkamVkY mZibkyasJM57sNU6UEggPbEkNTs1tSC1CGYLEwenVANjEhfP9gCR9AMs0i/CRVtOiZ7br7R2 z68VmdUb3OdN3DtxheQtTYn/G32slh8QrlJyfRD1V6xuTXHjeobthm6pEkWvpAJ5/TYaZcY/ ynOR4Hu2RGnyQY/wZW+Pprh9PxH3yeOQVVica8frEzlvr6vtMdHSfNCygpNnt7zT7slViowJ Bl9Zu7SUWIozEg21mIuKEwGL1REsLAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131217_065257_745768_8C173A65 X-CRM114-Status: GOOD ( 10.62 ) X-Spam-Score: -7.4 (-------) Cc: viresh.kumar@linaro.org, rjw@rjwysocki.net 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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: Kukjin Kim This moves regarding exynos-cpufreq definitions into drivers/cpufreq/ exynos-cpufreq.h because they are used only for the cpufreq driver. Cc: Rafael J. Wysocki Cc: Viresh Kumar Signed-off-by: Kukjin Kim Acked-by: Viresh Kumar --- arch/arm/mach-exynos/include/mach/regs-clock.h | 21 --------------------- drivers/cpufreq/exynos-cpufreq.h | 22 ++++++++++++++++++++++ drivers/cpufreq/exynos4210-cpufreq.c | 2 -- drivers/cpufreq/exynos4x12-cpufreq.c | 2 -- drivers/cpufreq/exynos5250-cpufreq.c | 1 - 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/regs-clock.h b/arch/arm/mach-exynos/include/mach/regs-clock.h index 5acc06e..22afe63 100644 --- a/arch/arm/mach-exynos/include/mach/regs-clock.h +++ b/arch/arm/mach-exynos/include/mach/regs-clock.h @@ -18,27 +18,6 @@ #define EXYNOS_CLKREG(x) (S5P_VA_CMU + (x)) -#define EXYNOS4_CLKSRC_CPU EXYNOS_CLKREG(0x14200) -#define EXYNOS4_CLKMUX_STATCPU EXYNOS_CLKREG(0x14400) - -#define EXYNOS4_CLKDIV_CPU EXYNOS_CLKREG(0x14500) -#define EXYNOS4_CLKDIV_CPU1 EXYNOS_CLKREG(0x14504) -#define EXYNOS4_CLKDIV_STATCPU EXYNOS_CLKREG(0x14600) -#define EXYNOS4_CLKDIV_STATCPU1 EXYNOS_CLKREG(0x14604) - -#define EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT (16) -#define EXYNOS4_CLKMUX_STATCPU_MUXCORE_MASK (0x7 << EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT) - -/* For EXYNOS5250 */ - -#define EXYNOS5_APLL_LOCK EXYNOS_CLKREG(0x00000) -#define EXYNOS5_APLL_CON0 EXYNOS_CLKREG(0x00100) -#define EXYNOS5_CLKMUX_STATCPU EXYNOS_CLKREG(0x00400) -#define EXYNOS5_CLKDIV_CPU0 EXYNOS_CLKREG(0x00500) -#define EXYNOS5_CLKDIV_CPU1 EXYNOS_CLKREG(0x00504) -#define EXYNOS5_CLKDIV_STATCPU0 EXYNOS_CLKREG(0x00600) -#define EXYNOS5_CLKDIV_STATCPU1 EXYNOS_CLKREG(0x00604) - #define EXYNOS5_PWR_CTRL1 EXYNOS_CLKREG(0x01020) #define EXYNOS5_PWR_CTRL2 EXYNOS_CLKREG(0x01024) diff --git a/drivers/cpufreq/exynos-cpufreq.h b/drivers/cpufreq/exynos-cpufreq.h index 7f25cee..3ddade8 100644 --- a/drivers/cpufreq/exynos-cpufreq.h +++ b/drivers/cpufreq/exynos-cpufreq.h @@ -67,3 +67,25 @@ static inline int exynos5250_cpufreq_init(struct exynos_dvfs_info *info) return -EOPNOTSUPP; } #endif + +#include +#include + +#define EXYNOS4_CLKSRC_CPU (S5P_VA_CMU + 0x14200) +#define EXYNOS4_CLKMUX_STATCPU (S5P_VA_CMU + 0x14400) + +#define EXYNOS4_CLKDIV_CPU (S5P_VA_CMU + 0x14500) +#define EXYNOS4_CLKDIV_CPU1 (S5P_VA_CMU + 0x14504) +#define EXYNOS4_CLKDIV_STATCPU (S5P_VA_CMU + 0x14600) +#define EXYNOS4_CLKDIV_STATCPU1 (S5P_VA_CMU + 0x14604) + +#define EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT (16) +#define EXYNOS4_CLKMUX_STATCPU_MUXCORE_MASK (0x7 << EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT) + +#define EXYNOS5_APLL_LOCK (S5P_VA_CMU + 0x00000) +#define EXYNOS5_APLL_CON0 (S5P_VA_CMU + 0x00100) +#define EXYNOS5_CLKMUX_STATCPU (S5P_VA_CMU + 0x00400) +#define EXYNOS5_CLKDIV_CPU0 (S5P_VA_CMU + 0x00500) +#define EXYNOS5_CLKDIV_CPU1 (S5P_VA_CMU + 0x00504) +#define EXYNOS5_CLKDIV_STATCPU0 (S5P_VA_CMU + 0x00600) +#define EXYNOS5_CLKDIV_STATCPU1 (S5P_VA_CMU + 0x00604) diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c index dfd1643..40d84c4 100644 --- a/drivers/cpufreq/exynos4210-cpufreq.c +++ b/drivers/cpufreq/exynos4210-cpufreq.c @@ -17,8 +17,6 @@ #include #include -#include - #include "exynos-cpufreq.h" static struct clk *cpu_clk; diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c index efad5e6..869e482 100644 --- a/drivers/cpufreq/exynos4x12-cpufreq.c +++ b/drivers/cpufreq/exynos4x12-cpufreq.c @@ -17,8 +17,6 @@ #include #include -#include - #include "exynos-cpufreq.h" static struct clk *cpu_clk; diff --git a/drivers/cpufreq/exynos5250-cpufreq.c b/drivers/cpufreq/exynos5250-cpufreq.c index 8feda86..5ee2ce1 100644 --- a/drivers/cpufreq/exynos5250-cpufreq.c +++ b/drivers/cpufreq/exynos5250-cpufreq.c @@ -18,7 +18,6 @@ #include #include -#include #include "exynos-cpufreq.h"