summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx6_defconfig
diff options
context:
space:
mode:
authorAlan Tull <alan.tull@freescale.com>2011-09-15 15:51:33 -0500
committerJason Liu <r64343@freescale.com>2012-01-09 21:03:15 +0800
commit495116168d8cbd4312c0902391e6d09c3c2eb681 (patch)
treeccf1f403de7078bae95ea22177677e85d150d82c /arch/arm/configs/imx6_defconfig
parent5d422a604fd113285b43d860fd07b0818f5e86b7 (diff)
ENGR00160860-1 hdmi audio driver
Audio driver for i.Mx built-in HDMI Transmitter. * Uses HDMI Transmitter's built-in DMA. * Adds IEC958-style digital audio header info to the raw audio. * Gets pixel clock from the IPU driver and calculates clock regenerator values (cts and N). * Move ipu_id, and disp_id from the HDMI's platform data to the HDMI mfd's platform data. Saves them in the hdmi mfd. Signed-off-by: Alan Tull <alan.tull@freescale.com>
Diffstat (limited to 'arch/arm/configs/imx6_defconfig')
-rw-r--r--arch/arm/configs/imx6_defconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 81f9dd6a89f6..550d63a89c34 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1443,9 +1443,6 @@ CONFIG_SND_DRIVERS=y
CONFIG_SND_ARM=y
CONFIG_SND_SPI=y
CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_CAIAQ is not set
CONFIG_SND_SOC=y
# CONFIG_SND_SOC_CACHE_LZO is not set
CONFIG_SND_SOC_AC97_BUS=y
@@ -1454,10 +1451,12 @@ CONFIG_SND_MXC_SOC_MX2=y
CONFIG_SND_MXC_SOC_SPDIF_DAI=y
CONFIG_SND_SOC_IMX_CS42888=y
CONFIG_SND_SOC_IMX_SPDIF=y
+CONFIG_SND_SOC_IMX_HDMI=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_MXC_SPDIF=y
CONFIG_SND_SOC_CS42888=y
+CONFIG_SND_SOC_MXC_HDMI=y
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=y
CONFIG_HID_SUPPORT=y