[ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus

The Arcom Zeus CF slot requires the same kind of support as the Viper.
To avoid code duplication, introduce a platform device that abstracts
the differences.

This also allows for the removal of the ugly export of viper_cf_rst().

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 84dde7768ad5..87481ce60dfb 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -214,7 +214,8 @@ static void pxa2xx_configure_sockets(struct device *dev)
         MECR |= MECR_CIT;
 
         /* Set MECR:NOS (Number Of Sockets) */
-        if ((ops->first + ops->nr) > 1 || machine_is_viper())
+        if ((ops->first + ops->nr) > 1 ||
+            machine_is_viper() || machine_is_arcom_zeus())
                 MECR |= MECR_NOS;
         else
                 MECR &= ~MECR_NOS;