summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-07-15 07:45:49 +0000
committerwdenk <wdenk>2003-07-15 07:45:49 +0000
commit6dff55297283ebe16096e25f2dadb54e4b6fd9fc (patch)
tree6fa76fdf7ddc26e5728c3b318fe7addbf04ae673 /board
parent8564acf936726c5568d71e4fa93a0ae9814e0d07 (diff)
downloadtalos-obmc-uboot-6dff55297283ebe16096e25f2dadb54e4b6fd9fc.tar.gz
talos-obmc-uboot-6dff55297283ebe16096e25f2dadb54e4b6fd9fc.zip
* Patches by Martin Krause, 14 Jul 2003:
- add I2C support for s3c2400 systems (trab board) - (re-) add "ping" to command table * Fix handling of "slow" POST routines
Diffstat (limited to 'board')
-rw-r--r--board/lwmon/lwmon.c3
-rw-r--r--board/trab/trab.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index 04721a3840..cf824082cf 100644
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -1087,7 +1087,6 @@ int post_hotkeys_pressed(gd_t *gd)
i2c_write (kbd_addr, 0, 0, &val, 1);
i2c_read (kbd_addr, 0, 0, kbd_data, KEYBD_DATALEN);
- return (gd->post_hotkeys_latch =
- (compare_magic(kbd_data, CONFIG_POST_KEY_MAGIC) == 0));
+ return (compare_magic(kbd_data, CONFIG_POST_KEY_MAGIC) == 0);
}
#endif
diff --git a/board/trab/trab.c b/board/trab/trab.c
index 895c9e12fa..029fbde8c2 100644
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -130,6 +130,11 @@ int board_init ()
}
#endif /* CONFIG_MODEM_SUPPORT */
+#ifdef CONFIG_DRIVER_S3C24X0_I2C
+ /* Configure I/O ports PG5 und PG6 for I2C */
+ gpio->PGCON = (gpio->PGCON & 0x003c00) | 0x003c00;
+#endif /* CONFIG_DRIVER_S3C24X0_I2C */
+
return 0;
}
OpenPOWER on IntegriCloud