minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc: Move kbd_status to arch_global_data

Browse Source 
Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-12-13 20:49:04 +00:00 committed by Tom Rini
parent a0d3c820c4
commit 225ca83dfe
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/include/asm/global_data.h
View File

@ -128,6 +128,9 @@ struct arch_global_data {
#if defined(CONFIG_WD_MAX_RATE) #if defined(CONFIG_WD_MAX_RATE)
unsigned long long wdt_last; /* trace watch-dog triggering rate */ unsigned long long wdt_last; /* trace watch-dog triggering rate */
#endif #endif
#if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
unsigned long kbd_status;
#endif
}; };
/* /*
@ -172,9 +175,6 @@ typedef struct global_data {
#ifdef CONFIG_MODEM_SUPPORT #ifdef CONFIG_MODEM_SUPPORT
unsigned long do_mdm_init; unsigned long do_mdm_init;
unsigned long be_quiet; unsigned long be_quiet;
#endif
#if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
unsigned long kbd_status;
#endif #endif
void **jt; /* jump table */ void **jt; /* jump table */
char env_buf[32]; /* buffer for getenv() before reloc. */ char env_buf[32]; /* buffer for getenv() before reloc. */

10
board/lwmon/lwmon.c
View File

@ -482,7 +482,7 @@ static void kbd_init (void)
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); 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 */ /* Forced by PIC. Delays <= 175us loose */
udelay(1000); udelay(1000);
@ -496,7 +496,7 @@ static void kbd_init (void)
/* clear "irrelevant" bits. Recommended by Martin Rajek, LWN */ /* clear "irrelevant" bits. Recommended by Martin Rajek, LWN */
errcd &= ~(KEYBD_STATUS_H_RESET|KEYBD_STATUS_BROWNOUT); errcd &= ~(KEYBD_STATUS_H_RESET|KEYBD_STATUS_BROWNOUT);
if (errcd) { if (errcd) {
gd->kbd_status |= errcd << 8; gd->arch.kbd_status |= errcd << 8;
} }
/* Reset error code and verify */ /* Reset error code and verify */
val = KEYBD_CMD_RESET_ERRORS; val = KEYBD_CMD_RESET_ERRORS;
@ -509,7 +509,7 @@ static void kbd_init (void)
val &= KEYBD_STATUS_MASK; /* clear unused bits */ val &= KEYBD_STATUS_MASK; /* clear unused bits */
if (val) { /* permanent error, report it */ if (val) { /* permanent error, report it */
gd->kbd_status |= val; gd->arch.kbd_status |= val;
return; return;
} }
@ -568,8 +568,8 @@ int misc_init_r (void)
{ {
uchar kbd_data[KEYBD_DATALEN]; uchar kbd_data[KEYBD_DATALEN];
char keybd_env[2 * KEYBD_DATALEN + 1]; char keybd_env[2 * KEYBD_DATALEN + 1];
uchar kbd_init_status = gd->kbd_status >> 8; uchar kbd_init_status = gd->arch.kbd_status >> 8;
uchar kbd_status = gd->kbd_status; uchar kbd_status = gd->arch.kbd_status;
uchar val; uchar val;
char *str; char *str;
int i; int i;

10
board/lwmon5/kbd.c
View File

@ -113,7 +113,7 @@ static void kbd_init (void)
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); 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 */ /* Forced by PIC. Delays <= 175us loose */
udelay(1000); udelay(1000);
@ -127,7 +127,7 @@ static void kbd_init (void)
/* clear "irrelevant" bits. Recommended by Martin Rajek, LWN */ /* clear "irrelevant" bits. Recommended by Martin Rajek, LWN */
errcd &= ~(KEYBD_STATUS_H_RESET|KEYBD_STATUS_BROWNOUT); errcd &= ~(KEYBD_STATUS_H_RESET|KEYBD_STATUS_BROWNOUT);
if (errcd) { if (errcd) {
gd->kbd_status |= errcd << 8; gd->arch.kbd_status |= errcd << 8;
} }
/* Reset error code and verify */ /* Reset error code and verify */
val = KEYBD_CMD_RESET_ERRORS; val = KEYBD_CMD_RESET_ERRORS;
@ -140,7 +140,7 @@ static void kbd_init (void)
val &= KEYBD_STATUS_MASK; /* clear unused bits */ val &= KEYBD_STATUS_MASK; /* clear unused bits */
if (val) { /* permanent error, report it */ if (val) { /* permanent error, report it */
gd->kbd_status |= val; gd->arch.kbd_status |= val;
return; return;
} }
@ -216,8 +216,8 @@ int misc_init_r_kbd (void)
{ {
uchar kbd_data[KEYBD_DATALEN]; uchar kbd_data[KEYBD_DATALEN];
char keybd_env[2 * KEYBD_DATALEN + 1]; char keybd_env[2 * KEYBD_DATALEN + 1];
uchar kbd_init_status = gd->kbd_status >> 8; uchar kbd_init_status = gd->arch.kbd_status >> 8;
uchar kbd_status = gd->kbd_status; uchar kbd_status = gd->arch.kbd_status;
uchar val; uchar val;
ushort data, inv_data; ushort data, inv_data;
char *str; char *str;