From: Florian Fainelli <florian@openwrt.org>
To: stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
Ralf Baechle <ralf@linux-mips.org>,
Manuel Lauss <manuel.lauss@googlemail.com>,
Thomas Meyer <thomas@m3y3r.de>,
"David S. Miller" <davem@davemloft.net>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Subject: [PATCH 24/25] MIPS: Alchemy: use the OHCI platform driver
Date: Wed, 3 Oct 2012 17:03:20 +0200 [thread overview]
Message-ID: <1349276601-8371-26-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349276601-8371-1-git-send-email-florian@openwrt.org>
This also greatly simplifies the power_{on,off} callbacks and make them
work on platform device id instead of checking the OHCI controller base
address like what was done in ohci-au1xxx.c.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
arch/mips/alchemy/common/platform.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index 57335a2..cd12458 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -18,6 +18,7 @@
#include <linux/serial_8250.h>
#include <linux/slab.h>
#include <linux/usb/ehci_pdriver.h>
+#include <linux/usb/ohci_pdriver.h>
#include <asm/mach-au1x00/au1000.h>
#include <asm/mach-au1x00/au1xxx_dbdma.h>
@@ -142,6 +143,34 @@ static struct usb_ehci_pdata alchemy_ehci_pdata = {
.power_suspend = alchemy_ehci_power_off,
};
+/* Power on callback for the ohci platform driver */
+static int alchemy_ohci_power_on(struct platform_device *pdev)
+{
+ int unit;
+
+ unit = (pdev->id == 1) ?
+ ALCHEMY_USB_OHCI1 : ALCHEMY_USB_OHCI0;
+
+ return alchemy_usb_control(unit, 1);
+}
+
+/* Power off/suspend callback for the ohci platform driver */
+static void alchemy_ohci_power_off(struct platform_device *pdev)
+{
+ int unit;
+
+ unit = (pdev->id == 1) ?
+ ALCHEMY_USB_OHCI1 : ALCHEMY_USB_OHCI0;
+
+ alchemy_usb_control(unit, 0);
+}
+
+static struct usb_ohci_pdata alchemy_ohci_pdata = {
+ .power_on = alchemy_ohci_power_on,
+ .power_off = alchemy_ohci_power_off,
+ .power_suspend = alchemy_ohci_power_off,
+};
+
static unsigned long alchemy_ohci_data[][2] __initdata = {
[ALCHEMY_CPU_AU1000] = { AU1000_USB_OHCI_PHYS_ADDR, AU1000_USB_HOST_INT },
[ALCHEMY_CPU_AU1500] = { AU1000_USB_OHCI_PHYS_ADDR, AU1500_USB_HOST_INT },
@@ -192,6 +221,7 @@ static void __init alchemy_setup_usb(int ctype)
pdev->name = "au1xxx-ohci";
pdev->id = 0;
pdev->dev.dma_mask = &alchemy_ohci_dmamask;
+ pdev->dev.platform_data = &alchemy_ohci_pdata;
if (platform_device_register(pdev))
printk(KERN_INFO "Alchemy USB: cannot add OHCI0\n");
@@ -231,6 +261,7 @@ static void __init alchemy_setup_usb(int ctype)
pdev->name = "au1xxx-ohci";
pdev->id = 1;
pdev->dev.dma_mask = &alchemy_ohci_dmamask;
+ pdev->dev.platform_data = &alchemy_ohci_pdata;
if (platform_device_register(pdev))
printk(KERN_INFO "Alchemy USB: cannot add OHCI1\n");
--
1.7.9.5
next prev parent reply other threads:[~2012-10-03 15:17 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 ` [PATCH 16/25] ARM: cns3xxx: use OHCI platform driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 17/25] USB: ohci: remove CNS3xxx " 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 ` Florian Fainelli [this message]
2012-10-03 15:21 ` [PATCH 24/25] MIPS: Alchemy: use the OHCI " 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-26-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-usb@vger.kernel.org \
--cc=manuel.lauss@googlemail.com \
--cc=ralf@linux-mips.org \
--cc=stern@rowland.harvard.edu \
--cc=thomas@m3y3r.de \
/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®