4 files changed, 65 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 79795af59810..46fb28c93f76 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -320,6 +320,10 @@ config X86_BIGSMP
         ---help---
           This option is needed for the systems that have more than 8 CPUs
 
+config GOLDFISH
+       def_bool y
+       depends on X86_GOLDFISH
+
 if X86_32
 config X86_EXTENDED_PLATFORM
         bool "Support for extended (non-PC) x86 platforms"
@@ -402,6 +406,14 @@ config X86_UV
 # Following is an alphabetically sorted list of 32 bit extended platforms
 # Please maintain the alphabetic order if and when there are additions
 
+config X86_GOLDFISH
+       bool "Goldfish (Virtual Platform)"
+       depends on X86_32
+       ---help---
+         Enable support for the Goldfish virtual platform used primarily
+         for Android development. Unless you are building for the Android
+         Goldfish emulator say N here.
+
 config X86_INTEL_CE
         bool "CE4100 TV platform"
         depends on PCI
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index 8d874396cb29..bfe917f4f69a 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -2,6 +2,7 @@
 obj-y   += ce4100/
 obj-y   += efi/
 obj-y   += geode/
+obj-y   += goldfish/
 obj-y   += iris/
 obj-y   += mrst/
 obj-y   += olpc/
diff --git a/arch/x86/platform/goldfish/Makefile b/arch/x86/platform/goldfish/Makefile
new file mode 100644
index 000000000000..f030b532fdf3
--- /dev/null
+++ b/arch/x86/platform/goldfish/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_GOLDFISH)  += goldfish.o
diff --git a/arch/x86/platform/goldfish/goldfish.c b/arch/x86/platform/goldfish/goldfish.c
new file mode 100644
index 000000000000..1693107a518e
--- /dev/null
+++ b/arch/x86/platform/goldfish/goldfish.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2007 Google, Inc.
+ * Copyright (C) 2011 Intel, Inc.
+ * Copyright (C) 2013 Intel, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+
+/*
+ * Where in virtual device memory the IO devices (timers, system controllers
+ * and so on)
+ */
+
+#define GOLDFISH_PDEV_BUS_BASE  (0xff001000)
+#define GOLDFISH_PDEV_BUS_END   (0xff7fffff)
+#define GOLDFISH_PDEV_BUS_IRQ   (4)
+
+#define GOLDFISH_TTY_BASE       (0x2000)
+
+static struct resource goldfish_pdev_bus_resources[] = {
+        {
+                .start  = GOLDFISH_PDEV_BUS_BASE,
+                .end    = GOLDFISH_PDEV_BUS_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = GOLDFISH_PDEV_BUS_IRQ,
+                .end    = GOLDFISH_PDEV_BUS_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static int __init goldfish_init(void)
+{
+        platform_device_register_simple("goldfish_pdev_bus", -1,
+                                                goldfish_pdev_bus_resources, 2);
+        return 0;
+}
+device_initcall(goldfish_init);