diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:02:52 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:02:52 +0200 |
commit | f0e3d2b42268a9ed8d28c50c662eeba08379ceab (patch) | |
tree | ac713d8a69dee7e80af82ff3b3d5b6b3062c5ee7 /board/trab/vfd.c | |
parent | 386eda022473394ad8f36b86f2bdc9b4cb816291 (diff) | |
parent | f73e73ba0e422e6f79030d77286dd57becaee16f (diff) | |
download | u-boot-imx-f0e3d2b42268a9ed8d28c50c662eeba08379ceab.zip u-boot-imx-f0e3d2b42268a9ed8d28c50c662eeba08379ceab.tar.gz u-boot-imx-f0e3d2b42268a9ed8d28c50c662eeba08379ceab.tar.bz2 |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/trab/vfd.c')
-rw-r--r-- | board/trab/vfd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/board/trab/vfd.c b/board/trab/vfd.c index cea8b0b..2f1e7d7 100644 --- a/board/trab/vfd.c +++ b/board/trab/vfd.c @@ -358,6 +358,8 @@ void transfer_pic(int display, unsigned char *adr, int height, int width) */ int vfd_init_clocks (void) { + int i; + S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO(); S3C24X0_TIMERS * const timers = S3C24X0_GetBase_TIMERS(); S3C24X0_LCD * const lcd = S3C24X0_GetBase_LCD(); @@ -367,7 +369,9 @@ int vfd_init_clocks (void) */ gpio->PCUP = (gpio->PCUP & 0xFFF0); /* activate GPC0...GPC3 pullups */ gpio->PCCON = (gpio->PCCON & 0xFFFFFF00); /* configure GPC0...GPC3 as inputs */ - udelay (10); /* allow signals to settle */ + /* allow signals to settle */ + for (i=0; i<10000; i++) /* udelay isn't working yet at this point! */ + __asm("NOP"); vfd_board_id = (~gpio->PCDAT) & 0x000F; /* read GPC0...GPC3 port pins */ VFD_DISABLE; /* activate blank for the vfd */ |