diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-02 21:26:38 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-02 21:26:38 +0100 |
| commit | ee58ea2689930669678fdcb27bf0cc5c341e18eb (patch) | |
| tree | bf11e40342f78ed8014d4a7a4185a6357ef88af5 /board/icecube/icecube.c | |
| parent | c59200443072353044aa4bf737a5a60f9a9af231 (diff) | |
| parent | 25721b5cec2be4bce79cfade17ec8f6aa1e67526 (diff) | |
| download | u-boot-imx-ee58ea2689930669678fdcb27bf0cc5c341e18eb.zip u-boot-imx-ee58ea2689930669678fdcb27bf0cc5c341e18eb.tar.gz u-boot-imx-ee58ea2689930669678fdcb27bf0cc5c341e18eb.tar.bz2 | |
Merge with /home/tur/proj/uboot_linux_v38b/u-boot
Diffstat (limited to 'board/icecube/icecube.c')
| -rw-r--r-- | board/icecube/icecube.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index 4f056b2..f958b32 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -308,8 +308,6 @@ void pci_init_board(void) #if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) -#define GPIO_PSC1_4 0x01000000UL - void init_ide_reset (void) { debug ("init_ide_reset\n"); @@ -318,7 +316,7 @@ void init_ide_reset (void) *(vu_long *) MPC5XXX_WU_GPIO_ENABLE |= GPIO_PSC1_4; *(vu_long *) MPC5XXX_WU_GPIO_DIR |= GPIO_PSC1_4; /* Deassert reset */ - *(vu_long *) MPC5XXX_WU_GPIO_DATA |= GPIO_PSC1_4; + *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4; } void ide_set_reset (int idereset) @@ -326,11 +324,11 @@ void ide_set_reset (int idereset) debug ("ide_reset(%d)\n", idereset); if (idereset) { - *(vu_long *) MPC5XXX_WU_GPIO_DATA &= ~GPIO_PSC1_4; + *(vu_long *) MPC5XXX_WU_GPIO_DATA_O &= ~GPIO_PSC1_4; /* Make a delay. MPC5200 spec says 25 usec min */ udelay(500000); } else { - *(vu_long *) MPC5XXX_WU_GPIO_DATA |= GPIO_PSC1_4; + *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4; } } #endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ |