ppc4xx: Big lwmon5 board support rework/update
PATCH 1/1 ppc4xx: Big lwmon5 board support rework/update
From: Sascha Laue <[email protected]>
This patch brings the lwmon5 board support up-to-date. Here a summary of the changes:
lwmon5 board port related:
- GPIO's changed to control the LSB transmitter
- Reset USB PHY's upon power-up
- Enable CAN upon power-up
- USB init error workaround (errata CHIP_6)
- EBC: Enable burstmode and modify the timings for the GDC memory
- EBC: Speed up NOR flash timings
lwmon5 board POST related:
- Add FPGA memory test
- Add GDC memory test
- DSP POST reworked
- SYSMON POST: Fix handling of negative temperatures
- Add output for sysmon1 POST
- HW-watchdog min. time test reworked
Additionally some coding-style changes were done.
--- board/lwmon5/kbd.c | 45 ++++++ board/lwmon5/lwmon5.c | 249 ++++++++++++++++++++++------------ include/configs/lwmon5.h | 283 ++++++++++++++++++++++----------------- post/board/lwmon5/dsp.c | 21 +++- post/board/lwmon5/dspic.c | 56 +++++--- post/board/lwmon5/fpga.c | 308 +++++++++++++++++++++++++++++++++++------ post/board/lwmon5/gdc.c | 308 ++++++++++++++++++++++++++++++++++++++++-- post/board/lwmon5/sysmon.c | 160 ++++++++++++++--------- post/board/lwmon5/watchdog.c | 19 ++- 9 files changed, 1090 insertions(+), 359 deletions(-)
board/lwmon5/kbd.c +45 -0
@@ -45,6 +45,10 @@ static int compare_magic (uchar *kbd_data, uchar *str);/*--------------------- Local macros and constants --------------------*/ #define _NOT_USED_ 0xFFFFFFFF +/*------------------------- dspic io expander -----------------------*/ +#define DSPIC_PON_STATUS_REG 0x80A +#define DSPIC_PON_INV_STATUS_REG 0x80C +#define DSPIC_PON_KEY_REG 0x810/*------------------------- Keyboard controller -----------------------*/ /* command codes */ #define KEYBD_CMD_READ_KEYS 0x01
@@ -75,6 +79,7 @@ static int compare_magic (uchar *kbd_data, uchar *str);/* maximum number of "magic" key codes that can be assigned */ static uchar kbd_addr =CONFIG_SYS_I2C_KEYBD_ADDR ; +static uchar dspic_addr =CONFIG_SYS_I2C_DSPIC_IO_ADDR ;static uchar *key_match (uchar *);
@@ -167,6 +172,23 @@ static void kbd_init (void) } } + +/* Read a register from the dsPIC. */ +int _dspic_read (ushort reg,ushort *data) +{ +uchar buf[sizeof (*data)]; +int rval; + +if (i2c_read (dspic_addr, reg,2 , buf,2 )) +return -1 ; + + rval =i2c_read (dspic_addr, reg,sizeof (reg), buf,sizeof (*data)); + *data = (buf[0 ] <<8 ) | buf[1 ]; + +return rval; +} + +/*********************************************************************** F* Function: int misc_init_r (void) P*A*Z* *
@@ -197,6 +219,7 @@ int misc_init_r_kbd (void)uchar kbd_init_status = gd->kbd_status >>8 ;uchar kbd_status = gd->kbd_status;uchar val; +ushort data, inv_data;char *str;int i;
@@ -231,9 +254,31 @@ int misc_init_r_kbd (void)i2c_write (kbd_addr,0 ,0 , &val,1 );i2c_read (kbd_addr,0 ,0 , kbd_data,KEYBD_DATALEN ); +/* read out start key from bse01 received via can */ +_dspic_read (DSPIC_PON_STATUS_REG , &data); +/* check highbyte from status register */ +if (data >0xFF ) { +_dspic_read (DSPIC_PON_INV_STATUS_REG , &inv_data); + +/* check inverse data */ +if ((data+inv_data) ==0xFFFF ) { +/* don't overwrite local key */ +if (kbd_data[1 ] ==0 ) { +/* read key value */ +_dspic_read (DSPIC_PON_KEY_REG , &data); + str = (char *)&data; +/* swap bytes */ + kbd_data[1 ] = str[1 ]; + kbd_data[2 ] = str[0 ]; +printf ("CAN received startkey: 0x%X\n" , data); + } + } + } +for (i =0 ; i <KEYBD_DATALEN ; ++i) {sprintf (keybd_env + i + i,"%02X" , kbd_data[i]); } +setenv ("keybd" , keybd_env); str =strdup ((char *)key_match (kbd_data));/* decode keys */
board/lwmon5/lwmon5.c +159 -90
361 lines not on this page · raw message
include/configs/lwmon5.h +159 -124
520 lines not on this page · raw message
post/board/lwmon5/dsp.c +19 -2
@@ -33,20 +33,37 @@DECLARE_GLOBAL_DATA_PTR ; -#define DSP_STATUS_REG 0xC4000008 +#define DSP_STATUS_REG 0xC4000008 +#define FPGA_STATUS_REG 0xC400000Cint dsp_post_test (int flags) { +uint old_value;uint read_value;int ret; +/* momorize fpga status */ + old_value =in_be32 ((void *)FPGA_STATUS_REG ); +/* enable outputs */ +out_be32 ((void *)FPGA_STATUS_REG ,0x30 ); + +/* generate sync signal */ +out_be32 ((void *)DSP_STATUS_REG ,0x300 ); +udelay (5 ); +out_be32 ((void *)DSP_STATUS_REG ,0 ); +udelay (500 ); + +/* read status */ ret =0 ; read_value =in_be32 ((void *)DSP_STATUS_REG ) &0x3 ; -if (read_value !=0x3 ) { +if (read_value !=0x03 ) {post_log ("\nDSP status read %08X\n" , read_value); ret =1 ; } +/* restore fpga status */ +out_be32 ((void *)FPGA_STATUS_REG , old_value); +return ret; }
post/board/lwmon5/dspic.c +36 -20
96 lines not on this page · raw message
post/board/lwmon5/fpga.c +263 -45
363 lines not on this page · raw message
post/board/lwmon5/gdc.c +296 -12
344 lines not on this page · raw message
post/board/lwmon5/sysmon.c +99 -61
258 lines not on this page · raw message
post/board/lwmon5/watchdog.c +14 -5
@@ -57,8 +57,11 @@ int sysmon1_post_test(int flags)* 3.1. GPIO62 is low * Assuming system voltage failure. */ -post_log ("Abnormal voltage detected (GPIO62)\n" ); +post_log ("sysmon1 Abnormal voltage detected (GPIO62)\n" ); +post_log ("POST sysmon1 FAILED\n" );return 1 ; + }else { +post_log ("sysmon1 PASSED\n" ); }return 0 ;
@@ -117,10 +120,16 @@ int lwmon5_watchdog_post_test(int flags)ulong time;/* 3.3.1. So, the test succeed, save measured time to syslog. */ time =in_be32 ((void *)CONFIG_SYS_WATCHDOG_TIME_ADDR ); -post_log ("hw watchdog time : %u ms, passed " , time); -/* 3.3.2. Set scratch register 1 to 0x0000xxxx */ -watchdog_magic_write (0 ); -return 0 ; +if (time >90 ) {/* ms*/ +post_log ("hw watchdog time : %u ms, passed " , time); +/* 3.3.2. Set scratch register 1 to 0x0000xxxx */ +watchdog_magic_write (0 ); +return 0 ; + }else { +/*test minimum watchdogtime */ +post_log ("hw watchdog time : %u ms, failed " , time); +return 2 ; + } }return -1 ; }
Signature · 1 line
1.7.3
PATCH 1/1 ppc4xx: Big lwmon5 board support rework/update
Quoted 21 lines · On Wednesday 29 September 2010 17:20:10 Stefan Roese wrote:
From: Sascha Laue <[email protected]>
This patch brings the lwmon5 board support up-to-date. Here a summary of the changes:
lwmon5 board port related:
- GPIO's changed to control the LSB transmitter
- Reset USB PHY's upon power-up
- Enable CAN upon power-up
- USB init error workaround (errataCHIP_6)
- EBC: Enable burstmode and modify the timings for the GDC memory
- EBC: Speed up NOR flash timingslwmon5 board POST related:
- Add FPGA memory test
- Add GDC memory test
- DSP POST reworked
- SYSMON POST: Fix handling of negative temperatures
- Add output for sysmon1 POST
- HW-watchdog min. time test reworked
Quoted 1 line
Additionally some coding-style changes were done.
Applied to u-boot-ppc4xx/master. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de