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/esd/pf5200/pf5200.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/esd/pf5200/pf5200.c')
| -rw-r--r-- | board/esd/pf5200/pf5200.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/board/esd/pf5200/pf5200.c b/board/esd/pf5200/pf5200.c index 2b47012..1f30d45 100644 --- a/board/esd/pf5200/pf5200.c +++ b/board/esd/pf5200/pf5200.c @@ -199,8 +199,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"); @@ -215,9 +213,9 @@ 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; } 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) */ @@ -242,7 +240,7 @@ void init_power_switch(void) debug("init_power_switch\n"); /* Configure GPIO_WU6 as GPIO output for ATA reset */ - *(vu_long *) MPC5XXX_WU_GPIO_DATA |= GPIO_WU6; + *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_WU6; *(vu_long *) MPC5XXX_WU_GPIO_ENABLE |= GPIO_WU6; *(vu_long *) MPC5XXX_WU_GPIO_DIR |= GPIO_WU6; __asm__ volatile ("sync"); @@ -272,10 +270,10 @@ void power_set_reset(int power) debug("ide_set_reset(%d)\n", power); if (power) { - *(vu_long *) MPC5XXX_WU_GPIO_DATA &= ~GPIO_WU6; + *(vu_long *) MPC5XXX_WU_GPIO_DATA_O &= ~GPIO_WU6; *(vu_long *) MPC5XXX_INTERRUPT_GPIO_DATA_OUTPUT &= ~GPIO_USB9; } else { - *(vu_long *) MPC5XXX_WU_GPIO_DATA |= GPIO_WU6; + *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_WU6; if ((*(vu_long *) MPC5XXX_INTERRUPT_GPIO_STATUS & GPIO_USB9S) == 0) { *(vu_long *) MPC5XXX_SIMPLEIO_GPIO_DATA_OUTPUT |= |