From patchwork Tue Dec 17 11:53:01 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: 3361001 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 CE61CC0D4A for ; Tue, 17 Dec 2013 12:14:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 384AB20397 for ; Tue, 17 Dec 2013 12:14:29 +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 BD8C220396 for ; Tue, 17 Dec 2013 12:14:27 +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 1VstEy-00010Z-DM; Tue, 17 Dec 2013 11:55:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VstDz-0001Lo-N3; Tue, 17 Dec 2013 11:54:07 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VstDI-0001Gl-LL for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 11:53:26 +0000 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXY00K6990EG040@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 20:53:02 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 8A.22.10132.E1B30B25; Tue, 17 Dec 2013 20:53:02 +0900 (KST) X-AuditID: cbfee68d-b7ff46d000002794-a7-52b03b1e131a Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id ED.98.22838.E1B30B25; Tue, 17 Dec 2013 20:53:02 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.120.199]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MXY005FR90DOM50@mmp1.samsung.com>; Tue, 17 Dec 2013 20:53:01 +0900 (KST) From: kgene@kernel.org To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 09/11] ARM: EXYNOS: local definitions for cpuidle.c into mach-exynos dir Date: Tue, 17 Dec 2013 20:53:01 +0900 Message-id: <116701cefb1e$89821f40$9c865dc0$@kernel.org> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac77HobmaEqfz5qJQoq3L/5WgDvpCw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsVy+t8zY1056w1BBpfa9Cw2Pb7GajHj/D4m ByaPzUvqPT5vkgtgiuKySUnNySxLLdK3S+DKWHl5F2vBJfGKa9t3MjYwPhbuYuTkkBAwkeg5 dYQFwhaTuHBvPVsXIxeHkMAyRoljDzYxwRQt2bqCGSKxiFFixuYeVpCEkMBfRonO81ZdjBwc bEDdU59Ig4SFBbQkFm5pYgEJiwh4Syy/pggRjpJYfX43WCeLgKrEi9tHmUFsXgELiQV9R1gh bEGJH5Pvgd3DDDRm/c7jTBC2vMTmNW+ZIc5RkNhx9jUjiC0ioCdxeftKZogaEYl9L94xgpwp ITCZXWLy9ydMEMsEJL5NPgR2j4SArMSmA1BzJCUOrrjBMoFRbBaS1bOQrJ6FZPUsJCsWMLKs YhRNLUguKE5KLzLUK07MLS7NS9dLzs/dxAiJnN4djLcPWB9iTAZaP5FZSjQ5Hxh5eSXxhsZm RhamJqbGRuaWZqQJK4nzJj1MChISSE8sSc1OTS1ILYovKs1JLT7EyMTBKdXAGPd6a/9q7X/d PPdzKyuWrAnnTkl+sfqnyRr5y5kLeaqW7hF20kvZuq6vwijglsZWM+b1TzY82fp9t3huU0uE 2b7/SpU/HLR3OSirBMQZLNiWFsNlXLU0ZKrrt35v4VdTBRXcg25LMH7clFBRnfBqqXNw93NH r5JcmyVyVWZzX/0SW/dD7v1eJZbijERDLeai4kQASo3637ICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDIsWRmVeSWpSXmKPExsVy+t9jAV056w1BBk9Xa1psenyN1WLG+X1M Dkwem5fUe3zeJBfAFNXAaJORmpiSWqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtq q+TiE6DrlpkDNF5JoSwxpxQoFJBYXKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmLHy8i7W gkviFde272RsYHws3MXIySEhYCKxZOsKZghbTOLCvfVsXYxcHEICixglZmzuYQVJCAn8ZZTo PG/VxcjBwQZUNPWJNEhYWEBLYuGWJhaQsIiAt8Tya4oQ4SiJ1ed3g3WyCKhKvLh9FGw8r4CF xIK+I6wQtqDEj8n3WEBsZqAx63ceZ4Kw5SU2r3kLdY6CxI6zrxlBbBEBPYnL21cyQ9SISOx7 8Y5xAqPALCSjZiEZNQvJqFlIWhYwsqxiFE0tSC4oTkrPNdQrTswtLs1L10vOz93ECI7LZ1I7 GFc2WBxiFOBgVOLh5Zi9PkiINbGsuDL3EKMEB7OSCK+U1YYgId6UxMqq1KL8+KLSnNTiQ4zJ QJ9OZJYSTc4Hpoy8knhDYxMzI0sjMwsjE3Nz0oSVxHkPtFoHCgmkJ5akZqemFqQWwWxh4uCU amDMv85uu0Wmi3n2V5dktW+WE6Wv7G2/znWMo9FovtXz01PXMx9L2Nf+of3sxhssNl1r56f/ KD5ZtM5ynsHXBuXjs7S357kf65KX98xeZ92iP3f2bbcOAf6vqmYnNZW7ONLP1l6U/2AT+i5A +FqDkEWozLr5U3ZrfOA74XplyZo//wQsLi5ZseOgEktxRqKhFnNRcSIAnLNidA8DAAA= 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_065325_003606_ED99BD4F X-CRM114-Status: GOOD ( 10.34 ) X-Spam-Score: -7.4 (-------) 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 definitions for cpuidle into mach-exynos/cpuidle.c, because we don't need to keep them in the . Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/cpuidle.c | 23 ++++++++++++++++++++++- arch/arm/mach-exynos/include/mach/regs-clock.h | 21 --------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 6ba13ea..da65b03 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -22,11 +22,13 @@ #include #include #include -#include #include #include +#include +#include + #include "common.h" #include "regs-pmu.h" @@ -39,6 +41,25 @@ #define S5P_CHECK_AFTR 0xFCBA0D10 +#define EXYNOS5_PWR_CTRL1 (S5P_VA_CMU + 0x01020) +#define EXYNOS5_PWR_CTRL2 (S5P_VA_CMU + 0x01024) + +#define PWR_CTRL1_CORE2_DOWN_RATIO (7 << 28) +#define PWR_CTRL1_CORE1_DOWN_RATIO (7 << 16) +#define PWR_CTRL1_DIV2_DOWN_EN (1 << 9) +#define PWR_CTRL1_DIV1_DOWN_EN (1 << 8) +#define PWR_CTRL1_USE_CORE1_WFE (1 << 5) +#define PWR_CTRL1_USE_CORE0_WFE (1 << 4) +#define PWR_CTRL1_USE_CORE1_WFI (1 << 1) +#define PWR_CTRL1_USE_CORE0_WFI (1 << 0) + +#define PWR_CTRL2_DIV2_UP_EN (1 << 25) +#define PWR_CTRL2_DIV1_UP_EN (1 << 24) +#define PWR_CTRL2_DUR_STANDBY2_VAL (1 << 16) +#define PWR_CTRL2_DUR_STANDBY1_VAL (1 << 8) +#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4) +#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) + static int exynos4_enter_lowpower(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index); diff --git a/arch/arm/mach-exynos/include/mach/regs-clock.h b/arch/arm/mach-exynos/include/mach/regs-clock.h index 22afe63..cc121a5 100644 --- a/arch/arm/mach-exynos/include/mach/regs-clock.h +++ b/arch/arm/mach-exynos/include/mach/regs-clock.h @@ -16,25 +16,4 @@ #include #include -#define EXYNOS_CLKREG(x) (S5P_VA_CMU + (x)) - -#define EXYNOS5_PWR_CTRL1 EXYNOS_CLKREG(0x01020) -#define EXYNOS5_PWR_CTRL2 EXYNOS_CLKREG(0x01024) - -#define PWR_CTRL1_CORE2_DOWN_RATIO (7 << 28) -#define PWR_CTRL1_CORE1_DOWN_RATIO (7 << 16) -#define PWR_CTRL1_DIV2_DOWN_EN (1 << 9) -#define PWR_CTRL1_DIV1_DOWN_EN (1 << 8) -#define PWR_CTRL1_USE_CORE1_WFE (1 << 5) -#define PWR_CTRL1_USE_CORE0_WFE (1 << 4) -#define PWR_CTRL1_USE_CORE1_WFI (1 << 1) -#define PWR_CTRL1_USE_CORE0_WFI (1 << 0) - -#define PWR_CTRL2_DIV2_UP_EN (1 << 25) -#define PWR_CTRL2_DIV1_UP_EN (1 << 24) -#define PWR_CTRL2_DUR_STANDBY2_VAL (1 << 16) -#define PWR_CTRL2_DUR_STANDBY1_VAL (1 << 8) -#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4) -#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) - #endif /* __ASM_ARCH_REGS_CLOCK_H */