Skip to content

Commit b83deaa

Browse files
arndbarndb
committed
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 <[email protected]> Cc: Dominik Brodowski <[email protected]> Cc: Jonathan Cameron <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 2548e6c commit b83deaa

28 files changed

+165
-169
lines changed

‎arch/arm/mach-pxa/Makefile‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ obj-$(CONFIG_MACH_SAAR) += saar.o
3737
obj-$(CONFIG_ARCH_PXA_IDP) += idp.o
3838
obj-$(CONFIG_ARCH_VIPER) += viper.o
3939
obj-$(CONFIG_MACH_ARCOM_ZEUS) += zeus.o
40-
obj-$(CONFIG_MACH_BALLOON3) += balloon3.o
40+
obj-$(CONFIG_ARCOM_PCMCIA) += viper-pcmcia.o
41+
obj-$(CONFIG_MACH_BALLOON3) += balloon3.o balloon3-pcmcia.o
4142
obj-$(CONFIG_MACH_CSB726) += csb726.o
4243
obj-$(CONFIG_CSB726_CSB701) += csb701.o
4344
obj-$(CONFIG_MACH_CM_X300) += cm-x300.o
@@ -47,38 +48,41 @@ obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o
4748
obj-$(CONFIG_GUMSTIX_AM300EPD) += am300epd.o
4849
obj-$(CONFIG_MACH_XCEP) += xcep.o
4950
obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o
51+
obj-$(CONFIG_TRIZEPS_PCMCIA) += trizeps4-pcmcia.o
5052
obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
5153
obj-$(CONFIG_MACH_PCM027) += pcm027.o
5254
obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o
53-
obj-$(CONFIG_MACH_COLIBRI) += colibri-pxa270.o
55+
obj-$(CONFIG_MACH_COLIBRI) += colibri-pxa270.o colibri-pcmcia.o
5456
obj-$(CONFIG_MACH_COLIBRI_EVALBOARD) += colibri-evalboard.o
5557
obj-$(CONFIG_MACH_COLIBRI_PXA270_INCOME) += colibri-pxa270-income.o
5658
obj-$(CONFIG_MACH_COLIBRI300) += colibri-pxa3xx.o colibri-pxa300.o
57-
obj-$(CONFIG_MACH_COLIBRI320) += colibri-pxa3xx.o colibri-pxa320.o
58-
obj-$(CONFIG_MACH_VPAC270) += vpac270.o
59+
obj-$(CONFIG_MACH_COLIBRI320) += colibri-pxa3xx.o colibri-pxa320.o colibri-pcmcia.o
60+
obj-$(CONFIG_MACH_VPAC270) += vpac270.o vpac270-pcmcia.o
5961

6062
# End-user Products
6163
obj-$(CONFIG_MACH_H4700) += hx4700.o
64+
obj-$(CONFIG_MACH_H4700) += hx4700-pcmcia.o
6265
obj-$(CONFIG_MACH_H5000) += h5000.o
6366
obj-$(CONFIG_MACH_HIMALAYA) += himalaya.o
6467
obj-$(CONFIG_MACH_MAGICIAN) += magician.o
6568
obj-$(CONFIG_MACH_MIOA701) += mioa701.o mioa701_bootresume.o
6669
obj-$(CONFIG_PXA_EZX) += ezx.o
6770
obj-$(CONFIG_MACH_MP900C) += mp900.o
6871
obj-$(CONFIG_MACH_PALMTE2) += palmte2.o
69-
obj-$(CONFIG_MACH_PALMTC) += palmtc.o
72+
obj-$(CONFIG_MACH_PALMTC) += palmtc.o palmtc-pcmcia.o
7073
obj-$(CONFIG_MACH_PALM27X) += palm27x.o
7174
obj-$(CONFIG_MACH_PALMT5) += palmt5.o
72-
obj-$(CONFIG_MACH_PALMTX) += palmtx.o
75+
obj-$(CONFIG_MACH_PALMTX) += palmtx.o palmtx-pcmcia.o
7376
obj-$(CONFIG_MACH_PALMZ72) += palmz72.o
74-
obj-$(CONFIG_MACH_PALMLD) += palmld.o
77+
obj-$(CONFIG_MACH_PALMLD) += palmld.o palmld-pcmcia.o
7578
obj-$(CONFIG_PALM_TREO) += palmtreo.o
7679
obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o
7780
obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o
7881
obj-$(CONFIG_MACH_POODLE) += poodle.o
7982
obj-$(CONFIG_MACH_TOSA) += tosa.o
8083
obj-$(CONFIG_MACH_ICONTROL) += icontrol.o mxm8x10.o
8184
obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o
85+
obj-$(CONFIG_MACH_E740) += e740-pcmcia.o
8286
obj-$(CONFIG_MACH_ZIPIT2) += z2.o
8387

8488
obj-$(CONFIG_PXA_SYSTEMS_CPLDS) += pxa_cplds_irqs.o

‎drivers/pcmcia/pxa2xx_balloon3.c‎ renamed to ‎arch/arm/mach-pxa/balloon3-pcmcia.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include <linux/irq.h>
2121
#include <linux/io.h>
2222

23-
#include <mach/balloon3.h>
23+
#include "balloon3.h"
2424

2525
#include <asm/mach-types.h>
2626

27-
#include "soc_common.h"
27+
#include <pcmcia/soc_common.h>
2828

2929
static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
3030
{

‎arch/arm/mach-pxa/balloon3.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <asm/mach/flash.h>
4141

4242
#include "pxa27x.h"
43-
#include <mach/balloon3.h>
43+
#include "balloon3.h"
4444
#include <linux/platform_data/asoc-pxa.h>
4545
#include <linux/platform_data/video-pxafb.h>
4646
#include <linux/platform_data/mmc-pxamci.h>

‎arch/arm/mach-pxa/include/mach/balloon3.h‎ renamed to ‎arch/arm/mach-pxa/balloon3.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef ASM_ARCH_BALLOON3_H
1212
#define ASM_ARCH_BALLOON3_H
1313

14-
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
14+
#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO */
1515

1616
enum balloon3_features {
1717
BALLOON3_FEATURE_OHCI,

‎drivers/pcmcia/pxa2xx_colibri.c‎ renamed to ‎arch/arm/mach-pxa/colibri-pcmcia.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <asm/mach-types.h>
1616

17-
#include "soc_common.h"
17+
#include <pcmcia/soc_common.h>
1818

1919
#define COLIBRI270_RESET_GPIO 53
2020
#define COLIBRI270_PPEN_GPIO 107

‎drivers/pcmcia/pxa2xx_e740.c‎ renamed to ‎arch/arm/mach-pxa/e740-pcmcia.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <asm/irq.h>
1919
#include <asm/mach-types.h>
2020

21-
#include "soc_common.h"
21+
#include <pcmcia/soc_common.h>
2222

2323
static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
2424
{

‎drivers/pcmcia/pxa2xx_hx4700.c‎ renamed to ‎arch/arm/mach-pxa/hx4700-pcmcia.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <asm/mach-types.h>
1313
#include <mach/hx4700.h>
1414

15-
#include "soc_common.h"
15+
#include <pcmcia/soc_common.h>
1616

1717
static struct gpio gpios[] = {
1818
{ GPIO114_HX4700_CF_RESET, GPIOF_OUT_INIT_LOW, "CF reset" },

‎drivers/pcmcia/pxa2xx_palmld.c‎ renamed to ‎arch/arm/mach-pxa/palmld-pcmcia.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <asm/mach-types.h>
1616
#include <mach/palmld.h>
17-
#include "soc_common.h"
17+
#include <pcmcia/soc_common.h>
1818

1919
static struct gpio palmld_pcmcia_gpios[] = {
2020
{ GPIO_NR_PALMLD_PCMCIA_POWER, GPIOF_INIT_LOW, "PCMCIA Power" },

‎drivers/pcmcia/pxa2xx_palmtc.c‎ renamed to ‎arch/arm/mach-pxa/palmtc-pcmcia.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include <linux/delay.h>
1515

1616
#include <asm/mach-types.h>
17-
#include <mach/palmtc.h>
18-
#include "soc_common.h"
17+
#include "palmtc.h"
18+
#include <pcmcia/soc_common.h>
1919

2020
static struct gpio palmtc_pcmcia_gpios[] = {
2121
{ GPIO_NR_PALMTC_PCMCIA_POWER1, GPIOF_INIT_LOW, "PCMCIA Power 1" },

‎arch/arm/mach-pxa/palmtc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "pxa25x.h"
3232
#include <linux/platform_data/asoc-pxa.h>
33-
#include <mach/palmtc.h>
33+
#include "palmtc.h"
3434
#include <linux/platform_data/mmc-pxamci.h>
3535
#include <linux/platform_data/video-pxafb.h>
3636
#include <linux/platform_data/irda-pxaficp.h>

0 commit comments

Comments
 (0)