[U-Boot] [PATCH 01/10] power: Rename CONFIG_PMIC_... to CONFIG_POWER_...

[Lukasz Majewski]

Hi Simon,

> Commit be3b51aa did this mostly, but several have been added since.
> Do the job again.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  drivers/power/power_fsl.c         | 6 +++---
>  include/configs/arndale.h         | 4 ++--
>  include/configs/exynos5250-dt.h   | 2 +-
>  include/configs/mx25pdk.h         | 2 +-
>  include/configs/mx35pdk.h         | 2 +-
>  include/configs/mx53evk.h         | 2 +-
>  include/configs/mx53loco.h        | 2 +-
>  include/configs/woodburn_common.h | 2 +-
>  8 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
> index ac0b541..a64161b 100644
> --- a/drivers/power/power_fsl.c
> +++ b/drivers/power/power_fsl.c
> @@ -11,9 +11,9 @@
>  #include <fsl_pmic.h>
>  #include <errno.h>
>  
> -#if defined(CONFIG_PMIC_FSL_MC13892)
> +#if defined(CONFIG_POWER_FSL_MC13892)
>  #define FSL_PMIC_I2C_LENGTH	3
> -#elif defined(CONFIG_PMIC_FSL_MC34704)
> +#elif defined(CONFIG_POWER_FSL_MC34704)
>  #define FSL_PMIC_I2C_LENGTH	1
>  #endif
>  
> @@ -51,7 +51,7 @@ int pmic_init(unsigned char bus)
>  	p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
>  	p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
>  #else
> -#error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C"
> +#error "You must select CONFIG_POWER_SPI or CONFIG_POWER_I2C"
>  #endif
>  
>  	return 0;
> diff --git a/include/configs/arndale.h b/include/configs/arndale.h
> index 515facf..30ecd45 100644
> --- a/include/configs/arndale.h
> +++ b/include/configs/arndale.h
> @@ -224,8 +224,8 @@
>  
>  /* PMIC */
>  #define CONFIG_PMIC
> -#define CONFIG_PMIC_I2C
> -#define CONFIG_PMIC_MAX77686
> +#define CONFIG_POWER_I2C
> +#define CONFIG_POWER_MAX77686
>  
>  #define CONFIG_DEFAULT_DEVICE_TREE	exynos5250-arndale
>  
> diff --git a/include/configs/exynos5250-dt.h
> b/include/configs/exynos5250-dt.h index b7ff472..9d1d56a 100644
> --- a/include/configs/exynos5250-dt.h
> +++ b/include/configs/exynos5250-dt.h
> @@ -45,7 +45,7 @@
>  #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK
>  
>  /* PMIC */
> -#define CONFIG_PMIC_MAX77686
> +#define CONFIG_POWER_MAX77686
>  
>  /* Sound */
>  #define CONFIG_CMD_SOUND
> diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
> index af6aafa..571d45a 100644
> --- a/include/configs/mx25pdk.h
> +++ b/include/configs/mx25pdk.h
> @@ -106,7 +106,7 @@
>  #define CONFIG_POWER
>  #define CONFIG_POWER_I2C
>  #define CONFIG_POWER_FSL
> -#define CONFIG_PMIC_FSL_MC34704
> +#define CONFIG_POWER_FSL_MC34704
>  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x54
>  
>  #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
> index 0a46f4c..ab48144 100644
> --- a/include/configs/mx35pdk.h
> +++ b/include/configs/mx35pdk.h
> @@ -52,7 +52,7 @@
>  #define CONFIG_POWER
>  #define CONFIG_POWER_I2C
>  #define CONFIG_POWER_FSL
> -#define CONFIG_PMIC_FSL_MC13892
> +#define CONFIG_POWER_FSL_MC13892
>  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x08
>  #define CONFIG_RTC_MC13XXX
>  
> diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
> index 3f0d80a..042cdd0 100644
> --- a/include/configs/mx53evk.h
> +++ b/include/configs/mx53evk.h
> @@ -45,7 +45,7 @@
>  #define CONFIG_POWER_I2C
>  #define CONFIG_POWER_FSL
>  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR    8
> -#define CONFIG_PMIC_FSL_MC13892
> +#define CONFIG_POWER_FSL_MC13892
>  #define CONFIG_RTC_MC13XXX
>  
>  /* MMC Configs */
> diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
> index 1415584..365d072 100644
> --- a/include/configs/mx53loco.h
> +++ b/include/configs/mx53loco.h
> @@ -80,7 +80,7 @@
>  #define CONFIG_POWER_I2C
>  #define CONFIG_DIALOG_POWER
>  #define CONFIG_POWER_FSL
> -#define CONFIG_PMIC_FSL_MC13892
> +#define CONFIG_POWER_FSL_MC13892
>  #define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
>  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x8
>  
> diff --git a/include/configs/woodburn_common.h
> b/include/configs/woodburn_common.h index 695bc23..259205e 100644
> --- a/include/configs/woodburn_common.h
> +++ b/include/configs/woodburn_common.h
> @@ -55,7 +55,7 @@
>  #define CONFIG_POWER
>  #define CONFIG_POWER_I2C
>  #define CONFIG_POWER_FSL
> -#define CONFIG_PMIC_FSL_MC13892
> +#define CONFIG_POWER_FSL_MC13892
>  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x8
>  #define CONFIG_RTC_MC13XXX
>  

Acked-by: Lukasz Majewski <l.majewski at samsung.com>

-- 
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group