From: Jiaxun Yang <jiaxun.yang@flygoat.com>
To: linux-mips@vger.kernel.org
Cc: paul.burton@mips.com, keguang.zhang@gmail.com,
linux-kernel@vger.kernel.org,
Jiaxun Yang <jiaxun.yang@flygoat.com>
Subject: [PATCH 1/4] MIPS: Loongson32: Remove ehci platform device
Date: Tue, 12 Mar 2019 17:15:17 +0800 [thread overview]
Message-ID: <20190312091520.8863-2-jiaxun.yang@flygoat.com> (raw)
In-Reply-To: <20190312091520.8863-1-jiaxun.yang@flygoat.com>
It's going to be enabled by DeviceTree
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
.../include/asm/mach-loongson32/platform.h | 1 -
arch/mips/loongson32/common/platform.c | 30 -------------------
arch/mips/loongson32/ls1b/board.c | 1 -
3 files changed, 32 deletions(-)
diff --git a/arch/mips/include/asm/mach-loongson32/platform.h b/arch/mips/include/asm/mach-loongson32/platform.h
index 15d1de2300fe..f36c8d287b59 100644
--- a/arch/mips/include/asm/mach-loongson32/platform.h
+++ b/arch/mips/include/asm/mach-loongson32/platform.h
@@ -19,7 +19,6 @@ extern struct platform_device ls1x_uart_pdev;
extern struct platform_device ls1x_cpufreq_pdev;
extern struct platform_device ls1x_eth0_pdev;
extern struct platform_device ls1x_eth1_pdev;
-extern struct platform_device ls1x_ehci_pdev;
extern struct platform_device ls1x_gpio0_pdev;
extern struct platform_device ls1x_gpio1_pdev;
extern struct platform_device ls1x_rtc_pdev;
diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c
index 0bf355c8bcb2..4b35f49e9fcb 100644
--- a/arch/mips/loongson32/common/platform.c
+++ b/arch/mips/loongson32/common/platform.c
@@ -10,12 +10,10 @@
#include <linux/clk.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
-#include <linux/mtd/partitions.h>
#include <linux/sizes.h>
#include <linux/phy.h>
#include <linux/serial_8250.h>
#include <linux/stmmac.h>
-#include <linux/usb/ehci_pdriver.h>
#include <platform.h>
#include <loongson1.h>
@@ -255,34 +253,6 @@ struct platform_device ls1x_gpio1_pdev = {
.resource = ls1x_gpio1_resources,
};
-/* USB EHCI */
-static u64 ls1x_ehci_dmamask = DMA_BIT_MASK(32);
-
-static struct resource ls1x_ehci_resources[] = {
- [0] = {
- .start = LS1X_EHCI_BASE,
- .end = LS1X_EHCI_BASE + SZ_32K - 1,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = LS1X_EHCI_IRQ,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct usb_ehci_pdata ls1x_ehci_pdata = {
-};
-
-struct platform_device ls1x_ehci_pdev = {
- .name = "ehci-platform",
- .id = -1,
- .num_resources = ARRAY_SIZE(ls1x_ehci_resources),
- .resource = ls1x_ehci_resources,
- .dev = {
- .dma_mask = &ls1x_ehci_dmamask,
- .platform_data = &ls1x_ehci_pdata,
- },
-};
/* Real Time Clock */
void __init ls1x_rtc_set_extclk(struct platform_device *pdev)
diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c
index 447b15fc0a2b..74f7b530d9b1 100644
--- a/arch/mips/loongson32/ls1b/board.c
+++ b/arch/mips/loongson32/ls1b/board.c
@@ -42,7 +42,6 @@ static struct platform_device *ls1b_platform_devices[] __initdata = {
&ls1x_cpufreq_pdev,
&ls1x_eth0_pdev,
&ls1x_eth1_pdev,
- &ls1x_ehci_pdev,
&ls1x_gpio0_pdev,
&ls1x_gpio1_pdev,
&ls1x_rtc_pdev,
--
2.20.1
next prev parent reply other threads:[~2019-03-12 9:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 9:15 [PATCH 0/4] Loongson-32 initial DeviceTree support Jiaxun Yang
2019-03-12 9:15 ` Jiaxun Yang [this message]
2019-04-11 12:19 ` [PATCH v2 0/6] MIPS: Loongson32: Initial devicetree support Jiaxun Yang
2019-04-11 12:19 ` [PATCH v2 1/6] MIPS: Loongson32: Remove ehci platform device Jiaxun Yang
2019-04-11 12:19 ` [PATCH v2 2/6] MIPS: Loongson32: Add DeviceTree support Jiaxun Yang
2019-04-11 12:19 ` [PATCH v2 3/6] MIPS: Loongson32: Kconfig merge CPU_LOONGSON1B&C Jiaxun Yang
2019-04-11 12:19 ` [PATCH v2 4/6] dt-bindings: Add vendor prefix for loongson Jiaxun Yang
2019-04-29 18:13 ` Rob Herring
2019-04-11 12:19 ` [PATCH v2 5/6] dt/bindings: Add bindings for ls1x CPU Jiaxun Yang
2019-04-29 18:14 ` Rob Herring
2019-04-11 12:19 ` [PATCH v2 6/6] MIPS: Loongson32: dts: add ls1b & ls1c Jiaxun Yang
2019-03-12 9:15 ` [PATCH 2/4] MIPS: Loongson32: Add DeviceTree support Jiaxun Yang
2019-03-12 9:15 ` [PATCH 3/4] MIPS: Loongson32: Kconfig merge CPU_LOONGSON1B&C Jiaxun Yang
2019-03-12 9:15 ` [PATCH 4/4] MIPS: Loongson32: dts: add ls1b & ls1c Jiaxun Yang
2019-03-12 12:28 ` Rob Herring
2019-03-13 1:08 ` Jiaxun Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190312091520.8863-2-jiaxun.yang@flygoat.com \
--to=jiaxun.yang@flygoat.com \
--cc=keguang.zhang@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paul.burton@mips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).