Messages in this thread Patch in this message | | | From | Eric Miao <> | Date | Fri, 7 Oct 2011 15:28:07 +0800 | Subject | Re: [PATCH 12/26] ARM: pxa: pxa95x/saarb depends on pxa3xx code |
| |
On Sun, Oct 2, 2011 at 4:03 AM, Arnd Bergmann <arnd@arndb.de> wrote: > saarb uses pxa3xx_map_io and pxa3xx_handle_irq, which are part > of the pxa3xx code. This makes sure the necessary header and > implementation is used when building the board file. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/mach-pxa/Makefile | 2 +- > arch/arm/mach-pxa/saarb.c | 2 ++ > 2 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile > index cc39d17..be0f7df 100644 > --- a/arch/arm/mach-pxa/Makefile > +++ b/arch/arm/mach-pxa/Makefile > @@ -19,7 +19,7 @@ endif > obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa25x.o > obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa27x.o > obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o > -obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa95x.o smemc.o > +obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o pxa95x.o smemc.o > obj-$(CONFIG_CPU_PXA300) += pxa300.o > obj-$(CONFIG_CPU_PXA320) += pxa320.o > obj-$(CONFIG_CPU_PXA930) += pxa930.o > diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c > index ebd6379..829c514 100644 > --- a/arch/arm/mach-pxa/saarb.c > +++ b/arch/arm/mach-pxa/saarb.c > @@ -25,6 +25,8 @@ > #include <mach/mfp-pxa930.h> > #include <mach/gpio.h> > > +#include <mach/pxa930.h> > + > #include "generic.h" > > #define SAARB_NR_IRQS (IRQ_BOARD_START + 40) > -- > 1.7.5.4 > >
PXA95x is actually PJ4 based, which is ARMv7/v6 compatible, not like it's predecessor PXA93x. Although they are currently sharing some code, I expect a fork in the near future. To cause less confusion here, I'd propose to further introduce pxa95x.h, and to remove the unnecessary #include of <mach/mfp.h> and <mach/mfp-pxa930.h>
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index cc39d17..be0f7df 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -19,7 +19,7 @@ endif obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa25x.o obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa27x.o obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o -obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa95x.o smemc.o +obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o pxa95x.o smemc.o obj-$(CONFIG_CPU_PXA300) += pxa300.o obj-$(CONFIG_CPU_PXA320) += pxa320.o obj-$(CONFIG_CPU_PXA930) += pxa930.o diff --git a/arch/arm/mach-pxa/include/mach/pxa95x.h b/arch/arm/mach-pxa/include/mach/pxa95x.h new file mode 100644 index 0000000..cbb097c --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa95x.h @@ -0,0 +1,7 @@ +#ifndef __MACH_PXA95X_H +#define __MACH_PXA95X_H + +#include <mach/pxa3xx.h> +#include <mach/mfp-pxa930.h> + +#endif /* __MACH_PXA95X_H */ diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c index ebd6379..aebd5d9 100644 --- a/arch/arm/mach-pxa/saarb.c +++ b/arch/arm/mach-pxa/saarb.c @@ -21,9 +21,8 @@
#include <mach/irqs.h> #include <mach/hardware.h> -#include <mach/mfp.h> -#include <mach/mfp-pxa930.h> #include <mach/gpio.h> +#include <mach/pxa95x.h>
#include "generic.h" -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |