From: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> To: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> Cc: linux-mmc <linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, scott.wood-3arQi8VN3Tc@public.gmane.org, "linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" <linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>, Yangbo Lu <yangbo.lu-3arQi8VN3Tc@public.gmane.org> Subject: Re: [v7, 4/5] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Tue, 5 Apr 2016 11:54:19 +0200 [thread overview] Message-ID: <CAPDyKFrz-CbkTo+249vtibmzeTG17G3OXajawL3C_a8Cvp1SBg@mail.gmail.com> (raw) In-Reply-To: <1459480051-3701-5-git-send-email-yangbo.lu-3arQi8VN3Tc@public.gmane.org> - decreasing the cc list significantly On 1 April 2016 at 05:07, Yangbo Lu <yangbo.lu-3arQi8VN3Tc@public.gmane.org> 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 <yangbo.lu-3arQi8VN3Tc@public.gmane.org> > Acked-by: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> > --- > 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 <linux/fsl/svr.h>' 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 <linux/fsl/svr.h> > #include <asm/page.h> > #include <asm/processor.h> > #include <asm/cputable.h> > #include <asm/ppc_asm.h> > #include <asm/mmu-book3e.h> > #include <asm/asm-offsets.h> > -#include <asm/mpc85xx.h> > > _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 <linux/clk.h> > #include <linux/clk-provider.h> > #include <linux/fsl/guts.h> > +#include <linux/fsl/svr.h> > #include <linux/io.h> > #include <linux/kernel.h> > #include <linux/module.h> > @@ -1148,8 +1149,6 @@ bad_args: > } > > #ifdef CONFIG_PPC > -#include <asm/mpc85xx.h> > - > 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 <linux/i2c.h> > #include <linux/interrupt.h> > #include <linux/delay.h> > +#include <linux/fsl/svr.h> > > #include <asm/mpc52xx.h> > -#include <asm/mpc85xx.h> > #include <sysdev/fsl_soc.h> > > #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 <linux/fsl/guts.h> > +#include <linux/fsl/svr.h> > #include <linux/interrupt.h> > #include <linux/genalloc.h> > > -#include <asm/mpc85xx.h> > - > /* 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 <linux/udp.h> > #include <linux/in.h> > #include <linux/net_tstamp.h> > +#include <linux/fsl/svr.h> > > #include <asm/io.h> > #ifdef CONFIG_PPC > #include <asm/reg.h> > -#include <asm/mpc85xx.h> > #endif > #include <asm/irq.h> > #include <asm/uaccess.h> > 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 >
WARNING: multiple messages have this Message-ID (diff)
From: Ulf Hansson <ulf.hansson@linaro.org> To: Joerg Roedel <joro@8bytes.org> Cc: "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>, Yangbo Lu <yangbo.lu@nxp.com>, iommu@lists.linux-foundation.org, linux-mmc <linux-mmc@vger.kernel.org>, scott.wood@nxp.com Subject: Re: [v7, 4/5] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Tue, 5 Apr 2016 11:54:19 +0200 [thread overview] Message-ID: <CAPDyKFrz-CbkTo+249vtibmzeTG17G3OXajawL3C_a8Cvp1SBg@mail.gmail.com> (raw) In-Reply-To: <1459480051-3701-5-git-send-email-yangbo.lu@nxp.com> - decreasing the cc list significantly On 1 April 2016 at 05:07, Yangbo Lu <yangbo.lu@nxp.com> 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 <yangbo.lu@nxp.com> > Acked-by: Wolfram Sang <wsa@the-dreams.de> > --- > 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 <linux/fsl/svr.h>' 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 <linux/fsl/svr.h> > #include <asm/page.h> > #include <asm/processor.h> > #include <asm/cputable.h> > #include <asm/ppc_asm.h> > #include <asm/mmu-book3e.h> > #include <asm/asm-offsets.h> > -#include <asm/mpc85xx.h> > > _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 <linux/clk.h> > #include <linux/clk-provider.h> > #include <linux/fsl/guts.h> > +#include <linux/fsl/svr.h> > #include <linux/io.h> > #include <linux/kernel.h> > #include <linux/module.h> > @@ -1148,8 +1149,6 @@ bad_args: > } > > #ifdef CONFIG_PPC > -#include <asm/mpc85xx.h> > - > 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 <linux/i2c.h> > #include <linux/interrupt.h> > #include <linux/delay.h> > +#include <linux/fsl/svr.h> > > #include <asm/mpc52xx.h> > -#include <asm/mpc85xx.h> > #include <sysdev/fsl_soc.h> > > #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 <linux/fsl/guts.h> > +#include <linux/fsl/svr.h> > #include <linux/interrupt.h> > #include <linux/genalloc.h> > > -#include <asm/mpc85xx.h> > - > /* 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 <linux/udp.h> > #include <linux/in.h> > #include <linux/net_tstamp.h> > +#include <linux/fsl/svr.h> > > #include <asm/io.h> > #ifdef CONFIG_PPC > #include <asm/reg.h> > -#include <asm/mpc85xx.h> > #endif > #include <asm/irq.h> > #include <asm/uaccess.h> > 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 >
next prev parent reply other threads:[~2016-04-05 9:54 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-01 3:07 [v7, 0/5] Fix eSDHC host version register bug Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` [v7, 1/5] ARM64: dts: ls2080a: add device configuration node Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` [v7, 2/5] soc: fsl: add GUTS driver for QorIQ platforms Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` [v7, 3/5] dt: move guts devicetree doc out of powerpc directory Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-04 5:15 ` Rob Herring 2016-04-04 5:15 ` Rob Herring 2016-04-04 5:15 ` Rob Herring 2016-04-04 5:15 ` Rob Herring 2016-04-01 3:07 ` [v7, 4/5] powerpc/fsl: move mpc85xx.h to include/linux/fsl Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 19:03 ` Stephen Boyd 2016-04-01 19:03 ` Stephen Boyd 2016-04-01 19:03 ` Stephen Boyd [not found] ` <1459480051-3701-5-git-send-email-yangbo.lu-3arQi8VN3Tc@public.gmane.org> 2016-04-05 9:54 ` Ulf Hansson [this message] 2016-04-05 9:54 ` Ulf Hansson 2016-04-05 10:35 ` Joerg Roedel 2016-04-05 10:35 ` Joerg Roedel 2016-04-01 3:07 ` [v7, 5/5] mmc: sdhci-of-esdhc: fix host version for T4240-R1.0-R2.0 Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 3:07 ` Yangbo Lu 2016-04-01 22:25 ` [v7, 0/5] Fix eSDHC host version register bug Scott Wood 2016-04-01 22:25 ` Scott Wood 2016-04-01 22:25 ` Scott Wood 2016-04-05 11:27 ` Ulf Hansson 2016-04-05 11:27 ` Ulf Hansson 2016-04-05 11:27 ` Ulf Hansson 2016-04-05 11:27 ` Ulf Hansson 2016-04-06 6:12 ` Yangbo Lu 2016-04-06 6:12 ` Yangbo Lu 2016-04-06 6:12 ` Yangbo Lu 2016-04-06 6:12 ` Yangbo Lu 2016-04-06 6:12 ` Yangbo Lu 2016-04-06 6:12 ` Yangbo Lu 2016-04-06 8:14 ` Ulf Hansson 2016-04-06 8:14 ` Ulf Hansson 2016-04-06 8:14 ` Ulf Hansson 2016-04-06 8:14 ` Ulf Hansson 2016-04-11 2:54 ` Yangbo Lu 2016-04-11 2:54 ` Yangbo Lu 2016-04-11 2:54 ` Yangbo Lu 2016-04-11 2:54 ` Yangbo Lu 2016-04-11 2:54 ` Yangbo Lu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAPDyKFrz-CbkTo+249vtibmzeTG17G3OXajawL3C_a8Cvp1SBg@mail.gmail.com \ --to=ulf.hansson-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \ --cc=linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=scott.wood-3arQi8VN3Tc@public.gmane.org \ --cc=yangbo.lu-3arQi8VN3Tc@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.