ARM: pxa: Colibri PXA320 PCMCIA driver

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

3 files changed, 19 insertions, 2 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index e9acf035437b..de886f3dfd39 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -215,7 +215,8 @@ config PCMCIA_PXA2XX
         depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
                     || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
                     || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
-                    || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI)
+                    || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
+                    || MACH_COLIBRI320)
         select PCMCIA_SOC_COMMON
         help
           Say Y here to include support for the PXA2xx PCMCIA controller
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 2fee7ef0c391..9a44a90dcf7a 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -71,6 +71,7 @@ pxa2xx-obj-$(CONFIG_MACH_STARGATE2)		+= pxa2xx_stargate2.o
 pxa2xx-obj-$(CONFIG_MACH_VPAC270)               += pxa2xx_vpac270.o
 pxa2xx-obj-$(CONFIG_MACH_BALLOON3)              += pxa2xx_balloon3.o
 pxa2xx-obj-$(CONFIG_MACH_COLIBRI)               += pxa2xx_colibri.o
+pxa2xx-obj-$(CONFIG_MACH_COLIBRI320)            += pxa2xx_colibri.o
 
 obj-$(CONFIG_PCMCIA_PXA2XX)                     += pxa2xx_base.o $(pxa2xx-obj-y)
 
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c
index 4ed876c4398b..c3f72192af66 100644
--- a/drivers/pcmcia/pxa2xx_colibri.c
+++ b/drivers/pcmcia/pxa2xx_colibri.c
@@ -27,6 +27,13 @@
 #define COLIBRI270_DETECT_GPIO  84
 #define COLIBRI270_READY_GPIO   1
 
+#define COLIBRI320_RESET_GPIO   77
+#define COLIBRI320_PPEN_GPIO    57
+#define COLIBRI320_BVD1_GPIO    53
+#define COLIBRI320_BVD2_GPIO    79
+#define COLIBRI320_DETECT_GPIO  81
+#define COLIBRI320_READY_GPIO   29
+
 static struct {
         int     reset_gpio;
         int     ppen_gpio;
@@ -186,6 +193,14 @@ static int __init colibri_pcmcia_init(void)
                 colibri_pcmcia_gpio.bvd2_gpio   = COLIBRI270_BVD2_GPIO;
                 colibri_pcmcia_gpio.detect_gpio = COLIBRI270_DETECT_GPIO;
                 colibri_pcmcia_gpio.ready_gpio  = COLIBRI270_READY_GPIO;
+        /* Colibri PXA320 */
+        } else if (machine_is_colibri320()) {
+                colibri_pcmcia_gpio.reset_gpio  = COLIBRI320_RESET_GPIO;
+                colibri_pcmcia_gpio.ppen_gpio   = COLIBRI320_PPEN_GPIO;
+                colibri_pcmcia_gpio.bvd1_gpio   = COLIBRI320_BVD1_GPIO;
+                colibri_pcmcia_gpio.bvd2_gpio   = COLIBRI320_BVD2_GPIO;
+                colibri_pcmcia_gpio.detect_gpio = COLIBRI320_DETECT_GPIO;
+                colibri_pcmcia_gpio.ready_gpio  = COLIBRI320_READY_GPIO;
         }
 
         ret = platform_device_add_data(colibri_pcmcia_device,
@@ -209,6 +224,6 @@ module_init(colibri_pcmcia_init);
 module_exit(colibri_pcmcia_exit);
 
 MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
-MODULE_DESCRIPTION("PCMCIA support for Toradex Colibri PXA270");
+MODULE_DESCRIPTION("PCMCIA support for Toradex Colibri PXA270/PXA320");
 MODULE_ALIAS("platform:pxa2xx-pcmcia");
 MODULE_LICENSE("GPL");