Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e82b83d authored Jan 23, 2013 by Alan Cox Committed by Greg Kroah-Hartman Jan 24, 2013

goldfish: audio support



(remove change to another file that escaped into the patch set)

From: Mike Lockwood <lockwood@google.com>

Provide a simple audio channel between the kernel and the emulator that host
sit. Queued for staging right now as this ought to be an ALSA driver not
just a dumb device of its own making.

Signed-off-by: Mike A. Chan <mikechan@google.com>
[x86 support]
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
[Clean up]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 17c4c9db

drivers/staging/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -140,4 +140,6 @@ source "drivers/staging/fwserial/Kconfig"

	source "drivers/staging/zcache/Kconfig"		source "drivers/staging/zcache/Kconfig"

			source "drivers/staging/goldfish/Kconfig"

	endif # STAGING		endif # STAGING

drivers/staging/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -62,3 +62,4 @@ obj-$(CONFIG_DGRP) += dgrp/
	obj-$(CONFIG_SB105X) += sb105x/		obj-$(CONFIG_SB105X) += sb105x/
	obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/		obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/
	obj-$(CONFIG_ZCACHE) += zcache/		obj-$(CONFIG_ZCACHE) += zcache/
			obj-$(CONFIG_GOLDFISH) += goldfish/

drivers/staging/goldfish/Kconfig

0 → 100644

+6 −0

Original line number	Original line	Diff line number	Diff line
			config GOLDFISH_AUDIO
			tristate "Goldfish AVD Audio Device"
			depends on GOLDFISH
			---help---
			Emulated audio channel for the Goldfish Android Virtual Device

drivers/staging/goldfish/Makefile

0 → 100644

+5 −0

Original line number	Original line	Diff line number	Diff line
			#
			# Makefile for the Goldfish audio driver
			#

			obj-$(CONFIG_GOLDFISH_AUDIO) += goldfish_audio.o

drivers/staging/goldfish/README

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			- Move to using the ALSA framework not faking it
			- Fix the wrong user page DMA (moving to ALSA may fix that too)