diff options
author | H. Nikolaus Schaller <hns@goldelico.com> | 2011-06-09 16:55:10 +0200 |
---|---|---|
committer | H. Nikolaus Schaller <hns@goldelico.com> | 2011-06-09 16:55:10 +0200 |
commit | 744356bf8a70294ac2be55d99abc9eb80d5058d4 (patch) | |
tree | e466c86f121559fbdcd642714a129044749e0bc4 | |
parent | 690e0c81c6917310a470b7e49cfc7e0a8158e772 (diff) | |
download | bootable_bootloader_goldelico_gta04-744356bf8a70294ac2be55d99abc9eb80d5058d4.zip bootable_bootloader_goldelico_gta04-744356bf8a70294ac2be55d99abc9eb80d5058d4.tar.gz bootable_bootloader_goldelico_gta04-744356bf8a70294ac2be55d99abc9eb80d5058d4.tar.bz2 |
minor code fix
-rw-r--r-- | board/goldelico/gta04/dssfb.c | 2 | ||||
-rw-r--r-- | board/goldelico/gta04/gta04.c | 29 | ||||
-rw-r--r-- | board/goldelico/gta04/jbt6k74.c | 9 | ||||
-rw-r--r-- | board/goldelico/gta04/shutdown.c | 2 |
4 files changed, 3 insertions, 39 deletions
diff --git a/board/goldelico/gta04/dssfb.c b/board/goldelico/gta04/dssfb.c index 639451f..22a77d3 100644 --- a/board/goldelico/gta04/dssfb.c +++ b/board/goldelico/gta04/dssfb.c @@ -224,7 +224,7 @@ void dssfb_init(const struct panel_config *lcm_cfg) { #ifdef CONFIG_OMAP3_GTA04A2 /* delayed on GTA04A2 */ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; - printf("prcm base = %08x\n", (void *) prcm_base); + printf("prcm base = %p\n", (void *) prcm_base); printf("ick_dss_on\n"); sr32(&prcm_base->iclken_dss, 0, 32, ICK_DSS_ON); sdelay(1000); diff --git a/board/goldelico/gta04/gta04.c b/board/goldelico/gta04/gta04.c index 22c6f77..858e699 100644 --- a/board/goldelico/gta04/gta04.c +++ b/board/goldelico/gta04/gta04.c @@ -38,25 +38,10 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/gpio.h> #include <asm/mach-types.h> -// #include "../../ti/beagle/beagle.h" #include "gta04.h" -#define TWL4030_I2C_BUS 0 -#define EXPANSION_EEPROM_I2C_BUS 1 -#define EXPANSION_EEPROM_I2C_ADDRESS 0x50 -#define BEAGLE_NO_EEPROM 0xffffffff - -static struct { - unsigned int device_vendor; - unsigned char revision; - unsigned char content; - char fab_revision[8]; - char env_var[16]; - char env_setting[64]; -} expansion_config; - -#if 1 /* testing tool; you can call notify() anywhere even before initialization */ +#if 1 /* testing tool; you can call notify() anywhere even before initialization to see how far the code comes */ /****************************************************************************** * Routine: delay @@ -78,7 +63,6 @@ static inline void myudelay(unsigned long us) void notify(int number) { // flash LCD backlight - int i; BLOFF(); myudelay(200*1000); BLON(); @@ -149,17 +133,6 @@ int get_board_revision(void) } /* - * Routine: get_expansion_id - * Description: This function checks for expansion board by checking I2C - * bus 1 for the availability of an AT24C01B serial EEPROM. - * returns the device_vendor field from the EEPROM - */ -unsigned int get_expansion_id(void) -{ - return BEAGLE_NO_EEPROM; -} - -/* * Routine: misc_init_r * Description: Configure board specific parts */ diff --git a/board/goldelico/gta04/jbt6k74.c b/board/goldelico/gta04/jbt6k74.c index 8df6184..ddc86e1 100644 --- a/board/goldelico/gta04/jbt6k74.c +++ b/board/goldelico/gta04/jbt6k74.c @@ -86,15 +86,6 @@ static const struct panel_config lcm_cfg = }; -#if 1 -#define DEBUGP(x, args...) printf("%s: " x, __FUNCTION__, ## args); -#define DEBUGPC(x, args...) printf(x, ## args); -#else -#define DEBUGP(x, args...) do { } while (0) -#define DEBUGPC(x, args...) do { } while (0) -#endif - - enum jbt_register { JBT_REG_SLEEP_IN = 0x10, JBT_REG_SLEEP_OUT = 0x11, diff --git a/board/goldelico/gta04/shutdown.c b/board/goldelico/gta04/shutdown.c index f4e3aee..8e474f4 100644 --- a/board/goldelico/gta04/shutdown.c +++ b/board/goldelico/gta04/shutdown.c @@ -37,7 +37,7 @@ void shutdown(void) if(i2c_set_bus_num(0)) { printf ("could not select I2C1\n"); - return 1; + return; } printf("shutting down by writing DEVOFF register of TPS65950\n"); if (twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER, &val, |