[U-Boot] [PATCH v4 02/12] trats2: Code cleanup.

[Jaehoon Chung]

Acked-by: Jaehoon Chung <jh80.chung at samsung.com>

On 01/09/2014 08:23 PM, Przemyslaw Marczak wrote:
> Remove wrong and unused env variables
> Trats2 is not as GT-I8800.
> 
> Signed-off-by: Przemyslaw Marczak <p.marczak at samsung.com>
> Cc: Piotr Wilczek <p.wilczek at samsung.com>
> 
> ---
> Changes v2:
> - none
> 
> Changes v3:
> - none
> 
> Changes v4:
> - add "include pmic.h" to "max77686_pmic.h"
> 
>  board/samsung/trats2/trats2.c      |   19 ++-----------------
>  drivers/power/battery/bat_trats2.c |    2 +-
>  include/configs/trats2.h           |    1 -
>  include/power/max77686_pmic.h      |    2 ++
>  4 files changed, 5 insertions(+), 19 deletions(-)
> 
> diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
> index 1e96fdc..b4ccf51 100644
> --- a/board/samsung/trats2/trats2.c
> +++ b/board/samsung/trats2/trats2.c
> @@ -72,15 +72,12 @@ static void check_hw_revision(void)
>  int checkboard(void)
>  {
>  	puts("Board:\tTRATS2\n");
> +	printf("HW Revision:\t0x%04x\n", board_rev);
> +
>  	return 0;
>  }
>  #endif
>  
> -static void show_hw_revision(void)
> -{
> -	printf("HW Revision:\t0x%04x\n", board_rev);
> -}
> -
>  u32 get_board_rev(void)
>  {
>  	return board_rev;
> @@ -614,15 +611,3 @@ void init_panel_info(vidinfo_t *vid)
>  	exynos_set_dsim_platform_data(&dsim_platform_data);
>  }
>  #endif /* LCD */
> -
> -#ifdef CONFIG_MISC_INIT_R
> -int misc_init_r(void)
> -{
> -	setenv("model", "GT-I8800");
> -	setenv("board", "TRATS2");
> -
> -	show_hw_revision();
> -
> -	return 0;
> -}
> -#endif
> diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c
> index f264832..94015aa 100644
> --- a/drivers/power/battery/bat_trats2.c
> +++ b/drivers/power/battery/bat_trats2.c
> @@ -8,7 +8,7 @@
>  #include <common.h>
>  #include <power/pmic.h>
>  #include <power/battery.h>
> -#include <power/max8997_pmic.h>
> +#include <power/max77693_pmic.h>
>  #include <errno.h>
>  
>  static struct battery battery_trats;
> diff --git a/include/configs/trats2.h b/include/configs/trats2.h
> index c9ce828..7dfbe98 100644
> --- a/include/configs/trats2.h
> +++ b/include/configs/trats2.h
> @@ -272,7 +272,6 @@
>  #define CONFIG_EFI_PARTITION
>  #define CONFIG_PARTITION_UUIDS
>  
> -#define CONFIG_MISC_INIT_R
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
>  /* I2C */
> diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h
> index 16e9016..c2a772a 100644
> --- a/include/power/max77686_pmic.h
> +++ b/include/power/max77686_pmic.h
> @@ -8,6 +8,8 @@
>  #ifndef __MAX77686_H_
>  #define __MAX77686_H_
>  
> +#include <power/pmic.h>
> +
>  enum {
>  	MAX77686_REG_PMIC_ID		= 0x0,
>  	MAX77686_REG_PMIC_INTSRC,
>