From: Florian Fainelli <florian@openwrt.org>
To: stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 11/24 v2] USB: ohci: allow platform driver to specify the number of ports
Date: Thu, 4 Oct 2012 17:17:39 +0200 [thread overview]
Message-ID: <1349363872-27004-12-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349363872-27004-1-git-send-email-florian@openwrt.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
No changes since v1
drivers/usb/host/ohci-platform.c | 4 ++++
include/linux/usb/ohci_pdriver.h | 2 ++
2 files changed, 6 insertions(+)
diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index e24ec9f..1caaf65 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -31,6 +31,10 @@ static int ohci_platform_reset(struct usb_hcd *hcd)
ohci->flags |= OHCI_QUIRK_FRAME_NO;
ohci_hcd_init(ohci);
+
+ if (pdata->num_ports)
+ ohci->num_ports = pdata->num_ports;
+
err = ohci_init(ohci);
return err;
diff --git a/include/linux/usb/ohci_pdriver.h b/include/linux/usb/ohci_pdriver.h
index 74e7755..012f2b7 100644
--- a/include/linux/usb/ohci_pdriver.h
+++ b/include/linux/usb/ohci_pdriver.h
@@ -25,6 +25,7 @@
* @big_endian_desc: BE descriptors
* @big_endian_mmio: BE registers
* @no_big_frame_no: no big endian frame_no shift
+ * @num_ports: number of ports
*
* These are general configuration options for the OHCI controller. All of
* these options are activating more or less workarounds for some hardware.
@@ -33,6 +34,7 @@ struct usb_ohci_pdata {
unsigned big_endian_desc:1;
unsigned big_endian_mmio:1;
unsigned no_big_frame_no:1;
+ unsigned int num_ports;
/* Turn on all power and clocks */
int (*power_on)(struct platform_device *pdev);
--
1.7.9.5
next prev parent reply other threads:[~2012-10-04 15:19 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349363872-27004-1-git-send-email-florian@openwrt.org>
2012-10-04 15:17 ` [PATCH 01/24 v2] USB: EHCI: remove IXP4xx EHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 02/24 v2] MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x Florian Fainelli
2012-10-04 15:17 ` [PATCH 03/24 v2] USB: EHCI: remove Loongson 1B EHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 04/24 v2] MIPS: Netlogic: use ehci-platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 05/24 v2] USB: EHCI: remove Netlogic XLS EHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 06/24 v2] USB: EHCI: add no_io_watchdog platform_data parameter to ehci-platform Florian Fainelli
2012-10-04 18:58 ` Alan Stern
2012-10-04 15:17 ` [PATCH 07/24 v2] MIPS: Alchemy: use the ehci platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 08/24 v2] USB: EHCI: remove Alchemy EHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 09/24 v2] ARM: cns3xxx: use ehci platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 10/24 v2] USB: EHCI: remove CNS3xxx EHCI " Florian Fainelli
2012-10-04 15:17 ` Florian Fainelli [this message]
2012-10-04 15:17 ` [PATCH 12/24] USB: ohci: move ohci_pci_{suspend,resume} to ohci-hcd.c Florian Fainelli
2012-10-04 19:07 ` Alan Stern
2012-10-04 15:17 ` [PATCH 13/24] USB: ohci: remove check for RH already suspended in ohci_suspend Florian Fainelli
2012-10-04 15:17 ` [PATCH 14/24] USB: ohci: merge ohci_finish_controller_resume with ohci_resume Florian Fainelli
2012-10-05 1:38 ` Jingoo Han
2012-10-05 7:42 ` Nicolas Ferre
2012-10-04 15:17 ` [PATCH 15/24 v2] MIPS: PNX8550: use OHCI platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 16/24 v2] USB: OHCI: remove PNX8550 OHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 17/24 v2] ARM: cns3xxx: use OHCI platform driver Florian Fainelli
2012-10-04 19:19 ` Alan Stern
2012-10-04 15:17 ` [PATCH 18/24 v2] USB: OHCI: remove CNS3xxx " Florian Fainelli
2012-10-04 15:17 ` [PATCH 19/24 v2] MIPS: Netlogic: convert to use " Florian Fainelli
2012-10-04 15:17 ` [PATCH 20/24 v2] USB: OHCI: remove Netlogic XLS " Florian Fainelli
2012-10-04 15:17 ` [PATCH 21/24 v2] sh: convert boards to use the " Florian Fainelli
2012-10-04 15:17 ` [PATCH 22/24 v2] USB: OHCI: remove OHCI SH " Florian Fainelli
2012-10-04 15:17 ` [PATCH 23/24 v2] MIPS: Alchemy: use the OHCI " Florian Fainelli
2012-10-04 15:17 ` [PATCH 24/24 v2] USB: OHCI: remove Alchemy " Florian Fainelli
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=1349363872-27004-12-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--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®