From patchwork Fri Dec 18 03:32:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 7879641 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C631FBEEED for ; Fri, 18 Dec 2015 03:36:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B39682045A for ; Fri, 18 Dec 2015 03:36:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8919F20462 for ; Fri, 18 Dec 2015 03:36:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932415AbbLRDgh (ORCPT ); Thu, 17 Dec 2015 22:36:37 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:42939 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754791AbbLRDgP (ORCPT ); Thu, 17 Dec 2015 22:36:15 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NZJ01M0VBCDMB70@mailout4.samsung.com>; Fri, 18 Dec 2015 12:36:13 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.126]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 58.58.04790.D2F73765; Fri, 18 Dec 2015 12:36:13 +0900 (KST) X-AuditID: cbfee691-f79766d0000012b6-bb-56737f2dabb0 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 8B.51.09068.D2F73765; Fri, 18 Dec 2015 12:36:13 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NZJ001T4BB8PW20@mmp2.samsung.com>; Fri, 18 Dec 2015 12:36:13 +0900 (KST) From: Pankaj Dubey To: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Cc: kgene.kim@samsung.com, k.kozlowski@samsung.com, thomas.ab@samsung.com, amitdanielk@gmail.com, olof@lixom.net, khilman@linaro.org, arnd@arndb.de, Pankaj Dubey Subject: [PATCH v7 1/6] ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung" Date: Fri, 18 Dec 2015 09:02:11 +0530 Message-id: <1450409536-30463-2-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.4.5 In-reply-to: <1450409536-30463-1-git-send-email-pankaj.dubey@samsung.com> References: <1450409536-30463-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRmVeSWpSXmKPExsWyRsSkTle3vjjM4OtxA4uPq1+yWfyddIzd 4vULQ4veBVfZLL4eXsFosenxNVaLy7vmsFl87j3CaDHj/D4mi1PXP7NZLNr6hd2iYxmjA4/H 71+TGD12zrrL7nHn2h42j81L6j2unGhi9ejbsorR4/MmuQD2KC6blNSczLLUIn27BK6MphOX GQuuGFbMebaNpYFxrWYXIyeHhICJxJZT0xghbDGJC/fWs3UxcnEICaxglHhxtIMFpuhSxzdG iMQsRomJk9dBOa1MEjevnWQGqWIT0JV48n4uM0hCRKCVUWLZ/v9MIA6zwAFGiR3rXoEtERaI kvg99RgriM0ioCrx5O5vNhCbV8BD4t7k90A2B9A+OYmlzbUgYU4BT4k5u94wgdhCQCXnX/Sx gsyUELjELvHiw2GoOQIS3yYfYoHolZXYdIAZ4mxJiYMrbrBMYBRewMiwilE0tSC5oDgpvchU rzgxt7g0L10vOT93EyMwVk7/ezZxB+P9A9aHGAU4GJV4eA3YisOEWBPLiitzDzGaAm2YyCwl mpwPjMi8knhDYzMjC1MTU2Mjc0szJXFeHemfwUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoY +wJk5t2uqg9+1H7Beu2T5ZLvZvIKTMgW+FH7ZWXnidJvjh3vBBesi243q2Bs1D7nMPuq9kPF rr/fjOK4v+7OMK3Y8/J2+KV+oesrmWyDN670KF1r/e8v984FC63sWz49vrPKcKJXw97UA9nv E0PUmbijFi6/k7XGQKSoTPW9ze/6PfVnC7YrKbEUZyQaajEXFScCAKlHVlCQAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFIsWRmVeSWpSXmKPExsVy+t9jQV3d+uIwgz27lS0+rn7JZvF30jF2 i9cvDC16F1xls/h6eAWjxabH11gtLu+aw2bxufcIo8WM8/uYLE5d/8xmsWjrF3aLjmWMDjwe v39NYvTYOesuu8eda3vYPDYvqfe4cqKJ1aNvyypGj8+b5ALYoxoYbTJSE1NSixRS85LzUzLz 0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA7lRSKEvMKQUKBSQWFyvp22GaEBri pmsB0xih6xsSBNdjZIAGEtYwZjSduMxYcMWwYs6zbSwNjGs1uxg5OSQETCQudXxjhLDFJC7c W8/WxcjFISQwi1Fi4uR1jBBOK5PEzWsnmUGq2AR0JZ68n8sMkhARaGWUWLb/PxOIwyxwgFFi x7pXYLOEBaIkfk89xgpiswioSjy5+5sNxOYV8JC4N/k9kM0BtE9OYmlzLUiYU8BTYs6uN0wg thBQyfkXfawTGHkXMDKsYpRILUguKE5KzzXKSy3XK07MLS7NS9dLzs/dxAiOx2fSOxgP73I/ xCjAwajEw3uDuThMiDWxrLgy9xCjBAezkghvQDhQiDclsbIqtSg/vqg0J7X4EKMp0F0TmaVE k/OBqSKvJN7Q2MTc1NjU0sTCxMxSSZx336XIMCGB9MSS1OzU1ILUIpg+Jg5OqQbGjifLXi44 WfV27p9tk9hCV4qvd3DlfpIjHTLDWMKuoFv3qM7/BwcbhY3j3j179z5c6d122c5w2dPB+Z+k VR86/2nv4jm0bOLNtxkKr4w2fa0xd1rY6K++w22XxYpKzfX7/faaGEz94WLYkch5+3Xs+rcS R/+ssy/cd6bswYU5mReS/lVN0L1vr8RSnJFoqMVcVJwIAJiPYe7dAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Moving Exynos PMU specific header file into "include/linux/soc/samsung" thus updated affected files under "mach-exynos" to use new location of these header files. Signed-off-by: Amit Daniel Kachhap Signed-off-by: Pankaj Dubey Reviewed-by: Krzysztof Kozlowski [for testing on Trats2 (Exynos4412) and Odroid XU3 (Exynos5422)] Tested-by: Krzysztof Kozlowski [for testing on Peach-Pi (Exynos5880)] Tested-by: Pankaj Dubey --- arch/arm/mach-exynos/exynos.c | 2 +- arch/arm/mach-exynos/mcpm-exynos.c | 2 +- arch/arm/mach-exynos/platsmp.c | 2 +- arch/arm/mach-exynos/pm.c | 4 ++-- arch/arm/mach-exynos/pmu.c | 6 +++--- arch/arm/mach-exynos/suspend.c | 4 ++-- {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h | 6 +++--- .../regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) rename {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h (81%) rename arch/arm/mach-exynos/regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h (99%) diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 4ffb90e..5d68ce8 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -31,7 +32,6 @@ #include "common.h" #include "mfc.h" -#include "regs-pmu.h" void __iomem *pmu_base_addr; diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c index 5697819..f086bf6 100644 --- a/arch/arm/mach-exynos/mcpm-exynos.c +++ b/arch/arm/mach-exynos/mcpm-exynos.c @@ -16,13 +16,13 @@ #include #include #include +#include #include #include #include #include -#include "regs-pmu.h" #include "common.h" #define EXYNOS5420_CPUS_PER_CLUSTER 4 diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 98a2c0c..d5caf30 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -30,7 +31,6 @@ #include #include "common.h" -#include "regs-pmu.h" extern void exynos4_secondary_startup(void); diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 9c1506b..b9b9186 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include @@ -29,8 +31,6 @@ #include #include "common.h" -#include "exynos-pmu.h" -#include "regs-pmu.h" static inline void __iomem *exynos_boot_vector_addr(void) { diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index dbf9fe9..2ff1956 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c @@ -15,10 +15,10 @@ #include #include -#include +#include +#include -#include "exynos-pmu.h" -#include "regs-pmu.h" +#include #define PMU_TABLE_END (-1U) diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index 237653e..f216909 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include @@ -37,8 +39,6 @@ #include #include "common.h" -#include "exynos-pmu.h" -#include "regs-pmu.h" #define REG_TABLE_END (-1U) diff --git a/arch/arm/mach-exynos/exynos-pmu.h b/include/linux/soc/samsung/exynos-pmu.h similarity index 81% rename from arch/arm/mach-exynos/exynos-pmu.h rename to include/linux/soc/samsung/exynos-pmu.h index a2ab0d5..e2e9de1 100644 --- a/arch/arm/mach-exynos/exynos-pmu.h +++ b/include/linux/soc/samsung/exynos-pmu.h @@ -9,8 +9,8 @@ * published by the Free Software Foundation. */ -#ifndef __EXYNOS_PMU_H -#define __EXYNOS_PMU_H +#ifndef __LINUX_SOC_EXYNOS_PMU_H +#define __LINUX_SOC_EXYNOS_PMU_H enum sys_powerdown { SYS_AFTR, @@ -21,4 +21,4 @@ enum sys_powerdown { extern void exynos_sys_powerdown_conf(enum sys_powerdown mode); -#endif /* __EXYNOS_PMU_H */ +#endif /* __LINUX_SOC_EXYNOS_PMU_H */ diff --git a/arch/arm/mach-exynos/regs-pmu.h b/include/linux/soc/samsung/exynos-regs-pmu.h similarity index 99% rename from arch/arm/mach-exynos/regs-pmu.h rename to include/linux/soc/samsung/exynos-regs-pmu.h index 5e4f4c2..d30186e 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/include/linux/soc/samsung/exynos-regs-pmu.h @@ -9,8 +9,8 @@ * published by the Free Software Foundation. */ -#ifndef __ASM_ARCH_REGS_PMU_H -#define __ASM_ARCH_REGS_PMU_H __FILE__ +#ifndef __LINUX_SOC_EXYNOS_REGS_PMU_H +#define __LINUX_SOC_EXYNOS_REGS_PMU_H __FILE__ #define S5P_CENTRAL_SEQ_CONFIGURATION 0x0200 @@ -690,4 +690,4 @@ | EXYNOS5420_KFC_USE_STANDBY_WFI2 \ | EXYNOS5420_KFC_USE_STANDBY_WFI3) -#endif /* __ASM_ARCH_REGS_PMU_H */ +#endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */