From: Roger Quadros <rogerq@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: Roger Quadros <rogerq@ti.com>, <sameo@linux.intel.com>,
<balbi@ti.com>, <tony@atomide.com>, <kishon@ti.com>,
<sshtylyov@mvista.com>, <bjorn@mork.no>, <linux@arm.linux.org.uk>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Alan Stern <stern@rowland.harvard.edu>
Subject: Re: [PATCH v9 02/20] mfd: omap-usb-host: Consolidate OMAP USB-HS platform data
Date: Thu, 14 Feb 2013 12:18:17 +0200 [thread overview]
Message-ID: <511CB9E9.5050804@ti.com> (raw)
In-Reply-To: <1358937492-8129-3-git-send-email-rogerq@ti.com>
Hi Greg,
On 01/23/2013 12:37 PM, Roger Quadros wrote:
> Let's have a single platform data structure for the OMAP's High-Speed
> USB host subsystem instead of having 3 separate ones i.e. one for
> board data, one for USB Host (UHH) module and one for USB-TLL module.
>
> This makes the code much simpler and avoids creating multiple copies of
> platform data.
>
> CC: Alan Stern <stern@rowland.harvard.edu>
>
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> Reviewed-by: Felipe Balbi <balbi@ti.com>
> For the ehci-omap.c part:
> Acked-by: Alan Stern <stern@rowland.harvard.edu>
Could you please ACK the drivers/usb/host/ehci-omap.c part
so that this can go through the MFD tree. Thanks.
The reason it needs to go through MFD is that it depends on
a platform header change which Samuel and Tony have agreed to share.
cheers,
-roger
> ---
> arch/arm/mach-omap2/board-3430sdp.c | 2 +-
> arch/arm/mach-omap2/board-3630sdp.c | 2 +-
> arch/arm/mach-omap2/board-am3517crane.c | 2 +-
> arch/arm/mach-omap2/board-am3517evm.c | 2 +-
> arch/arm/mach-omap2/board-cm-t35.c | 2 +-
> arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
> arch/arm/mach-omap2/board-devkit8000.c | 2 +-
> arch/arm/mach-omap2/board-igep0020.c | 4 +-
> arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
> arch/arm/mach-omap2/board-omap3evm.c | 2 +-
> arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
> arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
> arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
> arch/arm/mach-omap2/board-omap4panda.c | 2 +-
> arch/arm/mach-omap2/board-overo.c | 2 +-
> arch/arm/mach-omap2/board-zoom.c | 2 +-
> arch/arm/mach-omap2/usb-host.c | 29 ++-----------
> arch/arm/mach-omap2/usb.h | 20 +--------
> drivers/mfd/omap-usb-host.c | 63 +++++++++++----------------
> drivers/mfd/omap-usb-tll.c | 11 ++---
> drivers/usb/host/ehci-omap.c | 6 +-
> include/linux/platform_data/usb-omap.h | 23 ++--------
> 22 files changed, 61 insertions(+), 125 deletions(-)
>
<snip>
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index e9d9b09..b96a4bf 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -107,7 +107,7 @@ static int omap_ehci_init(struct usb_hcd *hcd)
> {
> struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> int rc;
> - struct ehci_hcd_omap_platform_data *pdata;
> + struct usbhs_omap_platform_data *pdata;
>
> pdata = hcd->self.controller->platform_data;
>
> @@ -151,7 +151,7 @@ static int omap_ehci_init(struct usb_hcd *hcd)
> }
>
> static void disable_put_regulator(
> - struct ehci_hcd_omap_platform_data *pdata)
> + struct usbhs_omap_platform_data *pdata)
> {
> int i;
>
> @@ -176,7 +176,7 @@ static void disable_put_regulator(
> static int ehci_hcd_omap_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> - struct ehci_hcd_omap_platform_data *pdata = dev->platform_data;
> + struct usbhs_omap_platform_data *pdata = dev->platform_data;
> struct resource *res;
> struct usb_hcd *hcd;
> void __iomem *regs;
> diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h
> index ef65b67..04c7537 100644
> --- a/include/linux/platform_data/usb-omap.h
> +++ b/include/linux/platform_data/usb-omap.h
> @@ -38,30 +38,15 @@ enum usbhs_omap_port_mode {
> OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM
> };
>
> -struct usbtll_omap_platform_data {
> - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> -};
> -
> -struct ehci_hcd_omap_platform_data {
> +struct usbhs_omap_platform_data {
> enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> int reset_gpio_port[OMAP3_HS_USB_PORTS];
> struct regulator *regulator[OMAP3_HS_USB_PORTS];
> - unsigned phy_reset:1;
> -};
> -
> -struct ohci_hcd_omap_platform_data {
> - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> - unsigned es2_compatibility:1;
> -};
> -
> -struct usbhs_omap_platform_data {
> - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> -
> - struct ehci_hcd_omap_platform_data *ehci_data;
> - struct ohci_hcd_omap_platform_data *ohci_data;
>
> /* OMAP3 <= ES2.1 have a single ulpi bypass control bit */
> - unsigned single_ulpi_bypass:1;
> + unsigned single_ulpi_bypass:1;
> + unsigned es2_compatibility:1;
> + unsigned phy_reset:1;
> };
>
> /*-------------------------------------------------------------------------*/
>
next prev parent reply other threads:[~2013-02-14 10:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 10:37 [PATCH v9 00/20] OMAP USB Host cleanup Roger Quadros
2013-01-23 10:37 ` [PATCH v9 01/20] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2013-01-23 10:37 ` [PATCH v9 02/20] mfd: omap-usb-host: Consolidate OMAP USB-HS platform data Roger Quadros
2013-02-14 10:18 ` Roger Quadros [this message]
2013-02-14 15:03 ` Greg KH
2013-01-23 10:37 ` [PATCH v9 03/20] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
2013-01-23 10:37 ` [PATCH v9 04/20] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2013-01-23 10:37 ` [PATCH v9 05/20] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2013-01-23 10:37 ` [PATCH v9 06/20] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2013-01-23 10:37 ` [PATCH v9 07/20] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2013-01-23 10:38 ` [PATCH v9 08/20] mfd: omap-usb-tll: Fix error message Roger Quadros
2013-01-23 10:38 ` [PATCH v9 09/20] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2013-01-23 10:38 ` [PATCH v9 10/20] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support Roger Quadros
2013-01-23 10:38 ` [PATCH v9 11/20] mfd: omap_usb_host: Avoid missing platform data checks in suspend/resume Roger Quadros
2013-01-23 10:38 ` [PATCH v9 12/20] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap() Roger Quadros
2013-01-23 10:38 ` [PATCH v9 13/20] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2013-01-23 10:38 ` [PATCH v9 14/20] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2013-01-23 10:38 ` [PATCH v9 15/20] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2013-01-23 10:38 ` [PATCH v9 16/20] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2013-01-23 10:38 ` [PATCH v9 17/20] mfd: omap-usb-host: Get rid of unnecessary spinlock Roger Quadros
2013-01-23 10:38 ` [PATCH v9 18/20] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2013-01-23 10:38 ` [PATCH v9 19/20] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2013-01-23 10:38 ` [PATCH v9 20/20] mdf: omap-usb-host: get rid of build warning Roger Quadros
2013-01-23 23:36 ` Mike Turquette
2013-01-24 9:00 ` Roger Quadros
2013-01-24 9:04 ` [PATCH v10 20/20] mfd: " Roger Quadros
2013-01-31 10:31 ` [PATCH v9 00/20] OMAP USB Host cleanup Roger Quadros
2013-02-03 17:01 ` Samuel Ortiz
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=511CB9E9.5050804@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=bjorn@mork.no \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@ti.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=sameo@linux.intel.com \
--cc=sshtylyov@mvista.com \
--cc=stern@rowland.harvard.edu \
--cc=tony@atomide.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