mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
power:pmic: Rename CONFIG_PMIC* defines to CONFIG_POWER
Rename all CONFIG_PMIC* defines to CONFIG_POWER* Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Cc: Stefano Babic <sbabic@denx.de>
This commit is contained in:
parent
316a51beba
commit
be3b51aa4a
19 changed files with 54 additions and 54 deletions
|
@ -41,7 +41,7 @@ int board_init(void)
|
|||
gd->bd->bi_arch_number = MACH_TYPE_GONI;
|
||||
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
|
||||
|
||||
#if defined(CONFIG_PMIC)
|
||||
#if defined(CONFIG_POWER)
|
||||
pmic_init(I2C_5);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ int board_init(void)
|
|||
gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
|
||||
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
|
||||
|
||||
#if defined(CONFIG_PMIC)
|
||||
#if defined(CONFIG_POWER)
|
||||
pmic_init(I2C_5);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -31,11 +31,11 @@ COBJS-$(CONFIG_TWL4030_POWER) += twl4030.o
|
|||
COBJS-$(CONFIG_TWL6030_POWER) += twl6030.o
|
||||
COBJS-$(CONFIG_TWL6035_POWER) += twl6035.o
|
||||
|
||||
COBJS-$(CONFIG_PMIC) += power_core.o
|
||||
COBJS-$(CONFIG_POWER) += power_core.o
|
||||
COBJS-$(CONFIG_DIALOG_PMIC) += power_dialog.o
|
||||
COBJS-$(CONFIG_PMIC_FSL) += power_fsl.o
|
||||
COBJS-$(CONFIG_PMIC_I2C) += power_i2c.o
|
||||
COBJS-$(CONFIG_PMIC_SPI) += power_spi.o
|
||||
COBJS-$(CONFIG_POWER_FSL) += power_fsl.o
|
||||
COBJS-$(CONFIG_POWER_I2C) += power_i2c.o
|
||||
COBJS-$(CONFIG_POWER_SPI) += power_spi.o
|
||||
|
||||
COBJS := $(COBJS-y)
|
||||
SRCS := $(COBJS:.o=.c)
|
||||
|
|
|
@ -25,8 +25,8 @@ include $(TOPDIR)/config.mk
|
|||
|
||||
LIB := $(obj)libpmic.o
|
||||
|
||||
COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o
|
||||
COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o
|
||||
COBJS-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
|
||||
COBJS-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
|
||||
COBJS-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
|
||||
|
||||
COBJS := $(COBJS-y)
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <fsl_pmic.h>
|
||||
#include <errno.h>
|
||||
|
||||
#if defined(CONFIG_PMIC_SPI)
|
||||
#if defined(CONFIG_POWER_SPI)
|
||||
static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
|
||||
{
|
||||
return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
|
||||
|
@ -47,7 +47,7 @@ int pmic_init(unsigned char bus)
|
|||
p->name = name;
|
||||
p->number_of_regs = PMIC_NUM_OF_REGS;
|
||||
|
||||
#if defined(CONFIG_PMIC_SPI)
|
||||
#if defined(CONFIG_POWER_SPI)
|
||||
p->interface = PMIC_SPI;
|
||||
p->bus = CONFIG_FSL_PMIC_BUS;
|
||||
p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
|
||||
|
@ -56,13 +56,13 @@ int pmic_init(unsigned char bus)
|
|||
p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
|
||||
p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
|
||||
p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
|
||||
#elif defined(CONFIG_PMIC_I2C)
|
||||
#elif defined(CONFIG_POWER_I2C)
|
||||
p->interface = PMIC_I2C;
|
||||
p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
|
||||
p->hw.i2c.tx_num = 3;
|
||||
p->bus = bus;
|
||||
#else
|
||||
#error "You must select CONFIG_PMIC_SPI or CONFIG_PMIC_I2C"
|
||||
#error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C"
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -72,9 +72,9 @@
|
|||
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
|
||||
|
||||
/* PMIC Controller */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_FSL_PMIC_BUS 1
|
||||
#define CONFIG_FSL_PMIC_CS 0
|
||||
#define CONFIG_FSL_PMIC_CLK 1000000
|
||||
|
|
|
@ -68,9 +68,9 @@
|
|||
#define CONFIG_MXC_GPIO
|
||||
|
||||
/* PMIC Controller */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_FSL_PMIC_BUS 1
|
||||
#define CONFIG_FSL_PMIC_CS 0
|
||||
#define CONFIG_FSL_PMIC_CLK 1000000
|
||||
|
|
|
@ -69,9 +69,9 @@
|
|||
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
|
||||
|
||||
/* PMIC Controller */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_FSL_PMIC_BUS 1
|
||||
#define CONFIG_FSL_PMIC_CS 2
|
||||
#define CONFIG_FSL_PMIC_CLK 1000000
|
||||
|
|
|
@ -65,9 +65,9 @@
|
|||
/*
|
||||
* PMIC Configs
|
||||
*/
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_I2C
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x08
|
||||
#define CONFIG_RTC_MC13XXX
|
||||
|
||||
|
|
|
@ -127,9 +127,9 @@
|
|||
#endif
|
||||
|
||||
/* SPI PMIC */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_FSL_PMIC_BUS 0
|
||||
#define CONFIG_FSL_PMIC_CS (0 | 120 << 8)
|
||||
#define CONFIG_FSL_PMIC_CLK 25000000
|
||||
|
|
|
@ -69,9 +69,9 @@
|
|||
#define CONFIG_MXC_SPI
|
||||
|
||||
/* PMIC Controller */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_FSL_PMIC_BUS 0
|
||||
#define CONFIG_FSL_PMIC_CS 0
|
||||
#define CONFIG_FSL_PMIC_CLK 2500000
|
||||
|
|
|
@ -55,9 +55,9 @@
|
|||
#define CONFIG_SYS_I2C_SPEED 100000
|
||||
|
||||
/* PMIC Configs */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_I2C
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 8
|
||||
#define CONFIG_RTC_MC13XXX
|
||||
|
||||
|
|
|
@ -89,10 +89,10 @@
|
|||
#define CONFIG_SYS_I2C_SPEED 100000
|
||||
|
||||
/* PMIC Controller */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_I2C
|
||||
#define CONFIG_DIALOG_PMIC
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
|
||||
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x8
|
||||
|
||||
|
|
|
@ -58,9 +58,9 @@
|
|||
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
|
||||
#define CONFIG_RTC_MC13XXX
|
||||
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_FSL_PMIC_BUS 1
|
||||
#define CONFIG_FSL_PMIC_CS 0
|
||||
#define CONFIG_FSL_PMIC_CLK 100000
|
||||
|
|
|
@ -215,9 +215,9 @@
|
|||
|
||||
#define CONFIG_SYS_CACHELINE_SIZE 64
|
||||
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
#define CONFIG_PMIC_MAX8998
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_I2C
|
||||
#define CONFIG_POWER_MAX8998
|
||||
|
||||
#include <asm/arch/gpio.h>
|
||||
/*
|
||||
|
|
|
@ -253,9 +253,9 @@
|
|||
#define CONFIG_I2C_MULTI_BUS
|
||||
#define CONFIG_SYS_MAX_I2C_BUS 7
|
||||
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
#define CONFIG_PMIC_MAX8998
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_I2C
|
||||
#define CONFIG_POWER_MAX8998
|
||||
|
||||
#define CONFIG_USB_GADGET
|
||||
#define CONFIG_USB_GADGET_S3C_UDC_OTG
|
||||
|
|
|
@ -234,9 +234,9 @@
|
|||
#define CONFIG_SOFT_I2C_GPIO_SDA get_multi_sda_pin()
|
||||
#define I2C_INIT multi_i2c_init()
|
||||
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
#define CONFIG_PMIC_MAX8997
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_I2C
|
||||
#define CONFIG_POWER_MAX8997
|
||||
|
||||
#define CONFIG_POWER_FG
|
||||
#define CONFIG_POWER_FG_MAX17042
|
||||
|
|
|
@ -149,9 +149,9 @@
|
|||
#define CONFIG_MXC_GPIO
|
||||
|
||||
/* MC13783 connected to CSPI3 and SS0 */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
|
||||
#define CONFIG_FSL_PMIC_BUS 2
|
||||
#define CONFIG_FSL_PMIC_CS 0
|
||||
|
|
|
@ -87,9 +87,9 @@
|
|||
#define CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
|
||||
/* PMIC Controller */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_SPI
|
||||
#define CONFIG_PMIC_FSL
|
||||
#define CONFIG_POWER
|
||||
#define CONFIG_POWER_SPI
|
||||
#define CONFIG_POWER_FSL
|
||||
#define CONFIG_FSL_PMIC_BUS 0
|
||||
#define CONFIG_FSL_PMIC_CS 0
|
||||
#define CONFIG_FSL_PMIC_CLK 2500000
|
||||
|
|
Loading…
Reference in a new issue