Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index 6de4e1b41d60..0cc3748f3758 100644
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/drivers/pcmcia/sa1100_h3600.c
@@ -37,9 +37,9 @@ static void h3600_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
         soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
   
         /* Disable CF bus: */
-        clr_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);
-        clr_h3600_egpio(IPAQ_EGPIO_OPT_ON);
-        set_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);
 }
 
 static void
@@ -79,10 +79,7 @@ h3600_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_
                 return -1;
         }
 
-        if (state->flags & SS_RESET)
-                set_h3600_egpio(IPAQ_EGPIO_CARD_RESET);
-        else
-                clr_h3600_egpio(IPAQ_EGPIO_CARD_RESET);
+        assign_h3600_egpio(IPAQ_EGPIO_CARD_RESET, !!(state->flags & SS_RESET));
 
         /* Silently ignore Vpp, output enable, speaker enable. */
 
@@ -92,9 +89,9 @@ h3600_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_
 static void h3600_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
 {
         /* Enable CF bus: */
-        set_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);
-        set_h3600_egpio(IPAQ_EGPIO_OPT_ON);
-        clr_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 1);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 1);
+        assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 0);
 
         msleep(10);
 
@@ -112,10 +109,10 @@ static void h3600_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
          * socket 0 then socket 1.
          */
         if (skt->nr == 1) {
-                clr_h3600_egpio(IPAQ_EGPIO_OPT_ON);
-                clr_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);
+                assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);
+                assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);
                 /* hmm, does this suck power? */
-                set_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
+                assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);
         }
 }