Merge branch 'master' of mj.ham@party:/pub/git/u-boot-s5pc1xx

diff --combined board/samsung/universal/universal.c
index d778c2b,a902171..4d2c90e
--- 1/board/samsung/universal/universal.c
--- 2/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@@ -579,6 -579,15 +579,15 @@@ static void show_hw_revision(void
                board = gd->bd->bi_arch_number - C100_MACH_START;
  
        check_board_revision(board, board_rev);
+ 
+       /* Set CPU Revision */
+       if (board_is_limo_real()) {
+               if ((board_rev & 0xf) < 8)
+                       s5pc1xx_set_cpu_rev(0);
+       } else {
+               s5pc1xx_set_cpu_rev(0);
+       }
+ 
        dprintf("HW Revision:\t%x (%s%s)\n", board_rev, board_name[board],
                display_features(board, board_rev));
  }
@@@ -985,7 -994,6 +994,7 @@@ static void into_charge_mode(void
        exit_font();
  #endif
  
 +      /* EVT0: sleep 1, EVT1: sleep */
        run_command("sleep 1", 0);
  }
  
@@@ -1200,10 -1208,10 +1209,10 @@@ static struct gpio_powermode powerdown_
                PULL_DIS(0) | PULL_DIS(1) | PULL_DIS(2) | PULL_DIS(3) |
                PULL_DIS(4) | PULL_DIS(5) | PULL_DIS(6),
        }, {    /* S5PC110_GPIO_G1_OFFSET */
 -              OUTPUT0(0) | INPUT(1) | OUTPUT0(2) | INPUT(3) |
 +              INPUT(0) | INPUT(1) | OUTPUT0(2) | INPUT(3) |
                INPUT(4) | INPUT(5) | INPUT(6),
 -              PULL_DIS(0) | PULL_UP(1) | PULL_DIS(2) | PULL_UP(3) |
 -              PULL_UP(4) | PULL_UP(5) | PULL_UP(6),
 +              PULL_DIS(0) | PULL_DIS(1) | PULL_DIS(2) | PULL_DIS(3) |
 +              PULL_DIS(4) | PULL_DIS(5) | PULL_DIS(6),
        }, {    /* S5PC110_GPIO_G2_OFFSET */
                OUTPUT0(0) | OUTPUT0(1) | OUTPUT0(2) | OUTPUT0(3) |
                OUTPUT0(4) | OUTPUT0(5) | OUTPUT0(6),
@@@ -1812,7 -1820,8 +1821,7 @@@ int dram_init(void
  
  /* Used for sleep test */
  static unsigned char saved_val[4][2];
 -static unsigned int gpio_CP;
 -static unsigned int gpio_T_FLASH;
 +static unsigned int gpio_CP, gpio_T_FLASH, gpio_XTAL;
  void board_sleep_init(void)
  {
        unsigned int value;
@@@ -1840,11 -1849,6 +1849,11 @@@
                return;
        }
  
 +      /* TOUCH SCREEN ? */
 +      /* CODEC_XTAL_EN */
 +      gpio_XTAL = gpio_get_value(&gpio->gpio_h3, 2);
 +      gpio_set_value(&gpio->gpio_h3, 2, 0);
 +      value = gpio_get_value(&gpio->gpio_h3, 2);
        /* CP off */
        gpio_CP = gpio_get_value(&gpio->gpio_h3, 7);
        gpio_set_value(&gpio->gpio_h3, 7, 0);
@@@ -1930,9 -1934,6 +1939,9 @@@ void board_sleep_resume(void
        /* MMC T_FLASH */
        gpio_set_value(&gpio->gpio_mp0_5, 4, gpio_T_FLASH);
        value = gpio_get_value(&gpio->gpio_mp0_5, 4);
 +      /* CODEC_XTAL_EN */
 +      gpio_set_value(&gpio->gpio_h3, 2, gpio_XTAL);
 +      value = gpio_get_value(&gpio->gpio_h3, 2);
  
        /* check max17040 */
        check_battery();
@@@ -2328,6 -2329,8 +2337,8 @@@ static int power_on(int on
        power_fm_radio(on);
        power_bt_wifi(on);
        power_hdmi(on);
+ 
+       return 0;
  }
  
  static int do_power(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])