From patchwork Tue Nov 17 06:05:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 7633141 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 E7050BF90C for ; Tue, 17 Nov 2015 06:11:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D83D8202E5 for ; Tue, 17 Nov 2015 06:11:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A43E620392 for ; Tue, 17 Nov 2015 06:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751639AbbKQGLB (ORCPT ); Tue, 17 Nov 2015 01:11:01 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:48561 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752446AbbKQGLA (ORCPT ); Tue, 17 Nov 2015 01:11:00 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NXY02P6B3UA6830@mailout4.samsung.com>; Tue, 17 Nov 2015 15:10:58 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.123]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id EA.5E.05284.2F4CA465; Tue, 17 Nov 2015 15:10:58 +0900 (KST) X-AuditID: cbfee68f-f796f6d0000014a4-53-564ac4f2936c Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id B3.10.18629.2F4CA465; Tue, 17 Nov 2015 15:10:58 +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 <0NXY00GBB3PUDS00@mmp2.samsung.com>; Tue, 17 Nov 2015 15:10:58 +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 v6 3/9] ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung" Date: Tue, 17 Nov 2015 11:35:45 +0530 Message-id: <1447740351-14246-4-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.4.5 In-reply-to: <1447740351-14246-1-git-send-email-pankaj.dubey@samsung.com> References: <1447740351-14246-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsWyRsSkWvfTEa8wg457yhYfV79ks/g76Ri7 xesXhha9C66yWXw9vILRYtPja6wWl3fNYbP43HuE0WLG+X1MFqeuf2azWLT1C7tFxzJGBx6P 378mMXrsnHWX3ePOtT1sHpuX1HtcOdHE6tG3ZRWjx+dNcgHsUVw2Kak5mWWpRfp2CVwZfffO shR806843XaCtYHxpXoXIyeHhICJxJ3/j1ghbDGJC/fWs3UxcnEICaxglJi8YCtLFyMHWNH/ k1UQ8VmMElM/34MqamWSaHp2hAmkm01AV+LJ+7nMIAkRgVZGiWX7/zOBOMwCBxgldqx7xQgy SlggSmJlTwJIA4uAqsS3C4fZQGxeAQ+J79e/skNsk5NY2lwLEuYU8JTYsRRkPgfQMg+JdyfU QSZKCJxjl3jS2c0GMUZA4tvkQ1CHykpsOsAM8YykxMEVN1gmMAovYGRYxSiaWpBcUJyUXmSs V5yYW1yal66XnJ+7iREYJaf/PevfwXj3gPUhRgEORiUe3oa/nmFCrIllxZW5hxhNgTZMZJYS Tc4HxmJeSbyhsZmRhamJqbGRuaWZkjjvQqmfwUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoY q482RZTrflK9cGPPv86sD77Tmr06k+2WPq91j87bH8n7adYhj7o5fqt2eMRO9bpVaqDBkZPc VPt+moDULPPlDcsmnKlxVjh4v6niVU/ymbYDEjNffklaubqAyWHJ1hW2GtqrSx7ppvP6JKWV Tinfy/Ziy9WaNPlrUxf/vmdu/fOHycrEhp8JSizFGYmGWsxFxYkA8QGdQY0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsVy+t9jQd1PR7zCDP6slLH4uPolm8XfScfY LV6/MLToXXCVzeLr4RWMFpseX2O1uLxrDpvF594jjBYzzu9jsjh1/TObxaKtX9gtOpYxOvB4 /P41idFj56y77B53ru1h89i8pN7jyokmVo++LasYPT5vkgtgj2pgtMlITUxJLVJIzUvOT8nM S7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wBulNJoSwxpxQoFJBYXKykb4dpQmiI m64FTGOErm9IEFyPkQEaSFjDmNF37yxLwTf9itNtJ1gbGF+qdzFycEgImEj8P1nVxcgJZIpJ XLi3nq2LkYtDSGAWo8TUz/egnFYmiaZnR5hAqtgEdCWevJ/LDJIQEWhllFi2/z8TiMMscIBR Yse6V4wgY4UFoiRW9iSANLAIqEp8u3CYDcTmFfCQ+H79KzvEZjmJpc21IGFOAU+JHUtB5nMA LfOQeHdCfQIj7wJGhlWMEqkFyQXFSem5Rnmp5XrFibnFpXnpesn5uZsYwZH4THoH4+Fd7ocY BTgYlXh4G/56hgmxJpYVV+YeYpTgYFYS4X1yyCtMiDclsbIqtSg/vqg0J7X4EKMp0FkTmaVE k/OBSSKvJN7Q2MTc1NjU0sTCxMxSSZxX39MoTEggPbEkNTs1tSC1CKaPiYNTqoGRITdR9IdE rtOahKD17wJ5TVi0XH89cLOoetBsojRjk4jMBm+n83z13yN13vj6mtim7Tytz1nSf+KXC8PE /q8bjMLzdG8qyy7NFTXZEPM0Zjv34lSFhAen5wgKNxwPSf5aK7vfvlZHcLVfVtDqoDvN718v sQuOOB7V0Ft5+41U+Uv2oi27pJVYijMSDbWYi4oTAUW5LojaAgAA 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.5 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 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 */