summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorZhou Jingyu <b02241@freescale.com>2010-02-26 13:57:20 +0800
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-25 11:17:16 +0200
commit1f34df607a90af9f668bca5362fde5cdecd00fbe (patch)
treeadd071e5f239e723414de204a3265c6df3893e09 /arch/arm/configs
parent7a8dd040bf79566ee98de08d12ea13e680fab413 (diff)
ENGR00121119-2 restructure imx23 pmu driver
restructure imx23 pmu driver Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx23evk_defconfig11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/configs/imx23evk_defconfig b/arch/arm/configs/imx23evk_defconfig
index 909258208e26..c7ae3dae7cab 100644
--- a/arch/arm/configs/imx23evk_defconfig
+++ b/arch/arm/configs/imx23evk_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.31
-# Tue Feb 9 11:24:57 2010
+# Thu Mar 4 11:14:26 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -193,6 +193,7 @@ CONFIG_MACH_MX23EVK=y
CONFIG_MXS_ICOLL=y
CONFIG_MXS_EARLY_CONSOLE=y
CONFIG_MXS_DMA_ENGINE=y
+CONFIG_MXS_PWM_CHANNELS=8
#
# Freescale Application UART:
@@ -659,7 +660,13 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
# CONFIG_DMADEVICES is not set
# CONFIG_AUXDISPLAY is not set
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+CONFIG_REGULATOR_MXS=y
# CONFIG_UIO is not set
# CONFIG_STAGING is not set