From patchwork Mon Jul 7 03:50:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 4492201 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 6564DBEECB for ; Mon, 7 Jul 2014 03:54:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8BEA2201F4 for ; Mon, 7 Jul 2014 03:54:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A378420225 for ; Mon, 7 Jul 2014 03:54:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753008AbaGGDxx (ORCPT ); Sun, 6 Jul 2014 23:53:53 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:35216 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752858AbaGGDxo (ORCPT ); Sun, 6 Jul 2014 23:53:44 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8B00A58PHIEWD0@mailout4.samsung.com>; Mon, 07 Jul 2014 12:53:42 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id A8.58.13369.6C91AB35; Mon, 07 Jul 2014 12:53:42 +0900 (KST) X-AuditID: cbfee690-b7fb56d000003439-cc-53ba19c62ed2 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id D3.AE.05196.6C91AB35; Mon, 07 Jul 2014 12:53:42 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8B00G14PH17141@mmp2.samsung.com>; Mon, 07 Jul 2014 12:53:42 +0900 (KST) From: Pankaj Dubey To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kgene.kim@samsung.com, linux@arm.linux.org.uk, t.figa@samsung.com, vikas.sajjan@samsung.com, joshi@samsung.com, naushad@samsung.com, chow.kim@samsung.com, Pankaj Dubey Subject: [PATCH v6 5/6] ARM: EXYNOS: Remove regs-pmu.h header dependency from pm_domain Date: Mon, 07 Jul 2014 09:20:55 +0530 Message-id: <1404705056-11965-6-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404705056-11965-1-git-send-email-pankaj.dubey@samsung.com> References: <1404705056-11965-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeLIzCtJLcpLzFFi42JZI2JSq3tMclewwbW7BhbLJt1ls/i+6wu7 Re+Cq2wWmx5fY7W4vGsOm8WM8/uYLG5f5rX4dPQ/q8WirUAV62e8ZrG4+Ww7kwO3R0tzD5vH 5iX1Hn1bVjF6fN4kF8ASxWWTkpqTWZZapG+XwJUx9ftKtoIlwhWLZ79jaWD8zd/FyMkhIWAi cffEZjYIW0ziwr31QDYXh5DAUkaJ9RNmMcEU/Z9zHKxISGA6o8TDpYkQRROYJBZeec8IkmAT 0JV48n4uM4gtIpAt0X97NQtIEbPAKUaJ2ZunsYMkhAUiJfa37wSzWQRUJV439YNt4BXwkDiw dhbQBg6gbQoScybZgIQ5BTwllnyYxAyx2EPi7rlDjCAzJQTWsUs8mLIKao6AxLfJh1ggemUl Nh1ghjhaUuLgihssExiFFzAyrGIUTS1ILihOSi8y0StOzC0uzUvXS87P3cQIjIDT/55N2MF4 74D1IcZkoHETmaVEk/OBEZRXEm9obGZkYWpiamxkbmlGmrCSOK/ao6QgIYH0xJLU7NTUgtSi +KLSnNTiQ4xMHJxSDYz8zHxifG+rnJ4dKO8wn8VkLvZm54U7j3jj3oa/ZNr/9VbxLH1T5XUf S9nuGHy3XLIm97Rzful3PuVbeca/S15v3zPp4Y5kM+k7HCE2z+ZpZHsyqsw+Y3TqZ6Tm1hg+ iz+1eler3s6evSFx0+xZHPzhf1ev9vt/svHJtfSw9Z4WS8vrspfVzVdXYinOSDTUYi4qTgQA TOJp5pYCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsVy+t9jQd1jkruCDQ4eV7dYNukum8X3XV/Y LXoXXGWz2PT4GqvF5V1z2CxmnN/HZHH7Mq/Fp6P/WS0WbQWqWD/jNYvFzWfbmRy4PVqae9g8 Ni+p9+jbsorR4/MmuQCWqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE 3FRbJRefAF23zBygo5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGVO/ r2QrWCJcsXj2O5YGxt/8XYycHBICJhL/5xxng7DFJC7cWw9mCwlMZ5R4uDSxi5ELyJ7AJLHw yntGkASbgK7Ek/dzmUFsEYFsif7bq1lAipgFTjFKzN48jR0kISwQKbG/fSeYzSKgKvG6qZ8J xOYV8JA4sHYW0AYOoG0KEnMm2YCEOQU8JZZ8mMQMsdhD4u65Q4wTGHkXMDKsYhRNLUguKE5K zzXSK07MLS7NS9dLzs/dxAiOr2fSOxhXNVgcYhTgYFTi4T2wamewEGtiWXFl7iFGCQ5mJRHe M25AId6UxMqq1KL8+KLSnNTiQ4ymQEdNZJYSTc4Hxn5eSbyhsYm5qbGppYmFiZmlkjjvwVbr QCGB9MSS1OzU1ILUIpg+Jg5OqQZGvtLM38/meAR8VPHM2L1hgiQ3U/wf3YgY/TNncu83f80T nWu4pUWmOG+i0+qXUt9s37Sem6Y7R+dDiMVhy8nTPxxbeXyfgmZWl4h13+tX0w0WbrOTy0ou CZAoEJ6svttl82rOOLNnPWtZmXbe37uVzeTb3t9n396ROvNALCBqoWPD2r0eqimvlViKMxIN tZiLihMBCQUiAcUCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Current "pm_domain.c" file uses "S5P_INT_LOCAL_PWR_EN" definition from "regs-pmu.h" and hence needs to include this header file. As there is no other user of "S5P_INT_LOCAL_PWR_EN" definition other than pm_domain, to remove "regs-pmu.h" header file dependency from "pm_domain.c" it's better we define this definition in "pm_domain.c" file itself and thus it will help in removing header file inclusion from "pm_domain.c". Also removing "S5P_" prefix from macro. Signed-off-by: Pankaj Dubey Reviewed-by: Tomasz Figa --- arch/arm/mach-exynos/pm_domains.c | 8 ++++---- arch/arm/mach-exynos/regs-pmu.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index fe6570e..bcd8dcf 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -22,7 +22,7 @@ #include #include -#include "regs-pmu.h" +#define INT_LOCAL_PWR_EN 0x7 /* * Exynos specific wrapper around the generic power domain @@ -44,13 +44,13 @@ static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on) pd = container_of(domain, struct exynos_pm_domain, pd); base = pd->base; - pwr = power_on ? S5P_INT_LOCAL_PWR_EN : 0; + pwr = power_on ? INT_LOCAL_PWR_EN : 0; __raw_writel(pwr, base); /* Wait max 1ms */ timeout = 10; - while ((__raw_readl(base + 0x4) & S5P_INT_LOCAL_PWR_EN) != pwr) { + while ((__raw_readl(base + 0x4) & INT_LOCAL_PWR_EN) != pwr) { if (!timeout) { op = (power_on) ? "enable" : "disable"; pr_err("Power domain %s %s failed\n", domain->name, op); @@ -172,7 +172,7 @@ static __init int exynos4_pm_init_power_domain(void) platform_set_drvdata(pdev, pd); - on = __raw_readl(pd->base + 0x4) & S5P_INT_LOCAL_PWR_EN; + on = __raw_readl(pd->base + 0x4) & INT_LOCAL_PWR_EN; pm_genpd_init(&pd->pd, NULL, !on); } diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index e6fa6cf..e5e298c 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h @@ -128,7 +128,6 @@ #define S5P_PAD_RET_EBIB_OPTION S5P_PMUREG(0x31A8) #define S5P_CORE_LOCAL_PWR_EN 0x3 -#define S5P_INT_LOCAL_PWR_EN 0x7 /* Only for EXYNOS4210 */ #define S5P_CMU_CLKSTOP_LCD1_LOWPWR S5P_PMUREG(0x1154)