The following commit has been merged into the x86/platform branch of tip: Commit-ID: 2b29eed3f201b49feb92fdd0178b10825a5528f4 Gitweb: https://git.kernel.org/tip/2b29eed3f201b49feb92fdd0178b10825a5528f4 Author: Roman Kiryanov <r...@google.com> AuthorDate: Mon, 16 Nov 2020 18:55:22 -08:00 Committer: Borislav Petkov <b...@suse.de> CommitterDate: Thu, 07 Jan 2021 09:22:31 +01:00
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 <r...@google.com> Signed-off-by: Borislav Petkov <b...@suse.de> Link: https://lkml.kernel.org/r/20201117025522.1874864-1-r...@google.com --- arch/x86/platform/Makefile | 1 +- arch/x86/platform/goldfish/Makefile | 2 +- arch/x86/platform/goldfish/goldfish.c | 54 +-------------------------- 3 files changed, 57 deletions(-) delete mode 100644 arch/x86/platform/goldfish/Makefile delete mode 100644 arch/x86/platform/goldfish/goldfish.c diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index d0e8354..b2f90a1 100644 --- 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 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 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);
