diff options
| author | Simon Glass | 2012-12-13 20:49:04 +0000 |
|---|---|---|
| committer | Tom Rini | 2013-02-04 09:05:44 -0500 |
| commit | 225ca83dfea4f9b9a313c5233297132206bff431 (patch) | |
| tree | 35b2849f306377e029a572df0e885f92b26f0c1b /board/lwmon5 | |
| parent | a0d3c820c43e040b001c912a717942219e0fe3ab (diff) | |
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/lwmon5')
| -rw-r--r-- | board/lwmon5/kbd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/board/lwmon5/kbd.c b/board/lwmon5/kbd.c index 5231c7a5c6f..b66f681eeb7 100644 --- a/board/lwmon5/kbd.c +++ b/board/lwmon5/kbd.c @@ -113,7 +113,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); @@ -127,7 +127,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; @@ -140,7 +140,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; } @@ -216,8 +216,8 @@ int misc_init_r_kbd (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; ushort data, inv_data; char *str; |