From: kishon@ti•com (Kishon Vijay Abraham I)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v5 6/9] usb: gadget: s3c-hsotg: get phy bus width from phy subsystem
Date: Fri, 13 Dec 2013 16:32:00 +0530 [thread overview]
Message-ID: <52AAE928.5040308@ti.com> (raw)
In-Reply-To: <1386854770-2173-7-git-send-email-mporter@linaro.org>
On Thursday 12 December 2013 06:56 PM, Matt Porter wrote:
> 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>
Acked-by: Kishon Vijay Abraham I <kishon@ti•com>
> ---
> 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)
>
next prev parent reply other threads:[~2013-12-13 11:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 13:26 [PATCH v5 0/9] USB Device Controller support for BCM281xx Matt Porter
2013-12-12 13:26 ` [PATCH v5 1/9] phy: add phy_get_bus_width()/phy_set_bus_width() calls Matt Porter
2013-12-12 18:18 ` Felipe Balbi
2013-12-13 9:55 ` Kishon Vijay Abraham I
2013-12-12 13:26 ` [PATCH v5 2/9] staging: dwc2: update DT binding to add generic clock/phy properties Matt Porter
2013-12-12 18:19 ` Felipe Balbi
2013-12-12 13:26 ` [PATCH v5 3/9] usb: gadget: s3c-hsotg: enable build for other platforms Matt Porter
2013-12-12 21:51 ` Dinh Nguyen
2013-12-12 22:07 ` Matt Porter
2013-12-13 0:05 ` Dinh Nguyen
2013-12-12 13:26 ` [PATCH v5 4/9] usb: gadget: s3c-hsotg: add snps, dwc2 compatible string Matt Porter
2013-12-12 13:26 ` [PATCH v5 5/9] usb: gadget: s3c-hsotg: use generic phy_init()/phy_exit() support Matt Porter
2013-12-13 11:00 ` Kishon Vijay Abraham I
2013-12-12 13:26 ` [PATCH v5 6/9] usb: gadget: s3c-hsotg: get phy bus width from phy subsystem Matt Porter
2013-12-13 11:02 ` Kishon Vijay Abraham I [this message]
2013-12-12 13:26 ` [PATCH v5 7/9] phy: add Broadcom Kona USB2 PHY DT binding Matt Porter
2013-12-12 13:26 ` [PATCH v5 8/9] phy: add Broadcom Kona USB2 PHY driver Matt Porter
2013-12-12 13:26 ` [PATCH v5 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=52AAE928.5040308@ti.com \
--to=kishon@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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