From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754371AbbKCBqz (ORCPT ); Mon, 2 Nov 2015 20:46:55 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:54397 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754016AbbKCBqw (ORCPT ); Mon, 2 Nov 2015 20:46:52 -0500 X-AuditID: cbfec7f5-f794b6d000001495-23-563812088462 Subject: Re: [PATCH v3 2/7] ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung" To: Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <1445864143-25695-1-git-send-email-pankaj.dubey@samsung.com> <1445864143-25695-3-git-send-email-pankaj.dubey@samsung.com> Cc: kgene.kim@samsung.com, thomas.ab@samsung.com, amitdanielk@gmail.com From: Krzysztof Kozlowski X-Enigmail-Draft-Status: N1110 Message-id: <563811FE.6010108@samsung.com> Date: Tue, 03 Nov 2015 10:46:38 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-version: 1.0 In-reply-to: <1445864143-25695-3-git-send-email-pankaj.dubey@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsVy+t/xy7ocQhZhBnd7TC0+rn7JZvH6haFF 74KrbBabHl9jtbi8aw6bxYzz+5gsFm39wm7RsYzRgcNj56y77B6bl9R79G1ZxejxeZNcAEsU l01Kak5mWWqRvl0CV8a2NUvYCx6YVHyan97AeEuri5GTQ0LARGLVwkmsELaYxIV769m6GLk4 hASWMkrsXX6GEcL5wijRvrSBEaRKWCBOYv6pk2BVIgJTGCUu9iyDqmpnlLh1eBozSBWzgLvE yu4/YB1sAsYSm5cvYYPYISfR2z2JpYuRg4NXQEti5foakDCLgKpE6967YCWiAhESEyc0gJ3E KyAo8WPyPRYQm1PAU+LlopVgrcwCehL3L2pBbJKX2LzmLfMERsFZSDpmIVTNQlK1gJF5FaNo amlyQXFSeq6RXnFibnFpXrpecn7uJkZI0H/dwbj0mNUhRgEORiUe3gVLzMOEWBPLiitzDzFK cDArifC+5LIIE+JNSaysSi3Kjy8qzUktPsQozcGiJM47c9f7ECGB9MSS1OzU1ILUIpgsEwen VANj0QW51qqwlQvOfFhx4bHCf5GHMseXpp6WMD2n9kaVewWriqygVcmkyHtSG00KNVemH7rT zpLOcD56ApN409VdG448WbjXa/L6XzdeNKnolNdksKfoKhucnqW6vMK5oTXEXKwj5t3NN8ci rt/Y98/qymKOg8d2Tngq2ME2ZePBgENLlRtZ9k6YpsRSnJFoqMVcVJwIALUIn+Z2AgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 26.10.2015 21:55, Pankaj Dubey wrote: > 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. No changes in file, don't touch the copyright date. Instead please update the header-inclusion guard: __SOC_EXYNOS_PMU_H or maybe even (because you added exynos-pmu.h in next patch): __LINUX_SOC_EXYNOS_PMU_H > * 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 */ > ditto, copyright may stay but please add SOC prefix to define. Best regards, Krzysztof