summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-06-08 16:23:25 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2016-06-27 08:58:32 +0200
commit475764ae387355462c874892b03110298038adef (patch)
treec50f474fa6416bcc65f2c8955c719437cac16c37
parent69ae5ad2e6e9840d769c487ecf25f4ce9d002b20 (diff)
ARM: configs: colibri_vf: fix audio and add L2 switch
The audio Codec Machine driver was missing hence the sound card got not detected by the SAI driver. While at it also enable L2 switch and IIO sysfs trigger. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--arch/arm/configs/colibri_vf_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/colibri_vf_defconfig b/arch/arm/configs/colibri_vf_defconfig
index c576ea893340..f23d1c5ded42 100644
--- a/arch/arm/configs/colibri_vf_defconfig
+++ b/arch/arm/configs/colibri_vf_defconfig
@@ -114,6 +114,7 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_FARADAY is not set
+CONFIG_FSL_L2_SWITCH=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set
@@ -212,8 +213,8 @@ CONFIG_SND=y
# CONFIG_SND_SPI is not set
# CONFIG_SND_USB is not set
CONFIG_SND_SOC=y
-CONFIG_SND_SOC_FSL_SAI=y
CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_FSL_SAI_WM9712=y
CONFIG_SND_SOC_AC97_CODEC=y
CONFIG_HIDRAW=y
CONFIG_HID_MULTITOUCH=m
@@ -272,9 +273,9 @@ CONFIG_ARM_TIMER_SP804=y
CONFIG_SOC_BUS_VF610=y
CONFIG_EXTCON_USB_GPIO=y
CONFIG_IIO=y
-CONFIG_IIO_SYSFS_TRIGGER=y
CONFIG_VF610_ADC=y
CONFIG_VF610_DAC=y
+CONFIG_IIO_SYSFS_TRIGGER=y
CONFIG_PWM=y
CONFIG_PWM_FSL_FTM=y
CONFIG_NVMEM=y