← Back to branch summary

~ubuntu-branches/ubuntu/vivid/u-boot/vivid

« back to all changes in this revision

Viewing changes to board/c2mon/pcmcia.c

  • Committer: Package Import Robot
  • Author(s): Clint Adams
  • Date: 2012-01-02 17:49:39 UTC
  • mfrom: (1.2.7)
  • Revision ID: package-import@ubuntu.com-20120102174939-iddq37p3372x10yp
Tags: 2011.12-1
* New upstream version.
  - Drop build-timestamp_autogenerated.h-without-config.patch (merged).
  - Drop ublimage-NAND-block-size-isn-t-set-at-build-time.patch (merged).
  - Update kerma-sheevaplug-mvsdio.diff
  - Update mipsel-native-endianness.diff
  - Drop dreamplug-v8.patch (merged).

Show diffs side-by-side

added added

removed removed

Lines of Context:
board/c2mon/pcmcia.c
199
199
int pcmcia_voltage_set(int slot, int vcc, int vpp)
200
200
{
201
201
        volatile immap_t        *immap;
202
 
        volatile cpm8xx_t       *cp;
203
202
        volatile pcmconf8xx_t   *pcmp;
204
203
        u_long reg;
205
204
        ushort sreg;
210
209
        'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10);
211
210
 
212
211
        immap = (immap_t *)CONFIG_SYS_IMMR;
213
 
        cp    = (cpm8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_cpm));
214
212
        pcmp  = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
215
213
        /*
216
 
        * Disable PCMCIA buffers (isolate the interface)
217
 
        * and assert RESET signal
218
 
        */
 
214
         * Disable PCMCIA buffers (isolate the interface)
 
215
         * and assert RESET signal
 
216
         */
219
217
        debug ("Disable PCMCIA buffers and assert RESET\n");
220
218
        reg  = PCMCIA_PGCRX(_slot_);
221
219
        reg |= __MY_PCMCIA_GCRX_CXRESET;        /* active high */