---

yaml --- r: 354143 b: refs/heads/master c: 8e404ff h: refs/heads/master i: 354141: e5dbb92 354139: a4eedf9 354135: 9919187 354127: a2231ba 354111: 6ebbaea v: v3
git-mirror · Jan 24, 2013 · 2e5b46f · 2e5b46f
1 parent 15003b2
commit 2e5b46f
Show file tree

Hide file tree

Showing 6 changed files with 534 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e82b83dc30e515ca3e03e79d4a398f30d796903
+refs/heads/master: 8e404fffeac7d3985b193edbf860d9d73dec5b6a
diff --git a/trunk/drivers/staging/goldfish/Kconfig b/trunk/drivers/staging/goldfish/Kconfig
@@ -4,3 +4,9 @@ config GOLDFISH_AUDIO
 	---help---
 	  Emulated audio channel for the Goldfish Android Virtual Device
 
+config MTD_GOLDFISH_NAND
+	tristate "Goldfish NAND device"
+	depends on GOLDFISH
+	help
+	  Drives the emulated NAND flash device on the Google Goldfish
+	  Android virtual device.
diff --git a/trunk/drivers/staging/goldfish/Makefile b/trunk/drivers/staging/goldfish/Makefile
@@ -3,3 +3,4 @@
 #
 
 obj-$(CONFIG_GOLDFISH_AUDIO) += goldfish_audio.o
+obj-$(CONFIG_MTD_GOLDFISH_NAND)	+= goldfish_nand.o
diff --git a/trunk/drivers/staging/goldfish/README b/trunk/drivers/staging/goldfish/README
@@ -1,2 +1,12 @@
+Audio
+-----
 - Move to using the ALSA framework not faking it
 - Fix the wrong user page DMA (moving to ALSA may fix that too)
+
+NAND
+----
+- Switch from spinlock to mutex
+- Remove excess checking of parameters in calls
+- Use dma coherent memory not kmalloc/__pa for the memory (this is just
+  a cleanliness issue not a correctness one)
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		#

		obj-$(CONFIG_GOLDFISH_AUDIO) += goldfish_audio.o
		obj-$(CONFIG_MTD_GOLDFISH_NAND) += goldfish_nand.o