From: Matt Porter <mporter@linaro.org>
To: Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kishon Vijay Abraham I <kishon@ti.com>,
Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Kumar Gala <galak@codeaurora.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Christian Daudt <bcm@fixthebug.org>,
Paul Zimmerman <paulz@synopsys.com>
Cc: Tomasz Figa <t.figa@samsung.com>,
Kamil Debski <k.debski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Linux USB List <linux-usb@vger.kernel.org>,
Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Devicetree List <devicetree@vger.kernel.org>,
Linaro Patches <patches@linaro.org>
Subject: [PATCH v4 6/9] usb: gadget: s3c-hsotg: get phy bus width from phy subsystem
Date: Thu, 12 Dec 2013 06:18:34 -0500 [thread overview]
Message-ID: <1386847117-21240-7-git-send-email-mporter@linaro.org> (raw)
In-Reply-To: <1386847117-21240-1-git-send-email-mporter@linaro.org>
Adds support for querying the phy bus width from the generic phy
subsystem. Configure UTMI bus width in GUSBCFG based on this value.
Signed-off-by: Matt Porter <mporter@linaro.org>
---
drivers/usb/gadget/s3c-hsotg.c | 14 +++++++++++++-
drivers/usb/gadget/s3c-hsotg.h | 1 +
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index e9683c2..168aaa9 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -144,6 +144,7 @@ struct s3c_hsotg_ep {
* @regs: The memory area mapped for accessing registers.
* @irq: The IRQ number we are using
* @supplies: Definition of USB power supplies
+ * @phyif: PHY interface width
* @dedicated_fifos: Set if the hardware has dedicated IN-EP fifos.
* @num_of_eps: Number of available EPs (excluding EP0)
* @debug_root: root directrory for debugfs.
@@ -171,6 +172,7 @@ struct s3c_hsotg {
struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsotg_supply_names)];
+ u32 phyif;
unsigned int dedicated_fifos:1;
unsigned char num_of_eps;
@@ -2276,7 +2278,7 @@ static void s3c_hsotg_core_init(struct s3c_hsotg *hsotg)
*/
/* set the PLL on, remove the HNP/SRP and set the PHY */
- writel(GUSBCFG_PHYIf16 | GUSBCFG_TOutCal(7) |
+ writel(hsotg->phyif | GUSBCFG_TOutCal(7) |
(0x5 << 10), hsotg->regs + GUSBCFG);
s3c_hsotg_init_fifo(hsotg);
@@ -3621,6 +3623,16 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
goto err_supplies;
}
+ /* Set default UTMI width */
+ hsotg->phyif = GUSBCFG_PHYIf16;
+
+ /*
+ * If using the generic PHY framework, check if the PHY bus
+ * width is 8-bit and set the phyif appropriately.
+ */
+ if (hsotg->phy && (phy_get_bus_width(phy) == 8))
+ hsotg->phyif = GUSBCFG_PHYIf8;
+
if (hsotg->phy)
phy_init(hsotg->phy);
diff --git a/drivers/usb/gadget/s3c-hsotg.h b/drivers/usb/gadget/s3c-hsotg.h
index d650b12..85f549f 100644
--- a/drivers/usb/gadget/s3c-hsotg.h
+++ b/drivers/usb/gadget/s3c-hsotg.h
@@ -55,6 +55,7 @@
#define GUSBCFG_HNPCap (1 << 9)
#define GUSBCFG_SRPCap (1 << 8)
#define GUSBCFG_PHYIf16 (1 << 3)
+#define GUSBCFG_PHYIf8 (0 << 3)
#define GUSBCFG_TOutCal_MASK (0x7 << 0)
#define GUSBCFG_TOutCal_SHIFT (0)
#define GUSBCFG_TOutCal_LIMIT (0x7)
--
1.8.4
next prev parent reply other threads:[~2013-12-12 11:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 11:18 [PATCH v4 0/9] USB Device Controller support for BCM281xx Matt Porter
2013-12-12 11:18 ` [PATCH v4 1/9] phy: add phy_get_bus_width()/phy_set_bus_width() calls Matt Porter
[not found] ` <1386847117-21240-2-git-send-email-mporter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2013-12-12 11:27 ` Russell King - ARM Linux
[not found] ` <20131212112715.GK4360-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2013-12-12 11:50 ` Matt Porter
2013-12-12 11:18 ` [PATCH v4 2/9] staging: dwc2: update DT binding to add generic clock/phy properties Matt Porter
2013-12-12 11:18 ` [PATCH v4 4/9] usb: gadget: s3c-hsotg: add snps,dwc2 compatible string Matt Porter
[not found] ` <1386847117-21240-1-git-send-email-mporter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2013-12-12 11:18 ` [PATCH v4 3/9] usb: gadget: s3c-hsotg: enable build for other platforms Matt Porter
2013-12-12 11:18 ` [PATCH v4 5/9] usb: gadget: s3c-hsotg: use generic phy_init()/phy_exit() support Matt Porter
2013-12-12 11:18 ` Matt Porter [this message]
2013-12-12 11:18 ` [PATCH v4 7/9] phy: add Broadcom Kona USB2 PHY DT binding Matt Porter
2013-12-12 11:18 ` [PATCH v4 8/9] phy: add Broadcom Kona USB2 PHY driver Matt Porter
2013-12-12 11:18 ` [PATCH v4 9/9] ARM: dts: add usb udc support to bcm281xx Matt Porter
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=1386847117-21240-7-git-send-email-mporter@linaro.org \
--to=mporter@linaro.org \
--cc=balbi@ti.com \
--cc=bcm@fixthebug.org \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=k.debski@samsung.com \
--cc=kishon@ti.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=patches@linaro.org \
--cc=paulz@synopsys.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=t.figa@samsung.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;
as well as URLs for NNTP newsgroup(s).