From patchwork Mon Oct 26 12:55:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 7488081 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8681FBEEA4 for ; Mon, 26 Oct 2015 13:02:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F32F2206EF for ; Mon, 26 Oct 2015 13:02:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C541206A1 for ; Mon, 26 Oct 2015 13:02:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZqhOI-00037i-5R; Mon, 26 Oct 2015 13:00:46 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZqhOD-0002zI-JF for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2015 13:00:43 +0000 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 <0NWT01F3BW4GQF20@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2015 22:00:16 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.123]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id B2.60.05385.0E32E265; Mon, 26 Oct 2015 22:00:16 +0900 (KST) X-AuditID: cbfee691-f79d66d000001509-70-562e23e08fef Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 5A.5B.23663.0E32E265; Mon, 26 Oct 2015 22:00:16 +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 <0NWT00EECVZZAV40@mmp1.samsung.com>; Mon, 26 Oct 2015 22:00:16 +0900 (KST) From: Pankaj Dubey To: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/7] ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung" Date: Mon, 26 Oct 2015 18:25:38 +0530 Message-id: <1445864143-25695-3-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.4.5 In-reply-to: <1445864143-25695-1-git-send-email-pankaj.dubey@samsung.com> References: <1445864143-25695-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBLMWRmVeSWpSXmKPExsWyRsSkWveBsl6YwcUtuhYfV79ks3j9wtCi d8FVNotNj6+xWlzeNYfNYsb5fUwWi7Z+YbfoWMbowOGxc9Zddo/NS+o9+rasYvT4vEkugCWK yyYlNSezLLVI3y6BK+PB7WcsBRP1K05uusDWwNim3sXIySEhYCKxdddeNghbTOLCvfVANheH kMAKRonuL9dYYIo2ftnACJFYyihxft0KFginlUni8rRuZpAqNgFdiSfv54LZIgLZElca7zOD FDELdDNKHLu7GmyHsECUxPplV5lAbBYBVYmjG9+DxXkFPCRO950BWsEBtE5OYmlzLUiYU8BT YtO7xywgYSGgkikNwiAjJQTmsUvMeHSfEWKMgMS3yYdYIFplJTYdYIY4WlLi4IobLBMYhRcw MqxiFE0tSC4oTkovMtUrTswtLs1L10vOz93ECAzw0/+eTdzBeP+A9SFGAQ5GJR7eFzy6YUKs iWXFlbmHGE2BNkxklhJNzgfGUV5JvKGxmZGFqYmpsZG5pZmSOK+O9M9gIYH0xJLU7NTUgtSi +KLSnNTiQ4xMHJxSDYxCtxMniHNfn8dz4KHzI/d0t7h0owDx27/tfk840LNwYpHW/HnllZ5a 82YZrm1fv/LnPnaz7nU3Hs8X1b6V0dT4a6nrmkdvlj/Zqs/Fzfil6QnnliOajHsvfHjTsrKi ysxmRmfPEk+Bp80l976K3VSLkMm4I53FnmZmL77uWpb2qlTbtRMOu2gqsRRnJBpqMRcVJwIA 1dJhTGsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsVy+t9jAd0HynphBnOfqFh8XP2SzeL1C0OL 3gVX2Sw2Pb7GanF51xw2ixnn9zFZLNr6hd2iYxmjA4fHzll32T02L6n36NuyitHj8ya5AJao BkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKAjlBTK EnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZD24/YymYqF9xctMFtgbGNvUu Rk4OCQETiY1fNjBC2GISF+6tZ+ti5OIQEljKKHF+3QoWCKeVSeLytG5mkCo2AV2JJ+/ngtki AtkSVxrvM4MUMQt0M0ocu7uaDSQhLBAlsX7ZVSYQm0VAVeLoxvdgcV4BD4nTfWeA1nEArZOT WNpcCxLmFPCU2PTuMQtIWAioZEqD8ARG3gWMDKsYJVILkguKk9JzDfNSy/WKE3OLS/PS9ZLz czcxgqPomdQOxoO73A8xCnAwKvHwvuDRDRNiTSwrrsw9xCjBwawkwvtVQS9MiDclsbIqtSg/ vqg0J7X4EKMp0FkTmaVEk/OBEZ5XEm9obGJuamxqaWJhYmapJM57IUMjTEggPbEkNTs1tSC1 CKaPiYNTqoFxgXG1rkvF/A1dRbIyanpf9wj27FWU/9uob+/gceJT5rld3JxzMpeELE4q+uJb 8Xp1xbM1ypMjL7Q3uFzaVSb36xGfF79Fwe+Og9s4fq/iMllreYPDl/tEmK3WPwFJ+flfJbZa ec37OMNQdGfm/5+rmi5x89zInHrIsJjlzQ2zExkedvEfTxxQYinOSDTUYi4qTgQASVmVqrgC AAA= 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-20151026_060041_838904_0755DEEA X-CRM114-Status: GOOD ( 11.95 ) X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: amitdanielk@gmail.com, k.kozlowski@samsung.com, kgene.kim@samsung.com, thomas.ab@samsung.com, Pankaj Dubey MIME-Version: 1.0 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.2 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 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 --- 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 | 2 +- .../regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) rename {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h (90%) 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 d936ffa..acbb012 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 90% rename from arch/arm/mach-exynos/exynos-pmu.h rename to include/linux/soc/samsung/exynos-pmu.h index a2ab0d5..50dd0aa 100644 --- a/arch/arm/mach-exynos/exynos-pmu.h +++ b/include/linux/soc/samsung/exynos-pmu.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * http://www.samsung.com * * Header for EXYNOS PMU Driver support 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..3a5b7ff 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/include/linux/soc/samsung/exynos-regs-pmu.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * http://www.samsung.com * * EXYNOS - Power management unit definition @@ -9,8 +9,8 @@ * published by the Free Software Foundation. */ -#ifndef __ASM_ARCH_REGS_PMU_H -#define __ASM_ARCH_REGS_PMU_H __FILE__ +#ifndef __EXYNOS_REGS_PMU_H +#define __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 /* __EXYNOS_REGS_PMU_H */