From: Minkyu Kang <mk7.kang@samsung.com>
Date: Wed, 24 Feb 2010 04:54:37 +0000 (+0900)
Subject: Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
X-Git-Tag: JB16_20100224~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=242221514deebec1153ec6fc638fe71cf41e5ec0;p=kernel%2Fu-boot.git

Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx
---

242221514deebec1153ec6fc638fe71cf41e5ec0
diff --cc board/samsung/universal/universal.c
index 679872e,85d2f67..668640c
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@@ -1371,16 -1387,18 +1387,15 @@@ static void into_charge_mode(void
  
  	} while (wakeup_stat == 0x04); /* RTC TICK */
  
- 	/* TODO: Reenable logo display */
+ restore_screen:
+ 	/* TODO: Reenable logo display (not working yet) */
  	lcd_power_on(1);
- 	reset_lcd();
- 
- 	run_command("cls", 0);
+ 	drv_lcd_init_resume();
  }
  
 -static void check_micro_usb(int intr)
 +static int fsa9480_probe(void)
  {
 -	unsigned char addr;
 -	unsigned char val[2];
 -	static int started_charging_once = 0;
 -	char *path;
 +	unsigned char addr = 0x25;
  
  	if (cpu_is_s5pc100())
  		return;