From patchwork Fri Nov 13 09:29:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 7609341 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E00029F1C2 for ; Fri, 13 Nov 2015 09:35:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56750202BE for ; Fri, 13 Nov 2015 09:35:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31679202AE for ; Fri, 13 Nov 2015 09:35:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750760AbbKMJcq (ORCPT ); Fri, 13 Nov 2015 04:32:46 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:52813 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752670AbbKMJck (ORCPT ); Fri, 13 Nov 2015 04:32:40 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NXQ01PCCYIEUZ80@mailout1.samsung.com>; Fri, 13 Nov 2015 18:32:38 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.123]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id CD.5F.05385.63EA5465; Fri, 13 Nov 2015 18:32:38 +0900 (KST) X-AuditID: cbfee691-f79d66d000001509-42-5645ae36e785 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 24.DC.18629.63EA5465; Fri, 13 Nov 2015 18:32:38 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NXQ002KAYHMWY40@mmp1.samsung.com>; Fri, 13 Nov 2015 18:32:38 +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 v5 3/9] ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung" Date: Fri, 13 Nov 2015 14:59:37 +0530 Message-id: <1447406983-27835-4-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.4.5 In-reply-to: <1447406983-27835-1-git-send-email-pankaj.dubey@samsung.com> References: <1447406983-27835-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsWyRsSkWtdsnWuYwdlvOhYfV79ks/g76Ri7 xesXhha9C66yWXw9vILRYtPja6wWl3fNYbP43HuE0WLG+X1MFqeuf2azWLT1C7tFxzJGBx6P 378mMXrsnHWX3ePOtT1sHpuX1HtcOdHE6tG3ZRWjx+dNcgHsUVw2Kak5mWWpRfp2CVwZt67+ YyrYpV+xat9dxgbGTepdjJwcEgImEpP/7WOHsMUkLtxbz9bFyMUhJLCCUeJf2xmWLkYOsKK7 L5wg4ksZJd4s/80E4bQySZz+vResm01AV+LJ+7nMIAkRgVZGiWX7/4NVMQscYJTYse4VI0iV sECUxJnj7awgNouAqsTBw+/YQGxeAQ+Ja1tXMEGsk5NY2lwLEuYU8JR4PnUhM4gtBFRyfOFZ RohTL7FL9HSzQ4wRkPg2+RDUpbISmw4wQ5RIShxccYNlAqPwAkaGVYyiqQXJBcVJ6UWmesWJ ucWleel6yfm5mxiBcXL637OJOxjvH7A+xCjAwajEw7vjhUuYEGtiWXFl7iFGU6ANE5mlRJPz gdGYVxJvaGxmZGFqYmpsZG5ppiTOqyP9M1hIID2xJDU7NbUgtSi+qDQntfgQIxMHp1QD45R9 JzatOHLthvMcfq+e1BvyZUKdsl7KO9Pb+udGJmctZZ63Xmu2g39LyVUxwZpnIsfjaoLPzg7Y vEnfId1k5VPf7dPcHn/dV/y3m/XRr6pprz5sbo1YWPHstUDytYOxgTrtPmuYlmVs+nWx75cY z68wjxrWN/sP/T7luMfJr3GPrdKiZoaFm5VYijMSDbWYi4oTAaV4YoKOAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJIsWRmVeSWpSXmKPExsVy+t9jAV2zda5hBs9nqFp8XP2SzeLvpGPs Fq9fGFr0LrjKZvH18ApGi02Pr7FaXN41h83ic+8RRosZ5/cxWZy6/pnNYtHWL+wWHcsYHXg8 fv+axOixc9Zddo871/aweWxeUu9x5UQTq0ffllWMHp83yQWwRzUw2mSkJqakFimk5iXnp2Tm pdsqeQfHO8ebmhkY6hpaWpgrKeQl5qbaKrn4BOi6ZeYA3amkUJaYUwoUCkgsLlbSt8M0ITTE TdcCpjFC1zckCK7HyAANJKxhzLh19R9TwS79ilX77jI2MG5S72Lk4JAQMJG4+8Kpi5ETyBST uHBvPVsXIxeHkMBSRok3y38zQTitTBKnf+9lB6liE9CVePJ+LjNIQkSglVFi2f7/YFXMAgcY JXase8UIUiUsECVx5ng7K4jNIqAqcfDwOzYQm1fAQ+La1hVMEKvlJJY214KEOQU8JZ5PXcgM YgsBlRxfeJZxAiPvAkaGVYwSqQXJBcVJ6blGeanlesWJucWleel6yfm5mxjB0fhMegfj4V3u hxgFOBiVeHh3vHAJE2JNLCuuzD3EKMHBrCTCu/gZUIg3JbGyKrUoP76oNCe1+BCjKdBdE5ml RJPzgYkiryTe0NjE3NTY1NLEwsTMUkmcV9/TKExIID2xJDU7NbUgtQimj4mDU6qBMXr9g/sT JqaIWW460hexS9vSWWtiyF/GPRuCd6vVKf2J0d/M8KDr/0/Lk+zpdVybzb2uTrj9O8/JLdV/ v4+5A3fKztZKw39dm63PbjASLs220hK02Xn+s3bWfcszb9Xf3/puYqO67nBIzqmzF9YEPTXK n3mrtp9DccseV/ncFnnH9apndyv+VmIpzkg01GIuKk4EAD2qImvcAgAA 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=-7.2 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 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 --- 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 d40f7e9..3974f52 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c @@ -17,10 +17,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 21abd9b..d02f7c3 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include #include @@ -36,8 +38,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 */