power: Convert CONFIG_PMIC_AS3722 to Kconfig

This converts the following to Kconfig:
   CONFIG_PMIC_AS3722

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

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 10862e5..648be92 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -34,6 +34,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_TEGRA=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_TEGRA=y

+CONFIG_PMIC_AS3722=y

 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index 88b93cb..dd6fd49 100644 (file)
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -38,6 +38,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_TEGRA=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_TEGRA=y

+CONFIG_PMIC_AS3722=y

 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 58d4184..2c3f174 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -38,6 +38,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_TEGRA=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_TEGRA=y

+CONFIG_PMIC_AS3722=y

 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y

diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 63f1a6f..b132eb1 100644 (file)
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -42,6 +42,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PMIC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PMIC=y

+CONFIG_PMIC_AS3722=y

 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_PWM_TEGRA=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_PWM_TEGRA=y

diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig
index 03fea07..4891b17 100644 (file)
--- a/drivers/power/pmic/Kconfig
+++ b/drivers/power/pmic/Kconfig
@@ -40,6 +40,14 @@ config PMIC_ACT8846
        functions. It uses an I2C interface and is designed for use with
        tablets and smartphones.
 
        functions. It uses an I2C interface and is designed for use with
        tablets and smartphones.
 

+config PMIC_AS3722
+       bool "Enable support for the Austria Micro Systems (AMS) AS7322 PMIC"
+       help
+         The AS3722 includes 7 DC/DC buck convertors, 11 low-noise LDOs, a
+         real-time clock, GPIOs, ADC and a few other features. It uses an I2C
+         interface and is designs to cover most of the power managementment
+         required for a tablets or laptop.
+

 config DM_PMIC_PFUZE100
        bool "Enable Driver Model for PMIC PFUZE100"
        depends on DM_PMIC
 config DM_PMIC_PFUZE100
        bool "Enable Driver Model for PMIC PFUZE100"
        depends on DM_PMIC

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index a64037b..c6c956e 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -11,9 +11,6 @@
 
 #include <linux/sizes.h>
 
 
 #include <linux/sizes.h>
 

-/* enable PMIC */
-#define CONFIG_PMIC_AS3722
-

 #include "tegra124-common.h"
 
 #define CONFIG_ARCH_MISC_INIT
 #include "tegra124-common.h"
 
 #define CONFIG_ARCH_MISC_INIT

diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index de56920..8185926 100644 (file)
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -14,9 +14,6 @@
 
 #include <linux/sizes.h>
 
 
 #include <linux/sizes.h>
 

-/* enable PMIC */
-#define CONFIG_PMIC_AS3722
-

 #include "tegra124-common.h"
 
 /* High-level configuration options */
 #include "tegra124-common.h"
 
 /* High-level configuration options */

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 5482f55..b31ba6a 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -10,9 +10,6 @@
 
 #include <linux/sizes.h>
 
 
 #include <linux/sizes.h>
 

-/* enable PMIC */
-#define CONFIG_PMIC_AS3722
-

 #include "tegra124-common.h"
 
 /* High-level configuration options */
 #include "tegra124-common.h"
 
 /* High-level configuration options */

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 906423d..a3a2a8c 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -31,7 +31,6 @@
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)
 
 /* LCD support */
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)
 
 /* LCD support */

-#define CONFIG_PMIC_AS3722

 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CMD_BMP
 
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CMD_BMP
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1349fb0..f639d2b 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2230,7 +2230,6 @@ CONFIG_PMECC_INDEX_TABLE_OFFSET
 CONFIG_PMECC_SECTOR_SIZE
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_PMIC
 CONFIG_PMECC_SECTOR_SIZE
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_PMIC

-CONFIG_PMIC_AS3722

 CONFIG_PMU
 CONFIG_PMW_BASE
 CONFIG_PM_SLEEP
 CONFIG_PMU
 CONFIG_PMW_BASE
 CONFIG_PM_SLEEP