aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2009-02-24 02:14:13 +0000
committerAndy Green <agreen@octopus.localdomain>2009-02-24 02:14:13 +0000
commit8984800cfd58081bf071dbc44661206eac7234f9 (patch)
tree293c02681063db1d174c7830d61075b6a0daafab
parentd07ff4a127daf21928a05ce9882886ddab1e8135 (diff)
config-smdk6410-audio.patch
Signed-off-by: Andy Green <andy@openmoko.com>
-rw-r--r--arch/arm/configs/gta01_moredrivers_defconfig5
-rw-r--r--arch/arm/configs/gta02_micro_defconfig3
-rw-r--r--arch/arm/configs/gta02_moredrivers_defconfig4
-rw-r--r--arch/arm/configs/gta02_packaging_defconfig4
4 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm/configs/gta01_moredrivers_defconfig b/arch/arm/configs/gta01_moredrivers_defconfig
index b52fefc54ac..eac6c826c6f 100644
--- a/arch/arm/configs/gta01_moredrivers_defconfig
+++ b/arch/arm/configs/gta01_moredrivers_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-rc3
-# Mon Feb 23 01:11:56 2009
+# Tue Feb 24 02:13:21 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -201,6 +201,7 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
CONFIG_S3C_LOWLEVEL_UART_PORT=0
CONFIG_S3C_GPIO_SPACE=0
CONFIG_S3C_GPIO_TRACK=y
+CONFIG_S3C_DMA=y
CONFIG_S3C_PWM=y
#
@@ -1188,7 +1189,6 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_PCF50633_GPIO=y
CONFIG_MFD_PCF50606=y
CONFIG_PCF50606_ADC=y
CONFIG_PCF50606_GPO=y
@@ -1318,6 +1318,7 @@ CONFIG_SND_S3C24XX_SOC_I2S=m
CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
+# CONFIG_SND_S3C64XX_SOC_SMDK6410_WM8731 is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_WM8753=m
diff --git a/arch/arm/configs/gta02_micro_defconfig b/arch/arm/configs/gta02_micro_defconfig
index 1eac63bb9a9..ee6cd1883fe 100644
--- a/arch/arm/configs/gta02_micro_defconfig
+++ b/arch/arm/configs/gta02_micro_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-rc3
-# Mon Feb 23 01:10:27 2009
+# Tue Feb 24 02:12:05 2009
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -176,6 +176,7 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
CONFIG_S3C_LOWLEVEL_UART_PORT=2
CONFIG_S3C_GPIO_SPACE=0
CONFIG_S3C_GPIO_TRACK=y
+CONFIG_S3C_DMA=y
CONFIG_S3C_PWM=y
#
diff --git a/arch/arm/configs/gta02_moredrivers_defconfig b/arch/arm/configs/gta02_moredrivers_defconfig
index 5b172fe5590..8fc710e01e9 100644
--- a/arch/arm/configs/gta02_moredrivers_defconfig
+++ b/arch/arm/configs/gta02_moredrivers_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-rc3
-# Mon Feb 23 01:09:17 2009
+# Tue Feb 24 02:11:01 2009
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -202,6 +202,7 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
CONFIG_S3C_LOWLEVEL_UART_PORT=2
CONFIG_S3C_GPIO_SPACE=0
CONFIG_S3C_GPIO_TRACK=y
+CONFIG_S3C_DMA=y
CONFIG_S3C_PWM=y
#
@@ -1410,6 +1411,7 @@ CONFIG_SND_S3C24XX_SOC_I2S=y
CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
+# CONFIG_SND_S3C64XX_SOC_SMDK6410_WM8731 is not set
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_WM8753=y
diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig
index 7df73367231..963e8de0590 100644
--- a/arch/arm/configs/gta02_packaging_defconfig
+++ b/arch/arm/configs/gta02_packaging_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-rc3
-# Mon Feb 23 01:11:13 2009
+# Tue Feb 24 02:12:40 2009
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -202,6 +202,7 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
CONFIG_S3C_LOWLEVEL_UART_PORT=2
CONFIG_S3C_GPIO_SPACE=0
CONFIG_S3C_GPIO_TRACK=y
+CONFIG_S3C_DMA=y
CONFIG_S3C_PWM=y
#
@@ -1413,6 +1414,7 @@ CONFIG_SND_S3C24XX_SOC_I2S=m
CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
+# CONFIG_SND_S3C64XX_SOC_SMDK6410_WM8731 is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_WM8753=m