From: Florian Fainelli <florian@openwrt.org>
To: stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
Anton Vorontsov <avorontsov@mvista.com>,
Russell King <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 16/25] ARM: cns3xxx: use OHCI platform driver
Date: Wed, 3 Oct 2012 17:03:12 +0200 [thread overview]
Message-ID: <1349276601-8371-18-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349276601-8371-1-git-send-email-florian@openwrt.org>
Since both the EHCI and OHCI platform drivers use the same power_{on,off}
callbacks, rename them to cns3xx_usb_power_{on,off} to show that they are
shared.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
arch/arm/mach-cns3xxx/cns3420vb.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c
index 906094c..8a00cee8 100644
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -25,6 +25,7 @@
#include <linux/mtd/physmap.h>
#include <linux/mtd/partitions.h>
#include <linux/usb/ehci_pdriver.h>
+#include <linux/usb/ohci_pdriver.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/hardware/gic.h>
@@ -127,7 +128,7 @@ static struct resource cns3xxx_usb_ehci_resources[] = {
static u64 cns3xxx_usb_ehci_dma_mask = DMA_BIT_MASK(32);
-static int csn3xxx_usb_ehci_power_on(struct platform_device *pdev)
+static int csn3xxx_usb_power_on(struct platform_device *pdev)
{
/*
* EHCI and OHCI share the same clock and power,
@@ -148,7 +149,7 @@ static int csn3xxx_usb_ehci_power_on(struct platform_device *pdev)
return 0;
}
-static void csn3xxx_usb_ehci_power_off(struct platform_device *pdev)
+static void csn3xxx_usb_power_off(struct platform_device *pdev)
{
/*
* EHCI and OHCI share the same clock and power,
@@ -162,8 +163,8 @@ static void csn3xxx_usb_ehci_power_off(struct platform_device *pdev)
static struct usb_ehci_pdata cns3xxx_usb_ehci_pdata = {
.port_power_off = 1,
- .power_on = csn3xxx_usb_ehci_power_on,
- .power_off = csn3xxx_usb_ehci_power_off,
+ .power_on = csn3xxx_usb_power_on,
+ .power_off = csn3xxx_usb_power_off,
};
static struct platform_device cns3xxx_usb_ehci_device = {
@@ -191,13 +192,20 @@ static struct resource cns3xxx_usb_ohci_resources[] = {
static u64 cns3xxx_usb_ohci_dma_mask = DMA_BIT_MASK(32);
+static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = {
+ .num_ports = 1,
+ .power_on = csn3xxx_usb_power_on,
+ .power_off = csn3xxx_usb_power_off,
+};
+
static struct platform_device cns3xxx_usb_ohci_device = {
- .name = "cns3xxx-ohci",
+ .name = "ohci-platform",
.num_resources = ARRAY_SIZE(cns3xxx_usb_ohci_resources),
.resource = cns3xxx_usb_ohci_resources,
.dev = {
.dma_mask = &cns3xxx_usb_ohci_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
+ .platform_data = &cns3xxx_usb_ohci_pdata,
},
};
--
1.7.9.5
next prev parent reply other threads:[~2012-10-03 15:14 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349276601-8371-1-git-send-email-florian@openwrt.org>
2012-10-03 15:02 ` [PATCH 01/25] USB: ehci: remove IXP4xx EHCI driver Florian Fainelli
2012-10-03 15:02 ` [PATCH 02/25] MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x Florian Fainelli
2012-10-03 15:02 ` [PATCH 03/25] USB: ehci: remove Loongson 1B EHCI driver Florian Fainelli
2012-10-03 15:02 ` [PATCH 04/25] MIPS: Netlogic: use ehci-platform driver Florian Fainelli
2012-10-03 16:47 ` Alan Stern
2012-10-04 14:51 ` Florian Fainelli
2012-10-04 10:51 ` Jonas Gorski
2012-10-03 15:03 ` [PATCH 05/25] USB: ehci: remove Netlogic XLS EHCI driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 06/25] USB: ehci: allow need_io_watchdog to be passed to ehci-platform driver Florian Fainelli
2012-10-03 16:01 ` Alan Stern
2012-10-03 16:12 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 07/25] MIPS: Alchemy: use the ehci platform driver Florian Fainelli
2012-10-03 15:14 ` Manuel Lauss
2012-10-03 15:20 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 08/25] USB: ehci: remove Alchemy EHCI driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 09/25] MIPS: Octeon: use ehci-platform driver Florian Fainelli
2012-10-03 16:45 ` David Daney
2012-10-03 18:30 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 10/25] USB: ehci: remove Octeon EHCI driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 11/25] ARM: cns3xxx: use ehci platform driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 12/25] USB: ehci: remove CNS3xxx EHCI " Florian Fainelli
2012-10-03 16:16 ` Alan Stern
2012-10-03 15:03 ` [PATCH 13/25] USB: ohci: allow platform driver to specify the number of ports Florian Fainelli
2012-10-03 15:03 ` [PATCH 14/25] MIPS: PNX8550: use OHCI platform driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 14/25] MIPS: PNX8550: useOHCI " Florian Fainelli
2012-10-03 15:03 ` [PATCH 15/25] USB: ohci: remove PNX8550 OHCI driver Florian Fainelli
2012-10-03 15:03 ` Florian Fainelli [this message]
2012-10-03 15:03 ` [PATCH 17/25] USB: ohci: remove CNS3xxx OHCI platform driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 18/25] MIPS: Octeon: use " Florian Fainelli
2012-10-03 16:47 ` David Daney
2012-10-03 15:03 ` [PATCH 19/25] USB: ohci: remove Octeon " Florian Fainelli
2012-10-03 15:03 ` [PATCH 20/25] MIPS: Netlogic: convert to use " Florian Fainelli
2012-10-04 10:53 ` Jonas Gorski
2012-10-03 15:03 ` [PATCH 21/25] USB: ohci: remove Netlogic XLS " Florian Fainelli
2012-10-03 15:03 ` [PATCH 22/25] sh: convert boards to use the " Florian Fainelli
2012-10-03 15:03 ` [PATCH 23/25] USB: ohci: remove OHCI SH " Florian Fainelli
2012-10-03 15:03 ` [PATCH 24/25] MIPS: Alchemy: use the OHCI " Florian Fainelli
2012-10-03 15:21 ` Manuel Lauss
2012-10-03 15:24 ` Florian Fainelli
2012-10-03 15:26 ` Manuel Lauss
2012-10-03 16:07 ` Manuel Lauss
2012-10-03 16:13 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 25/25] USB: ohci: remove Alchemy " Florian Fainelli
2012-10-03 16:47 ` Alan Stern
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=1349276601-8371-18-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=avorontsov@mvista.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=stern@rowland.harvard.edu \
/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
all inboxes | Powered by JetHome®