summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell Robinson Jr <rrobinson@phytec.com>2013-02-21 15:14:59 -0800
committerRussell Robinson Jr <rrobinson@phytec.com>2013-03-28 13:55:45 -0700
commitb8d91272a67f847f91e868d73f1309b43c9cec21 (patch)
treea82fd3ec46be43a494b572cbe6793fb75f290d1d /arch
parent58b87cfa999fdcc9ea6ce966f0a1cd96071e4b3a (diff)
pcm052: updating pcm052_defconfig
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/pcm052_defconfig10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/configs/pcm052_defconfig b/arch/arm/configs/pcm052_defconfig
index bd13e16e0cea..dfe3c7ceac20 100644
--- a/arch/arm/configs/pcm052_defconfig
+++ b/arch/arm/configs/pcm052_defconfig
@@ -249,7 +249,9 @@ CONFIG_IMX_HAVE_PLATFORM_FLEXCAN=y
CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y
CONFIG_IMX_HAVE_PLATFORM_GPMI_NFC=y
CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y
+CONFIG_IMX_HAVE_PLATFORM_MVF_ADC=y
CONFIG_IMX_HAVE_PLATFORM_IMX_SNVS_RTC=y
+CONFIG_IMX_HAVE_PLATFORM_MVF_CAAM=y
CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
CONFIG_IMX_HAVE_PLATFORM_IMX_SSI=y
CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y
@@ -676,6 +678,7 @@ CONFIG_MISC_DEVICES=y
# CONFIG_DS1682 is not set
# CONFIG_TI_DAC7512 is not set
# CONFIG_BMP085 is not set
+# CONFIG_MVF_ADC is not set
# CONFIG_C2PORT is not set
#
@@ -1219,7 +1222,6 @@ CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_TS_CLUT224=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -1261,7 +1263,8 @@ CONFIG_SND_SOC=y
# CONFIG_SND_IMX_SOC is not set
CONFIG_SND_MVF_SOC=y
CONFIG_SND_MVF_SOC_TWR=y
-CONFIG_SND_SOC_MVF_SGTL5000=y
+# CONFIG_SND_SOC_MVF_SGTL5000 is not set
+CONFIG_SND_SOC_PCM052_SGTL5000=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_SGTL5000=y
@@ -1591,6 +1594,7 @@ CONFIG_CLKSRC_MMIO=y
#
# MXC Asynchronous Sample Rate Converter support
#
+# CONFIG_MXC_ASRC is not set
#
# MXC Bluetooth support
@@ -1966,6 +1970,8 @@ CONFIG_CRYPTO_LZO=y
# CONFIG_CRYPTO_USER_API_HASH is not set
# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM_SM is not set
CONFIG_BINARY_PRINTF=y
#