From: Roger Quadros <rogerq@ti.com> To: <sameo@linux.intel.com> Cc: <balbi@ti.com>, <tony@atomide.com>, <kishon@ti.com>, <sshtylyov@mvista.com>, <bjorn@mork.no>, <linux@arm.linux.org.uk>, <gregkh@linuxfoundation.org>, <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <rogerq@ti.com> Subject: [PATCH v9 13/20] mfd: omap-usb-host: know about number of ports from revision register Date: Wed, 23 Jan 2013 12:38:05 +0200 [thread overview] Message-ID: <1358937492-8129-14-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1358937492-8129-1-git-send-email-rogerq@ti.com> The revision register should tell us how many ports are present. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> --- drivers/mfd/omap-usb-host.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 310aaa9..26319ca 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -91,6 +91,8 @@ struct usbhs_hcd_omap { + int nports; + struct clk *xclk60mhsp1_ck; struct clk *xclk60mhsp2_ck; struct clk *utmi_p1_fck; @@ -347,8 +349,6 @@ static void omap_usbhs_init(struct device *dev) pm_runtime_get_sync(dev); spin_lock_irqsave(&omap->lock, flags); - omap->usbhs_rev = usbhs_read(omap->uhh_base, OMAP_UHH_REVISION); - dev_dbg(dev, "OMAP UHH_REVISION 0x%x\n", omap->usbhs_rev); reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG); /* setup ULPI bypass and burst configurations */ @@ -483,7 +483,32 @@ static int usbhs_omap_probe(struct platform_device *pdev) pm_runtime_enable(dev); - for (i = 0; i < OMAP3_HS_USB_PORTS; i++) + platform_set_drvdata(pdev, omap); + pm_runtime_get_sync(dev); + + omap->usbhs_rev = usbhs_read(omap->uhh_base, OMAP_UHH_REVISION); + + /* we need to call runtime suspend before we update omap->nports + * to prevent unbalanced clk_disable() + */ + pm_runtime_put_sync(dev); + + switch (omap->usbhs_rev) { + case OMAP_USBHS_REV1: + omap->nports = 3; + break; + case OMAP_USBHS_REV2: + omap->nports = 2; + break; + default: + omap->nports = OMAP3_HS_USB_PORTS; + dev_dbg(dev, + "USB HOST Rev : 0x%d not recognized, assuming %d ports\n", + omap->usbhs_rev, omap->nports); + break; + } + + for (i = 0; i < omap->nports; i++) if (is_ehci_phy_mode(i) || is_ehci_tll_mode(i) || is_ehci_hsic_mode(i)) { omap->ehci_logic_fck = clk_get(dev, "ehci_logic_fck"); @@ -573,8 +598,6 @@ static int usbhs_omap_probe(struct platform_device *pdev) "failed error:%d\n", ret); } - platform_set_drvdata(pdev, omap); - omap_usbhs_init(dev); ret = omap_usbhs_alloc_children(pdev); if (ret) { -- 1.7.4.1
WARNING: multiple messages have this Message-ID (diff)
From: rogerq@ti.com (Roger Quadros) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 13/20] mfd: omap-usb-host: know about number of ports from revision register Date: Wed, 23 Jan 2013 12:38:05 +0200 [thread overview] Message-ID: <1358937492-8129-14-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1358937492-8129-1-git-send-email-rogerq@ti.com> The revision register should tell us how many ports are present. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> --- drivers/mfd/omap-usb-host.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 310aaa9..26319ca 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -91,6 +91,8 @@ struct usbhs_hcd_omap { + int nports; + struct clk *xclk60mhsp1_ck; struct clk *xclk60mhsp2_ck; struct clk *utmi_p1_fck; @@ -347,8 +349,6 @@ static void omap_usbhs_init(struct device *dev) pm_runtime_get_sync(dev); spin_lock_irqsave(&omap->lock, flags); - omap->usbhs_rev = usbhs_read(omap->uhh_base, OMAP_UHH_REVISION); - dev_dbg(dev, "OMAP UHH_REVISION 0x%x\n", omap->usbhs_rev); reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG); /* setup ULPI bypass and burst configurations */ @@ -483,7 +483,32 @@ static int usbhs_omap_probe(struct platform_device *pdev) pm_runtime_enable(dev); - for (i = 0; i < OMAP3_HS_USB_PORTS; i++) + platform_set_drvdata(pdev, omap); + pm_runtime_get_sync(dev); + + omap->usbhs_rev = usbhs_read(omap->uhh_base, OMAP_UHH_REVISION); + + /* we need to call runtime suspend before we update omap->nports + * to prevent unbalanced clk_disable() + */ + pm_runtime_put_sync(dev); + + switch (omap->usbhs_rev) { + case OMAP_USBHS_REV1: + omap->nports = 3; + break; + case OMAP_USBHS_REV2: + omap->nports = 2; + break; + default: + omap->nports = OMAP3_HS_USB_PORTS; + dev_dbg(dev, + "USB HOST Rev : 0x%d not recognized, assuming %d ports\n", + omap->usbhs_rev, omap->nports); + break; + } + + for (i = 0; i < omap->nports; i++) if (is_ehci_phy_mode(i) || is_ehci_tll_mode(i) || is_ehci_hsic_mode(i)) { omap->ehci_logic_fck = clk_get(dev, "ehci_logic_fck"); @@ -573,8 +598,6 @@ static int usbhs_omap_probe(struct platform_device *pdev) "failed error:%d\n", ret); } - platform_set_drvdata(pdev, omap); - omap_usbhs_init(dev); ret = omap_usbhs_alloc_children(pdev); if (ret) { -- 1.7.4.1
next prev parent reply other threads:[~2013-01-23 10:41 UTC|newest] Thread overview: 56+ 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 ` 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 ` Roger Quadros 2013-01-23 10:37 ` [PATCH v9 02/20] mfd: omap-usb-host: Consolidate OMAP USB-HS platform data Roger Quadros 2013-01-23 10:37 ` Roger Quadros 2013-02-14 10:18 ` Roger Quadros 2013-02-14 10:18 ` Roger Quadros 2013-02-14 15:03 ` Greg KH 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 ` 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 ` 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 ` 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 ` 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:37 ` 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 ` 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 ` 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 ` 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 ` 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 ` Roger Quadros 2013-01-23 10:38 ` Roger Quadros [this message] 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 10:38 ` Roger Quadros 2013-01-23 23:36 ` Mike Turquette 2013-01-23 23:36 ` Mike Turquette 2013-01-24 9:00 ` Roger Quadros 2013-01-24 9:00 ` Roger Quadros 2013-01-24 9:04 ` [PATCH v10 20/20] mfd: " Roger Quadros 2013-01-24 9:04 ` Roger Quadros 2013-01-31 10:31 ` [PATCH v9 00/20] OMAP USB Host cleanup Roger Quadros 2013-01-31 10:31 ` Roger Quadros 2013-02-03 17:01 ` Samuel Ortiz 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=1358937492-8129-14-git-send-email-rogerq@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=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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.