[ARM] 3230/1: Sharp Scoop: Fix Shared Power Control Issues

Patch from Richard Purdie

The SL-Cxx00 devices have a power control register in SCOOP that is
shared by both CF and MMC/SD card slots. The CF reset code was resetting
this register leading to various lockups as the MMC power was suddenly
lost. This patch handles the CPR register in a more sensitive manner.

It also removes some unneeded collie specific calls as the reset code
handles this.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index 56c58831e80e..4fbd995360b0 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -36,9 +36,18 @@
 struct scoop_pcmcia_config *platform_scoop_config;
 #define SCOOP_DEV platform_scoop_config->devs
 
-static void sharpsl_pcmcia_init_reset(struct scoop_pcmcia_dev *scoopdev)
+static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt)
 {
+        struct scoop_pcmcia_dev *scoopdev = &SCOOP_DEV[skt->nr];
+
         reset_scoop(scoopdev->dev);
+
+        /* Shared power controls need to be handled carefully */
+        if (platform_scoop_config->power_ctrl)
+                platform_scoop_config->power_ctrl(scoopdev->dev, 0x0000, skt->nr);
+        else
+                write_scoop_reg(scoopdev->dev, SCOOP_CPR, 0x0000);
+
         scoopdev->keep_vs = NO_KEEP_VS;
         scoopdev->keep_rd = 0;
 }
@@ -208,26 +217,17 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
 
 static void sharpsl_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
 {
-        sharpsl_pcmcia_init_reset(&SCOOP_DEV[skt->nr]);
+        sharpsl_pcmcia_init_reset(skt);
 
         /* Enable interrupt */
         write_scoop_reg(SCOOP_DEV[skt->nr].dev, SCOOP_IMR, 0x00C0);
         write_scoop_reg(SCOOP_DEV[skt->nr].dev, SCOOP_MCR, 0x0101);
         SCOOP_DEV[skt->nr].keep_vs = NO_KEEP_VS;
-
-        if (machine_is_collie())
-                /* We need to disable SS_OUTPUT_ENA here. */
-                write_scoop_reg(SCOOP_DEV[skt->nr].dev, SCOOP_CPR, read_scoop_reg(SCOOP_DEV[skt->nr].dev, SCOOP_CPR) & ~0x0080);
 }
 
 static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 {
-        /* CF_BUS_OFF */
-        sharpsl_pcmcia_init_reset(&SCOOP_DEV[skt->nr]);
-
-        if (machine_is_collie())
-                /* We need to disable SS_OUTPUT_ENA here. */
-                write_scoop_reg(SCOOP_DEV[skt->nr].dev, SCOOP_CPR, read_scoop_reg(SCOOP_DEV[skt->nr].dev, SCOOP_CPR) & ~0x0080);
+        sharpsl_pcmcia_init_reset(skt);
 }
 
 static struct pcmcia_low_level sharpsl_pcmcia_ops = {