Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 821ca478 authored by Michael Gernoth's avatar Michael Gernoth Committed by Russell King
Browse files

[PATCH] ARM: 2830/1: Fix Jornada 720 PCMCIA-support 



Patch from Michael Gernoth

This patch lets the Jornada 720 PCMCIA-driver compile again. The
resulting driver has been tested on a Jornada with a CF-card, which
was mounted and accessed successfully.

Signed-off-by: default avatarMichael Gernoth <michael@gernoth.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7fcc113c

drivers/pcmcia/sa1100_jornada720.c

+4 −15
Original line number Diff line number Diff line
@@ -30,20 +30,9 @@ static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
   */

  GRER |= 0x00000002;

  /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */

  PA_DDR = 0;

  PA_DWR = 0;

  PA_SDR = 0;

  PA_SSR = 0;



  PB_DDR = 0;

  PB_DWR = 0x01;

  PB_SDR = 0;

  PB_SSR = 0;



  PC_DDR = 0x88;

  PC_DWR = 0x20;

  PC_SDR = 0;

  PC_SSR = 0;

  sa1111_set_io_dir(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0);

  sa1111_set_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);

  sa1111_set_sleep_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);



  return sa1111_pcmcia_hw_init(skt);

}
@@ -95,7 +84,7 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __FUNCTION__, 
    unsigned long flags;



    local_irq_save(flags);

    PA_DWR = (PA_DWR & ~pa_dwr_mask) | pa_dwr_set;

    sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);

    local_irq_restore(flags);

  }