projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
c2mon
/
pcmcia.c
diff --git
a/board/c2mon/pcmcia.c
b/board/c2mon/pcmcia.c
index
57846b1
..
c833b20
100644
(file)
--- a/
board/c2mon/pcmcia.c
+++ b/
board/c2mon/pcmcia.c
@@
-22,8
+22,8
@@
static void cfg_ports (void)
volatile cpm8xx_t *cp;
ushort sreg;
volatile cpm8xx_t *cp;
ushort sreg;
- immap = (immap_t *)C
FG
_IMMR;
- cp = (cpm8xx_t *)(&(((immap_t *)C
FG
_IMMR)->im_cpm));
+ immap = (immap_t *)C
ONFIG_SYS
_IMMR;
+ cp = (cpm8xx_t *)(&(((immap_t *)C
ONFIG_SYS
_IMMR)->im_cpm));
/*
* Configure Port C for TPS2211 PC-Card Power-Interface Switch
/*
* Configure Port C for TPS2211 PC-Card Power-Interface Switch
@@
-69,10
+69,10
@@
int pcmcia_hardware_enable(int slot)
udelay(10000);
udelay(10000);
- immap = (immap_t *)C
FG
_IMMR;
- sysp = (sysconf8xx_t *)(&(((immap_t *)C
FG
_IMMR)->im_siu_conf));
- pcmp = (pcmconf8xx_t *)(&(((immap_t *)C
FG
_IMMR)->im_pcmcia));
- cp = (cpm8xx_t *)(&(((immap_t *)C
FG
_IMMR)->im_cpm));
+ immap = (immap_t *)C
ONFIG_SYS
_IMMR;
+ sysp = (sysconf8xx_t *)(&(((immap_t *)C
ONFIG_SYS
_IMMR)->im_siu_conf));
+ pcmp = (pcmconf8xx_t *)(&(((immap_t *)C
ONFIG_SYS
_IMMR)->im_pcmcia));
+ cp = (cpm8xx_t *)(&(((immap_t *)C
ONFIG_SYS
_IMMR)->im_cpm));
/* Configure Ports for TPS2211A PC-Card Power-Interface Switch */
cfg_ports ();
/* Configure Ports for TPS2211A PC-Card Power-Interface Switch */
cfg_ports ();
@@
-175,8
+175,8
@@
int pcmcia_hardware_disable(int slot)
debug ("hardware_disable: " PCMCIA_BOARD_MSG " Slot %c\n", 'A'+slot);
debug ("hardware_disable: " PCMCIA_BOARD_MSG " Slot %c\n", 'A'+slot);
- immap = (immap_t *)C
FG
_IMMR;
- pcmp = (pcmconf8xx_t *)(&(((immap_t *)C
FG
_IMMR)->im_pcmcia));
+ immap = (immap_t *)C
ONFIG_SYS
_IMMR;
+ pcmp = (pcmconf8xx_t *)(&(((immap_t *)C
ONFIG_SYS
_IMMR)->im_pcmcia));
/* Configure PCMCIA General Control Register */
debug ("Disable PCMCIA buffers and assert RESET\n");
/* Configure PCMCIA General Control Register */
debug ("Disable PCMCIA buffers and assert RESET\n");
@@
-209,9
+209,9
@@
int pcmcia_voltage_set(int slot, int vcc, int vpp)
" Slot %c, Vcc=%d.%d, Vpp=%d.%d\n",
'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10);
" Slot %c, Vcc=%d.%d, Vpp=%d.%d\n",
'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10);
- immap = (immap_t *)C
FG
_IMMR;
- cp = (cpm8xx_t *)(&(((immap_t *)C
FG
_IMMR)->im_cpm));
- pcmp = (pcmconf8xx_t *)(&(((immap_t *)C
FG
_IMMR)->im_pcmcia));
+ immap = (immap_t *)C
ONFIG_SYS
_IMMR;
+ cp = (cpm8xx_t *)(&(((immap_t *)C
ONFIG_SYS
_IMMR)->im_cpm));
+ pcmp = (pcmconf8xx_t *)(&(((immap_t *)C
ONFIG_SYS
_IMMR)->im_pcmcia));
/*
* Disable PCMCIA buffers (isolate the interface)
* and assert RESET signal
/*
* Disable PCMCIA buffers (isolate the interface)
* and assert RESET signal