summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2019-03-05 11:11:34 -0800
committerAlistair Strachan <astrachan@google.com>2019-05-14 17:59:02 -0700
commit636b8ad986067b8d3282348ab92d6899603cae5c (patch)
treed8ae4ffec659569b360269a2acfcbbe2c3dee907
parent509dc245b717a77134ccc450185cfcd329011d39 (diff)
ANDROID: cuttlefish_defconfig: Add support for AC97 audio
Enable driver support for the ac97 emulation provided by QEMU and crosvm. This is for the older 'ac97' soundhw, not 'hda'. Bug: 126955561 Test: local build and test of sound from cuttlefish Change-Id: I6c29e352e0be161e2a1dc35fde50b888b7dbf86e Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--arch/arm64/configs/cuttlefish_defconfig6
-rw-r--r--arch/x86/configs/x86_64_cuttlefish_defconfig6
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig
index 7457781a6f4f..3fe49c860df8 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -278,6 +278,12 @@ CONFIG_DRM=y
CONFIG_DRM_VIRTIO_GPU=y
CONFIG_SOUND=y
CONFIG_SND=y
+CONFIG_SND_HRTIMER=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_DRIVERS is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_USB is not set
CONFIG_HIDRAW=y
CONFIG_UHID=y
CONFIG_HID_A4TECH=y
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig
index 75785ceede1a..e2e8103e98a0 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -306,6 +306,12 @@ CONFIG_DRM=y
CONFIG_DRM_VIRTIO_GPU=y
CONFIG_SOUND=y
CONFIG_SND=y
+CONFIG_SND_HRTIMER=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_DRIVERS is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_USB is not set
CONFIG_HIDRAW=y
CONFIG_UHID=y
CONFIG_HID_A4TECH=y