summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-01-29 11:52:55 +0000
committerPeter Robinson <pbrobinson@gmail.com>2015-01-29 11:52:55 +0000
commitd0ca4d59a1dc6d1e13babfaa093b0ee8b03cfdb6 (patch)
tree0304091b7006b1e1595defe96d429cc812bae99f /config-armv7-generic
parent059a12eba669ddfb96c94de7ea20af4a8501ebb2 (diff)
downloadkernel-d0ca4d59a1dc6d1e13babfaa093b0ee8b03cfdb6.tar.gz
kernel-d0ca4d59a1dc6d1e13babfaa093b0ee8b03cfdb6.tar.xz
kernel-d0ca4d59a1dc6d1e13babfaa093b0ee8b03cfdb6.zip
- More ARMv7 updates
- A few more sound config cleanups
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic15
1 files changed, 5 insertions, 10 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index a55789fe3..c3a3a3cd4 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -163,6 +163,7 @@ CONFIG_PL330_DMA=m
CONFIG_AMBA_PL08X=y
CONFIG_GPIO_PL061=y
CONFIG_PL320_MBOX=y
+CONFIG_SND_ARMAACI=m
# highbank
CONFIG_EDAC_HIGHBANK_MC=m
@@ -233,6 +234,7 @@ CONFIG_MMC_DW_EXYNOS=m
CONFIG_EXYNOS_IOMMU=y
CONFIG_PCI_EXYNOS=y
CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_PHY_SAMSUNG_USB2=m
CONFIG_USB_EHCI_EXYNOS=m
CONFIG_USB_OHCI_EXYNOS=m
CONFIG_USB_DWC3_EXYNOS=m
@@ -246,10 +248,10 @@ CONFIG_REGULATOR_S2MPS11=m
CONFIG_REGULATOR_S5M8767=m
CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_S3C=m
CONFIG_MFD_WM8994=m
CONFIG_GPIO_WM8994=m
CONFIG_REGULATOR_WM8994=m
-# CONFIG_RTC_DRV_S3C is not set
CONFIG_EXYNOS_VIDEO=y
CONFIG_EXYNOS_MIPI_DSI=y
@@ -614,15 +616,8 @@ CONFIG_DW_WATCHDOG=m
CONFIG_PCIE_DW=y
# Sound
-CONFIG_SND_SPI=y
CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SOC_ALL_CODECS=m
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_AC97_BUS=y
# Displays
CONFIG_BACKLIGHT_TPS65217=m
@@ -730,7 +725,7 @@ CONFIG_LCD_HX8357=m
CONFIG_INPUT_GP2A=m
CONFIG_INPUT_ARIZONA_HAPTICS=m
CONFIG_INPUT_MC13783_PWRBUTTON=m
-# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
CONFIG_TOUCHSCREEN_ADS7846=m
CONFIG_TOUCHSCREEN_AD7877=m