power: Rename CONFIG_AS3722_POWER to CONFIG_PMIC_AS3722

Before converting this to Kconfig, rename it to match the other PMICs.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index b73cd632e7d684ddae4db0d1296f6b2737c8cd51..84f1ee5035f6fa6c79d0a9420ac1ceabcb6e6675 100644 (file)
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -148,7 +148,7 @@ int board_init(void)
                debug("Memory controller init failed: %d\n", err);
 #  endif
 # endif /* CONFIG_TEGRA_PMU */
-#ifdef CONFIG_AS3722_POWER
+#ifdef CONFIG_PMIC_AS3722
        err = as3722_init(NULL);
        if (err && err != -ENODEV)
                return err;

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index b43523e6282eeff14eb4e839c6b53c71c0a640b6..29e135756ba81e09725e42e79d465f0b05905dd9 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-$(CONFIG_AS3722_POWER)     += as3722.o
+obj-$(CONFIG_PMIC_AS3722)      += as3722.o
 obj-$(CONFIG_AXP152_POWER)     += axp152.o
 obj-$(CONFIG_AXP209_POWER)     += axp209.o
 obj-$(CONFIG_AXP221_POWER)     += axp221.o

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 84652decd631d333212743f3aa8706cd638c0950..a64037b5954ee82c6c707cd297e8d086ff267785 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -12,7 +12,7 @@
 #include <linux/sizes.h>
 
 /* enable PMIC */
-#define CONFIG_AS3722_POWER
+#define CONFIG_PMIC_AS3722
 
 #include "tegra124-common.h"
 

diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 5ec63cd8becb0fccb89f80076809880826a014a6..de56920fe99533cfd947170ac7f2c3b87ba5f9fb 100644 (file)
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -15,7 +15,7 @@
 #include <linux/sizes.h>
 
 /* enable PMIC */
-#define CONFIG_AS3722_POWER
+#define CONFIG_PMIC_AS3722
 
 #include "tegra124-common.h"
 

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 7c0456c5ce363cdcf7b2dd0ba01fb9f957800d47..5482f55ce0a0fa8c3483f02b6d27ed060b7a5eb4 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -11,7 +11,7 @@
 #include <linux/sizes.h>
 
 /* enable PMIC */
-#define CONFIG_AS3722_POWER
+#define CONFIG_PMIC_AS3722
 
 #include "tegra124-common.h"
 

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index acf9d66ae04e853a7d6493bce074b5823fd4e0b2..906423dba9486a7523102f7f841d3c1cfdb94977 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -31,7 +31,7 @@
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)
 
 /* LCD support */
-#define CONFIG_AS3722_POWER
+#define CONFIG_PMIC_AS3722
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CMD_BMP
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cad6117034c4c1f8b9edf5f0ec15adf2d7ba5301..1349fb0f7d87445421ea4c21a64724f3c364dbe9 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -147,7 +147,6 @@ CONFIG_ARM_PL180_MMCI_BASE
 CONFIG_ARM_PL180_MMCI_CLOCK_FREQ
 CONFIG_ARM_THUMB
 CONFIG_ARP_TIMEOUT
-CONFIG_AS3722_POWER
 CONFIG_ASTRO5373L
 CONFIG_ASTRO_COFDMDUOS2
 CONFIG_ASTRO_TWIN7S2
@@ -2231,6 +2230,7 @@ CONFIG_PMECC_INDEX_TABLE_OFFSET
 CONFIG_PMECC_SECTOR_SIZE
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_PMIC
+CONFIG_PMIC_AS3722
 CONFIG_PMU
 CONFIG_PMW_BASE
 CONFIG_PM_SLEEP