summaryrefslogtreecommitdiff
path: root/board/lwmon/lwmon.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:49:04 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:44 -0500
commit225ca83dfea4f9b9a313c5233297132206bff431 (patch)
tree35b2849f306377e029a572df0e885f92b26f0c1b /board/lwmon/lwmon.c
parenta0d3c820c43e040b001c912a717942219e0fe3ab (diff)
downloadu-boot-imx-225ca83dfea4f9b9a313c5233297132206bff431.zip
u-boot-imx-225ca83dfea4f9b9a313c5233297132206bff431.tar.gz
u-boot-imx-225ca83dfea4f9b9a313c5233297132206bff431.tar.bz2
ppc: Move kbd_status to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/lwmon/lwmon.c')
-rw-r--r--board/lwmon/lwmon.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index b5e524b..34c6675 100644
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -482,7 +482,7 @@ static void kbd_init (void)
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
- gd->kbd_status = 0;
+ gd->arch.kbd_status = 0;
/* Forced by PIC. Delays <= 175us loose */
udelay(1000);
@@ -496,7 +496,7 @@ static void kbd_init (void)
/* clear "irrelevant" bits. Recommended by Martin Rajek, LWN */
errcd &= ~(KEYBD_STATUS_H_RESET|KEYBD_STATUS_BROWNOUT);
if (errcd) {
- gd->kbd_status |= errcd << 8;
+ gd->arch.kbd_status |= errcd << 8;
}
/* Reset error code and verify */
val = KEYBD_CMD_RESET_ERRORS;
@@ -509,7 +509,7 @@ static void kbd_init (void)
val &= KEYBD_STATUS_MASK; /* clear unused bits */
if (val) { /* permanent error, report it */
- gd->kbd_status |= val;
+ gd->arch.kbd_status |= val;
return;
}
@@ -568,8 +568,8 @@ int misc_init_r (void)
{
uchar kbd_data[KEYBD_DATALEN];
char keybd_env[2 * KEYBD_DATALEN + 1];
- uchar kbd_init_status = gd->kbd_status >> 8;
- uchar kbd_status = gd->kbd_status;
+ uchar kbd_init_status = gd->arch.kbd_status >> 8;
+ uchar kbd_status = gd->arch.kbd_status;
uchar val;
char *str;
int i;