* [PATCH] arch: x86: platform: retire arch/x86/platform/goldfish
@ 2020-11-17 2:55 rkir
2020-12-14 21:20 ` Roman Kiryanov
2021-01-07 8:32 ` [tip: x86/platform] x86/platform: Retire arch/x86/platform/goldfish tip-bot2 for Roman Kiryanov
0 siblings, 2 replies; 4+ messages in thread
From: rkir @ 2020-11-17 2:55 UTC (permalink / raw)
To: dvhart, andy; +Cc: linux-kernel, lfy, Roman Kiryanov
From: Roman Kiryanov <rkir@google.com>
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>
---
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 d0e835470d01..b2f90a1a89f1 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 072c395379ac..000000000000
--- 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 6b6f8b4360dd..000000000000
--- 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);
--
2.29.2.299.gdc1121823c-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] arch: x86: platform: retire arch/x86/platform/goldfish
2020-11-17 2:55 [PATCH] arch: x86: platform: retire arch/x86/platform/goldfish rkir
@ 2020-12-14 21:20 ` Roman Kiryanov
2021-01-07 0:24 ` Roman Kiryanov
2021-01-07 8:32 ` [tip: x86/platform] x86/platform: Retire arch/x86/platform/goldfish tip-bot2 for Roman Kiryanov
1 sibling, 1 reply; 4+ messages in thread
From: Roman Kiryanov @ 2020-12-14 21:20 UTC (permalink / raw)
To: dvhart, andy; +Cc: LKML, Lingfeng Yang
On Mon, Nov 16, 2020 at 6:55 PM <rkir@google.com> wrote:
>
> From: Roman Kiryanov <rkir@google.com>
>
> 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>
Gentle ping.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] arch: x86: platform: retire arch/x86/platform/goldfish
2020-12-14 21:20 ` Roman Kiryanov
@ 2021-01-07 0:24 ` Roman Kiryanov
0 siblings, 0 replies; 4+ messages in thread
From: Roman Kiryanov @ 2021-01-07 0:24 UTC (permalink / raw)
To: Thomas Gleixner, mingo, Borislav Petkov; +Cc: LKML, Lingfeng Yang
+Thoman, +Ingo, +Borislav
On Mon, Dec 14, 2020 at 1:20 PM Roman Kiryanov <rkir@google.com> wrote:
>
> On Mon, Nov 16, 2020 at 6:55 PM <rkir@google.com> wrote:
> >
> > From: Roman Kiryanov <rkir@google.com>
> >
> > 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>
>
> Gentle ping.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: x86/platform] x86/platform: Retire arch/x86/platform/goldfish
2020-11-17 2:55 [PATCH] arch: x86: platform: retire arch/x86/platform/goldfish rkir
2020-12-14 21:20 ` Roman Kiryanov
@ 2021-01-07 8:32 ` tip-bot2 for Roman Kiryanov
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Roman Kiryanov @ 2021-01-07 8:32 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Roman Kiryanov, Borislav Petkov, x86, linux-kernel
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 <rkir@google.com>
AuthorDate: Mon, 16 Nov 2020 18:55:22 -08:00
Committer: Borislav Petkov <bp@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 <rkir@google.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201117025522.1874864-1-rkir@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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-07 8:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-17 2:55 [PATCH] arch: x86: platform: retire arch/x86/platform/goldfish rkir
2020-12-14 21:20 ` Roman Kiryanov
2021-01-07 0:24 ` Roman Kiryanov
2021-01-07 8:32 ` [tip: x86/platform] x86/platform: Retire arch/x86/platform/goldfish tip-bot2 for Roman Kiryanov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).