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

Conflicts:
	board/samsung/universal/universal.c

diff --cc board/samsung/universal/universal.c
index e60a148,6e3abb0..18d8d34
--- 1/board/samsung/universal/universal.c
--- 2/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@@ -1364,9 -1384,6 +1386,12 @@@ void board_sleep_init(void
        unsigned int value;
        unsigned char addr;
        unsigned char val[2];
++<<<<<<< HEAD:board/samsung/universal/universal.c
 +      unsigned char dummy = 0;
 +      struct s5pc110_gpio *gpio =
 +              (struct s5pc110_gpio *)S5PC110_GPIO_BASE;
++=======
++>>>>>>> a865b1b389f7ab75a669e614fc95c1dfbb5b2015:board/samsung/universal/universal.c
  
        /* Set wakeup mask register */
        value = 0xFFFF;
@@@ -1452,30 -1447,18 +1477,35 @@@ void board_sleep_resume(void
        }
  
        /* Set ONOFF1 */
 -      i2c_write(addr, 0x11, 1, saved_val[0], 1);
 -      i2c_read(addr, 0x11, 1, val, 1);
 +      i2c_write(addr, MAX8998_REG_ONOFF1, 1, saved_val[0], 1);
 +      i2c_read(addr, MAX8998_REG_ONOFF1, 1, val, 1);
        /* Set ONOFF2 */
 -      i2c_write(addr, 0x12, 1, saved_val[1], 1);
 -      i2c_read(addr, 0x12, 1, val, 1);
 +      i2c_write(addr, MAX8998_REG_ONOFF2, 1, saved_val[1], 1);
 +      i2c_read(addr, MAX8998_REG_ONOFF2, 1, val, 1);
        /* Set ONOFF3 */
 -      i2c_write(addr, 0x13, 1, saved_val[2], 1);
 -      i2c_read(addr, 0x13, 1, val, 1);
 +      i2c_write(addr, MAX8998_REG_ONOFF3, 1, saved_val[2], 1);
 +      i2c_read(addr, MAX8998_REG_ONOFF3, 1, val, 1);
 +      /* Set ONOFF4 */
 +      i2c_write(addr, MAX8998_REG_ONOFF3+1, 1, saved_val[3], 1);
 +      i2c_read(addr, MAX8998_REG_ONOFF3+1, 1, val, 1);
        printf("Waked up.\n");
  
++<<<<<<< HEAD:board/samsung/universal/universal.c
 +      /* CP */
 +      gpio_set_value(&gpio->gpio_h3, 7, gpio_CP);
 +      value = gpio_get_value(&gpio->gpio_h3, 7);
 +      /* MMC T_FLASH */
 +      gpio_set_value(&gpio->gpio_mp0_5, 4, gpio_T_FLASH);
 +      value = gpio_get_value(&gpio->gpio_mp0_5, 4);
 +
 +      if (board_is_limo_universal() || board_is_limo_real()) {
 +              /* check max17040 */
 +              check_battery();
 +      }
++=======
+       /* check max17040 */
+       check_battery();
++>>>>>>> a865b1b389f7ab75a669e614fc95c1dfbb5b2015:board/samsung/universal/universal.c
  
        /* check fsa9480 */
        check_micro_usb();