From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x22d.google.com (mail-wm0-x22d.google.com [IPv6:2a00:1450:400c:c09::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3qfPMl2d8mzDq6T for ; Tue, 5 Apr 2016 19:54:25 +1000 (AEST) Received: by mail-wm0-x22d.google.com with SMTP id f198so24442141wme.0 for ; Tue, 05 Apr 2016 02:54:25 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1459480051-3701-5-git-send-email-yangbo.lu@nxp.com> References: <1459480051-3701-1-git-send-email-yangbo.lu@nxp.com> <1459480051-3701-5-git-send-email-yangbo.lu@nxp.com> Date: Tue, 5 Apr 2016 11:54:19 +0200 Message-ID: Subject: Re: [v7, 4/5] powerpc/fsl: move mpc85xx.h to include/linux/fsl From: Ulf Hansson To: Joerg Roedel Cc: "linuxppc-dev@lists.ozlabs.org" , Yangbo Lu , iommu@lists.linux-foundation.org, linux-mmc , scott.wood@nxp.com Content-Type: text/plain; charset=UTF-8 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , - decreasing the cc list significantly On 1 April 2016 at 05:07, Yangbo Lu wrote: > Move mpc85xx.h to include/linux/fsl and rename it to svr.h as > a common header file. It has been used for mpc85xx and it will > be used for ARM-based SoC as well. > > Signed-off-by: Yangbo Lu > Acked-by: Wolfram Sang > --- > Changes for v2: > - None > Changes for v3: > - None > Changes for v4: > - None > Changes for v5: > - Changed to Move mpc85xx.h to include/linux/fsl/ > - Adjusted '#include ' position in file > Changes for v6: > - None > Changes for v7: > - Added 'Acked-by: Wolfram Sang' for I2C part > - Also applied to arch/powerpc/kernel/cpu_setup_fsl_booke.S > --- > arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- > drivers/clk/clk-qoriq.c | 3 +-- > drivers/i2c/busses/i2c-mpc.c | 2 +- > drivers/iommu/fsl_pamu.c | 3 +-- Hi Joerg, Could you have a look at the iommu parts here and provide your ack if you like it. I intend to queue this for 4.7 via my mmc tree, unless you see issues with that. Kind regards Uffe > drivers/net/ethernet/freescale/gianfar.c | 2 +- > arch/powerpc/include/asm/mpc85xx.h => include/linux/fsl/svr.h | 4 ++-- > 6 files changed, 7 insertions(+), 9 deletions(-) > rename arch/powerpc/include/asm/mpc85xx.h => include/linux/fsl/svr.h (97%) > > diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S > index 462aed9..2b0284e 100644 > --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S > +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S > @@ -13,13 +13,13 @@ > * > */ > > +#include > #include > #include > #include > #include > #include > #include > -#include > > _GLOBAL(__e500_icache_setup) > mfspr r0, SPRN_L1CSR1 > diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c > index 7bc1c45..fc7f722 100644 > --- a/drivers/clk/clk-qoriq.c > +++ b/drivers/clk/clk-qoriq.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1148,8 +1149,6 @@ bad_args: > } > > #ifdef CONFIG_PPC > -#include > - > static const u32 a4510_svrs[] __initconst = { > (SVR_P2040 << 8) | 0x10, /* P2040 1.0 */ > (SVR_P2040 << 8) | 0x11, /* P2040 1.1 */ > diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c > index 48ecffe..600704c 100644 > --- a/drivers/i2c/busses/i2c-mpc.c > +++ b/drivers/i2c/busses/i2c-mpc.c > @@ -27,9 +27,9 @@ > #include > #include > #include > +#include > > #include > -#include > #include > > #define DRV_NAME "mpc-i2c" > diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c > index a34355f..af8fb27 100644 > --- a/drivers/iommu/fsl_pamu.c > +++ b/drivers/iommu/fsl_pamu.c > @@ -21,11 +21,10 @@ > #include "fsl_pamu.h" > > #include > +#include > #include > #include > > -#include > - > /* define indexes for each operation mapping scenario */ > #define OMI_QMAN 0x00 > #define OMI_FMAN 0x01 > diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c > index d2f917a..2224b10 100644 > --- a/drivers/net/ethernet/freescale/gianfar.c > +++ b/drivers/net/ethernet/freescale/gianfar.c > @@ -86,11 +86,11 @@ > #include > #include > #include > +#include > > #include > #ifdef CONFIG_PPC > #include > -#include > #endif > #include > #include > diff --git a/arch/powerpc/include/asm/mpc85xx.h b/include/linux/fsl/svr.h > similarity index 97% > rename from arch/powerpc/include/asm/mpc85xx.h > rename to include/linux/fsl/svr.h > index 213f3a8..8d13836 100644 > --- a/arch/powerpc/include/asm/mpc85xx.h > +++ b/include/linux/fsl/svr.h > @@ -9,8 +9,8 @@ > * (at your option) any later version. > */ > > -#ifndef __ASM_PPC_MPC85XX_H > -#define __ASM_PPC_MPC85XX_H > +#ifndef FSL_SVR_H > +#define FSL_SVR_H > > #define SVR_REV(svr) ((svr) & 0xFF) /* SOC design resision */ > #define SVR_MAJ(svr) (((svr) >> 4) & 0xF) /* Major revision field*/ > -- > 2.1.0.27.g96db324 >