Commit b83deaa7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pxa: move pcmcia board data into mach-pxa 



The drivers/pcmcia/pxa2xx_*.c are essentially part of the
board files, but for historic reasons located in drivers/pcmcia.

Move them into the same place as the actual board file to avoid
lots of machine header inclusions.

Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 2548e6c7

arch/arm/mach-pxa/Makefile

+11 −7
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ obj-$(CONFIG_MACH_SAAR) += saar.o 
obj-$(CONFIG_ARCH_PXA_IDP)	+= idp.o

obj-$(CONFIG_ARCH_VIPER)	+= viper.o

obj-$(CONFIG_MACH_ARCOM_ZEUS)	+= zeus.o

obj-$(CONFIG_MACH_BALLOON3)	+= balloon3.o

obj-$(CONFIG_ARCOM_PCMCIA)	+= viper-pcmcia.o

obj-$(CONFIG_MACH_BALLOON3)	+= balloon3.o balloon3-pcmcia.o

obj-$(CONFIG_MACH_CSB726)	+= csb726.o

obj-$(CONFIG_CSB726_CSB701)	+= csb701.o

obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o
@@ -47,18 +48,20 @@ obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o 
obj-$(CONFIG_GUMSTIX_AM300EPD)	+= am300epd.o

obj-$(CONFIG_MACH_XCEP)         += xcep.o

obj-$(CONFIG_MACH_TRIZEPS4)	+= trizeps4.o

obj-$(CONFIG_TRIZEPS_PCMCIA)	+= trizeps4-pcmcia.o

obj-$(CONFIG_MACH_LOGICPD_PXA270)	+= lpd270.o

obj-$(CONFIG_MACH_PCM027)		+= pcm027.o

obj-$(CONFIG_MACH_PCM990_BASEBOARD)	+= pcm990-baseboard.o

obj-$(CONFIG_MACH_COLIBRI)			+= colibri-pxa270.o

obj-$(CONFIG_MACH_COLIBRI)		+= colibri-pxa270.o colibri-pcmcia.o

obj-$(CONFIG_MACH_COLIBRI_EVALBOARD)	+= colibri-evalboard.o

obj-$(CONFIG_MACH_COLIBRI_PXA270_INCOME)	+= colibri-pxa270-income.o

obj-$(CONFIG_MACH_COLIBRI300)	+= colibri-pxa3xx.o colibri-pxa300.o

obj-$(CONFIG_MACH_COLIBRI320)	+= colibri-pxa3xx.o colibri-pxa320.o

obj-$(CONFIG_MACH_VPAC270)	+= vpac270.o

obj-$(CONFIG_MACH_COLIBRI320)	+= colibri-pxa3xx.o colibri-pxa320.o colibri-pcmcia.o

obj-$(CONFIG_MACH_VPAC270)	+= vpac270.o vpac270-pcmcia.o



# End-user Products

obj-$(CONFIG_MACH_H4700)	+= hx4700.o

obj-$(CONFIG_MACH_H4700)	+= hx4700-pcmcia.o

obj-$(CONFIG_MACH_H5000)	+= h5000.o

obj-$(CONFIG_MACH_HIMALAYA)	+= himalaya.o

obj-$(CONFIG_MACH_MAGICIAN)	+= magician.o
@@ -66,12 +69,12 @@ obj-$(CONFIG_MACH_MIOA701) += mioa701.o mioa701_bootresume.o 
obj-$(CONFIG_PXA_EZX)           += ezx.o

obj-$(CONFIG_MACH_MP900C)	+= mp900.o

obj-$(CONFIG_MACH_PALMTE2)	+= palmte2.o

obj-$(CONFIG_MACH_PALMTC)	+= palmtc.o

obj-$(CONFIG_MACH_PALMTC)	+= palmtc.o palmtc-pcmcia.o

obj-$(CONFIG_MACH_PALM27X)	+= palm27x.o

obj-$(CONFIG_MACH_PALMT5)	+= palmt5.o

obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o

obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o palmtx-pcmcia.o

obj-$(CONFIG_MACH_PALMZ72)	+= palmz72.o

obj-$(CONFIG_MACH_PALMLD)	+= palmld.o

obj-$(CONFIG_MACH_PALMLD)	+= palmld.o palmld-pcmcia.o

obj-$(CONFIG_PALM_TREO)		+= palmtreo.o

obj-$(CONFIG_PXA_SHARP_C7xx)	+= corgi.o sharpsl_pm.o corgi_pm.o

obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o sharpsl_pm.o spitz_pm.o
@@ -79,6 +82,7 @@ obj-$(CONFIG_MACH_POODLE) += poodle.o 
obj-$(CONFIG_MACH_TOSA)		+= tosa.o

obj-$(CONFIG_MACH_ICONTROL)     += icontrol.o mxm8x10.o

obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o

obj-$(CONFIG_MACH_E740)		+= e740-pcmcia.o

obj-$(CONFIG_MACH_ZIPIT2)	+= z2.o



obj-$(CONFIG_PXA_SYSTEMS_CPLDS)	+= pxa_cplds_irqs.o

drivers/pcmcia/pxa2xx_balloon3.c→arch/arm/mach-pxa/balloon3-pcmcia.c

+2 −2
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
#include <linux/irq.h>

#include <linux/io.h>



#include <mach/balloon3.h>

#include "balloon3.h"



#include <asm/mach-types.h>



#include "soc_common.h"

#include <pcmcia/soc_common.h>



static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

arch/arm/mach-pxa/balloon3.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <asm/mach/flash.h>



#include "pxa27x.h"

#include <mach/balloon3.h>

#include "balloon3.h"

#include <linux/platform_data/asoc-pxa.h>

#include <linux/platform_data/video-pxafb.h>

#include <linux/platform_data/mmc-pxamci.h>

arch/arm/mach-pxa/include/mach/balloon3.h→arch/arm/mach-pxa/balloon3.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef ASM_ARCH_BALLOON3_H

#define ASM_ARCH_BALLOON3_H



#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */

#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO */



enum balloon3_features {

	BALLOON3_FEATURE_OHCI,

drivers/pcmcia/pxa2xx_colibri.c→arch/arm/mach-pxa/colibri-pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <asm/mach-types.h>



#include "soc_common.h"

#include <pcmcia/soc_common.h>



#define	COLIBRI270_RESET_GPIO	53

#define	COLIBRI270_PPEN_GPIO	107