summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/board2.c2
-rw-r--r--drivers/power/Makefile2
-rw-r--r--include/configs/apalis-tk1.h2
-rw-r--r--include/configs/cei-tk1-som.h2
-rw-r--r--include/configs/jetson-tk1.h2
-rw-r--r--include/configs/nyan-big.h2
-rw-r--r--scripts/config_whitelist.txt2
7 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index b73cd63..84f1ee5 100644
--- 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 b43523e..29e1357 100644
--- 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 84652de..a64037b 100644
--- 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 5ec63cd..de56920 100644
--- 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 7c0456c..5482f55 100644
--- 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 acf9d66..906423d 100644
--- 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 cad6117..1349fb0 100644
--- 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