All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lukasz Majewski <l.majewski@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 23/24] power:pmic: Rename CONFIG_PMIC* defines to CONFIG_POWER
Date: Fri, 19 Oct 2012 17:44:10 +0200	[thread overview]
Message-ID: <1350661451-1273-24-git-send-email-l.majewski@samsung.com> (raw)
In-Reply-To: <1350661451-1273-1-git-send-email-l.majewski@samsung.com>

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>
---
Changes for v3:
- New patch at v3.
---
 board/samsung/goni/goni.c                |    2 +-
 board/samsung/universal_c210/universal.c |    2 +-
 drivers/power/Makefile                   |   12 ++++++------
 drivers/power/power_fsl.c                |    8 ++++----
 include/configs/imx31_litekit.h          |    6 +++---
 include/configs/mx31ads.h                |    6 +++---
 include/configs/mx31pdk.h                |    6 +++---
 include/configs/mx35pdk.h                |    6 +++---
 include/configs/mx51_efikamx.h           |    6 +++---
 include/configs/mx51evk.h                |    6 +++---
 include/configs/mx53evk.h                |    6 +++---
 include/configs/mx53loco.h               |    6 +++---
 include/configs/qong.h                   |    6 +++---
 include/configs/s5p_goni.h               |    6 +++---
 include/configs/s5pc210_universal.h      |    6 +++---
 include/configs/trats.h                  |    6 +++---
 include/configs/tt01.h                   |    6 +++---
 include/configs/vision2.h                |    6 +++---
 18 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 94731e4a..46254e0 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -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
 
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 80a7346..a50fa7b 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -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
 
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index be283406..4b6961a 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -31,13 +31,13 @@ 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_PMIC_MAX8998) += max8998/pmic_max8998.o
-COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o
+COBJS-$(CONFIG_POWER_FSL) += power_fsl.o
+COBJS-$(CONFIG_POWER_I2C) += power_i2c.o
+COBJS-$(CONFIG_POWER_SPI) += power_spi.o
+COBJS-$(CONFIG_POWER_MAX8998) += max8998/pmic_max8998.o
+COBJS-$(CONFIG_POWER_MAX8997) += max8997/pmic_max8997.o
 COBJS-$(CONFIG_POWER_BATTERY_TRATS) += battery/bat_trats.o
 COBJS-$(CONFIG_POWER_MUIC_MAX8997) += max8997/muic_max8997.o
 COBJS-$(CONFIG_POWER_FG_MAX17042) += max17042/fg_max17042.o
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 868c3c4..1dd386b 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -26,7 +26,7 @@
 #include <power/pmic.h>
 #include <fsl_pmic.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);
@@ -41,7 +41,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;
@@ -50,13 +50,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;
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 6ae764a..8fc3942 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -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
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 9d9f4a7..9e4006b4 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -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
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index b272674..ee78898 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -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
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 69bd654..d41ea8a 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -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
 
diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
index 439b5f3..2c9ed59 100644
--- a/include/configs/mx51_efikamx.h
+++ b/include/configs/mx51_efikamx.h
@@ -129,9 +129,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
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 7b027b4..e9e57dc 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -71,9 +71,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
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index b46855f..1b27008 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -57,9 +57,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
 
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 8cbaf08..2648d49 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -92,10 +92,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
 
diff --git a/include/configs/qong.h b/include/configs/qong.h
index c2bd097..3422a6a 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -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
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 36f1a57..144802c 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -216,9 +216,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>
 /*
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 7727624..c2814f5 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -254,9 +254,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
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 482aedc..b605f74 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -235,9 +235,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
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index f46efa5..9f8f240 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -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
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index fba897c..1428e9b 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -89,9 +89,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
-- 
1.7.2.3

  parent reply	other threads:[~2012-10-19 15:44 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-19 15:43 [U-Boot] [PATCH v3 00/24] pmic: Redesign PMIC framework to support multiple instances of devices Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 01/24] pmic:i2c: Handle PMIC I2C transmission comprising of two bytes Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 02/24] pmic:i2c: Add I2C sensor byte order (big/little) to PMIC framework Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 03/24] pmic:max8997: Switch the MAX8997 PMIC to be used with multibus I2C Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 04/24] pmic: Extend PMIC framework to support multiple instances of PMIC devices Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 05/24] pmic: Introduce power_init_board() method at ./lib/board.c file Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 06/24] pmic: Enable power_board_init() support at TRATS Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 07/24] pmic:chrg: Common information about charger and battery (power_chrg.h) Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 08/24] pmic: Move pmic related code to ./drivers/power directory Lukasz Majewski
2012-10-26 21:25   ` Tom Rini
2012-10-27 21:01     ` Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 09/24] pmic: Extend struct pmic to support battery and charger related operations Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 10/24] pmic:battery: Support for Trats Battery at PMIC framework Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 11/24] pmic:muic: Support for MUIC built into MAX8997 device Lukasz Majewski
2012-10-19 15:43 ` [U-Boot] [PATCH v3 12/24] pmic:fuel-gauge: Support for MAX17042 fuel-gauge Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 13/24] pmic:max8997: Function for calculating LDO internal register value Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 14/24] arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 15/24] arm:trats:pmic: Enable MUIC (MAX8997) at " Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 16/24] arm:trats:pmic: Enable fuel-gauge (MAX17042) " Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 17/24] arm:trats:pmic: Enable battery support " Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 18/24] pmic:max8997: Support for MAX8997 internal charger control Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 19/24] arm:trats:pmic: Power consumption reduction state for Samsung's TRATS board Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 20/24] arm:trats:pmic: Support for charging battery at " Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 21/24] pmic: Extend PMIC framework to support battery related commands Lukasz Majewski
2012-10-19 15:44 ` [U-Boot] [PATCH v3 22/24] power:pmic: Rename ./drivers/power/pmic_* to ./drivers/power/power_* files Lukasz Majewski
2012-10-19 15:44 ` Lukasz Majewski [this message]
2012-10-19 15:44 ` [U-Boot] [PATCH v3 24/24] power:pmic: Rename CONFIG_DIALOG_PMIC defines to CONFIG_DIALOG_POWER Lukasz Majewski
2012-10-26  7:29 ` [U-Boot] [PATCH v3 00/24] pmic: Redesign PMIC framework to support multiple instances of devices Lukasz Majewski
2012-10-26 10:34   ` Stefano Babic
2012-10-26 10:43     ` Lukasz Majewski
2012-10-26 17:32       ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1350661451-1273-24-git-send-email-l.majewski@samsung.com \
    --to=l.majewski@samsung.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.