x86/platform: Retire arch/x86/platform/goldfish

The Android Studio Emulator (aka goldfish) does not use
arch/x86/platform/goldfish since 5.4 kernel.

Signed-off-by: Roman Kiryanov <rkir@google.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201117025522.1874864-1-rkir@google.com

diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index d0e835470d01aff90b0f54cc45217c550870f3fb..b2f90a1a89f1039888decc8200b8eceaf28a382e 100644 (file)
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -4,7 +4,6 @@ obj-y   += atom/
 obj-y  += ce4100/
 obj-y  += efi/
 obj-y  += geode/
-obj-y  += goldfish/
 obj-y  += iris/
 obj-y  += intel/
 obj-y  += intel-mid/

diff --git a/arch/x86/platform/goldfish/Makefile b/arch/x86/platform/goldfish/Makefile
deleted file mode 100644 (file)
index 072c395..0000000
--- a/arch/x86/platform/goldfish/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_GOLDFISH) += goldfish.o

diff --git a/arch/x86/platform/goldfish/goldfish.c b/arch/x86/platform/goldfish/goldfish.c
deleted file mode 100644 (file)
index 6b6f8b4..0000000
--- a/arch/x86/platform/goldfish/goldfish.c
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2007 Google, Inc.
- * Copyright (C) 2011 Intel, Inc.
- * Copyright (C) 2013 Intel, Inc.
- */
-
-#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 bool goldfish_enable __initdata;
-
-static int __init goldfish_setup(char *str)
-{
-       goldfish_enable = true;
-       return 0;
-}
-__setup("goldfish", goldfish_setup);
-
-static int __init goldfish_init(void)
-{
-       if (!goldfish_enable)
-               return -ENODEV;
-
-       platform_device_register_simple("goldfish_pdev_bus", -1,
-                                       goldfish_pdev_bus_resources, 2);
-       return 0;
-}
-device_initcall(goldfish_init);