Commit 2b29eed3 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Borislav Petkov
Browse files

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: default avatarRoman Kiryanov <rkir@google.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201117025522.1874864-1-rkir@google.com
parent bdb154f0

arch/x86/platform/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

arch/x86/platform/goldfish/Makefile

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_GOLDFISH)	+= goldfish.o

arch/x86/platform/goldfish/goldfish.c

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
// 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);