* [10/14] USB: gadget: mv-udc: use phy-pxa-usb
@ 2018-08-22 20:43 Lubomir Rintel
0 siblings, 0 replies; 2+ messages in thread
From: Lubomir Rintel @ 2018-08-22 20:43 UTC (permalink / raw)
To: linux-kernel
Cc: linux-usb, linux-arm-kernel, Rob Herring, Mark Rutland,
Greg Kroah-Hartman, Eric Miao, Haojian Zhuang,
Kishon Vijay Abraham I, Alan Stern, Lubomir Rintel
Use a proper PHY driver, instead of hooks to a board support package.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/mach-mmp/devices.c | 11 +-------
drivers/usb/gadget/udc/mv_udc.h | 7 ++++-
drivers/usb/gadget/udc/mv_udc_core.c | 38 ++++++++--------------------
3 files changed, 17 insertions(+), 39 deletions(-)
diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c
index eb9b3c34e90a..d925be9f14a9 100644
--- a/arch/arm/mach-mmp/devices.c
+++ b/arch/arm/mach-mmp/devices.c
@@ -263,21 +263,12 @@ struct platform_device pxa168_device_usb_phy = {
#if IS_ENABLED(CONFIG_USB_MV_UDC)
struct resource pxa168_u2o_resources[] = {
- /* regbase */
[0] = {
- .start = PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,
+ .start = PXA168_U2O_REGBASE,
.end = PXA168_U2O_REGBASE + USB_REG_RANGE,
.flags = IORESOURCE_MEM,
- .name = "capregs",
},
- /* phybase */
[1] = {
- .start = PXA168_U2O_PHYBASE,
- .end = PXA168_U2O_PHYBASE + USB_PHY_RANGE,
- .flags = IORESOURCE_MEM,
- .name = "phyregs",
- },
- [2] = {
.start = IRQ_PXA168_USB1,
.end = IRQ_PXA168_USB1,
.flags = IORESOURCE_IRQ,
diff --git a/drivers/usb/gadget/udc/mv_udc.h b/drivers/usb/gadget/udc/mv_udc.h
index b3f759c0962c..6f04f432964d 100644
--- a/drivers/usb/gadget/udc/mv_udc.h
+++ b/drivers/usb/gadget/udc/mv_udc.h
@@ -6,6 +6,9 @@
#ifndef __MV_UDC_H
#define __MV_UDC_H
+/* registers */
+#define U2x_CAPREGS_OFFSET 0x100
+
#define VUSBHS_MAX_PORTS 8
#define DQH_ALIGNMENT 2048
@@ -174,9 +177,9 @@ struct mv_udc {
struct platform_device *dev;
int irq;
+ void __iomem *base;
struct mv_cap_regs __iomem *cap_regs;
struct mv_op_regs __iomem *op_regs;
- void __iomem *phy_regs;
unsigned int max_eps;
struct mv_dqh *ep_dqh;
size_t ep_dqh_size;
@@ -219,6 +222,8 @@ struct mv_udc {
/* some SOC has mutiple clock sources for USB*/
struct clk *clk;
+
+ struct phy *phy;
};
/* endpoint data structure */
diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index 95f52232493b..c701c83d3af5 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -1069,14 +1069,11 @@ static int mv_udc_enable_internal(struct mv_udc *udc)
if (retval)
return retval;
- if (udc->pdata->phy_init) {
- retval = udc->pdata->phy_init(udc->phy_regs);
- if (retval) {
- dev_err(&udc->dev->dev,
- "init phy error %d\n", retval);
- udc_clock_disable(udc);
- return retval;
- }
+ retval = phy_init(udc->phy);
+ if (retval) {
+ dev_err(&udc->dev->dev, "init phy error %d\n", retval);
+ udc_clock_disable(udc);
+ return retval;
}
udc->active = 1;
@@ -1095,8 +1092,7 @@ static void mv_udc_disable_internal(struct mv_udc *udc)
{
if (udc->active) {
dev_dbg(&udc->dev->dev, "disable udc\n");
- if (udc->pdata->phy_deinit)
- udc->pdata->phy_deinit(udc->phy_regs);
+ phy_exit(udc->phy);
udc_clock_disable(udc);
udc->active = 0;
}
@@ -2147,30 +2143,16 @@ static int mv_udc_probe(struct platform_device *pdev)
if (IS_ERR(udc->clk))
return PTR_ERR(udc->clk);
- r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs");
+ r = platform_get_resource(udc->dev, IORESOURCE_MEM, 0);
if (r == NULL) {
dev_err(&pdev->dev, "no I/O memory resource defined\n");
return -ENODEV;
}
- udc->cap_regs = (struct mv_cap_regs __iomem *)
- devm_ioremap(&pdev->dev, r->start, resource_size(r));
- if (udc->cap_regs == NULL) {
- dev_err(&pdev->dev, "failed to map I/O memory\n");
- return -EBUSY;
- }
-
- r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "phyregs");
- if (r == NULL) {
- dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
- return -ENODEV;
- }
+ udc->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
- udc->phy_regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
- if (udc->phy_regs == NULL) {
- dev_err(&pdev->dev, "failed to map phy I/O memory\n");
- return -EBUSY;
- }
+ udc->cap_regs =
+ (void __iomem *) ((unsigned long)udc->base + U2x_CAPREGS_OFFSET);
/* we will acces controller register, so enable the clk */
retval = mv_udc_enable_internal(udc);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [10/14] USB: gadget: mv-udc: use phy-pxa-usb
@ 2018-11-05 9:20 Pavel Machek
0 siblings, 0 replies; 2+ messages in thread
From: Pavel Machek @ 2018-11-05 9:20 UTC (permalink / raw)
To: Lubomir Rintel
Cc: linux-kernel, linux-usb, linux-arm-kernel, Rob Herring,
Mark Rutland, Greg Kroah-Hartman, Eric Miao, Haojian Zhuang,
Kishon Vijay Abraham I, Alan Stern
On Wed 2018-08-22 22:43:03, Lubomir Rintel wrote:
> Use a proper PHY driver, instead of hooks to a board support package.
>
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Pavel Machek <pavel@ucw.cz>
> ---
> arch/arm/mach-mmp/devices.c | 11 +-------
> drivers/usb/gadget/udc/mv_udc.h | 7 ++++-
> drivers/usb/gadget/udc/mv_udc_core.c | 38 ++++++++--------------------
> 3 files changed, 17 insertions(+), 39 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c
> index eb9b3c34e90a..d925be9f14a9 100644
> --- a/arch/arm/mach-mmp/devices.c
> +++ b/arch/arm/mach-mmp/devices.c
> @@ -263,21 +263,12 @@ struct platform_device pxa168_device_usb_phy = {
>
> #if IS_ENABLED(CONFIG_USB_MV_UDC)
> struct resource pxa168_u2o_resources[] = {
> - /* regbase */
> [0] = {
> - .start = PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,
> + .start = PXA168_U2O_REGBASE,
> .end = PXA168_U2O_REGBASE + USB_REG_RANGE,
> .flags = IORESOURCE_MEM,
> - .name = "capregs",
> },
> - /* phybase */
> [1] = {
> - .start = PXA168_U2O_PHYBASE,
> - .end = PXA168_U2O_PHYBASE + USB_PHY_RANGE,
> - .flags = IORESOURCE_MEM,
> - .name = "phyregs",
> - },
> - [2] = {
> .start = IRQ_PXA168_USB1,
> .end = IRQ_PXA168_USB1,
> .flags = IORESOURCE_IRQ,
> diff --git a/drivers/usb/gadget/udc/mv_udc.h b/drivers/usb/gadget/udc/mv_udc.h
> index b3f759c0962c..6f04f432964d 100644
> --- a/drivers/usb/gadget/udc/mv_udc.h
> +++ b/drivers/usb/gadget/udc/mv_udc.h
> @@ -6,6 +6,9 @@
> #ifndef __MV_UDC_H
> #define __MV_UDC_H
>
> +/* registers */
> +#define U2x_CAPREGS_OFFSET 0x100
> +
> #define VUSBHS_MAX_PORTS 8
>
> #define DQH_ALIGNMENT 2048
> @@ -174,9 +177,9 @@ struct mv_udc {
> struct platform_device *dev;
> int irq;
>
> + void __iomem *base;
> struct mv_cap_regs __iomem *cap_regs;
> struct mv_op_regs __iomem *op_regs;
> - void __iomem *phy_regs;
> unsigned int max_eps;
> struct mv_dqh *ep_dqh;
> size_t ep_dqh_size;
> @@ -219,6 +222,8 @@ struct mv_udc {
>
> /* some SOC has mutiple clock sources for USB*/
> struct clk *clk;
> +
> + struct phy *phy;
> };
>
> /* endpoint data structure */
> diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
> index 95f52232493b..c701c83d3af5 100644
> --- a/drivers/usb/gadget/udc/mv_udc_core.c
> +++ b/drivers/usb/gadget/udc/mv_udc_core.c
> @@ -1069,14 +1069,11 @@ static int mv_udc_enable_internal(struct mv_udc *udc)
> if (retval)
> return retval;
>
> - if (udc->pdata->phy_init) {
> - retval = udc->pdata->phy_init(udc->phy_regs);
> - if (retval) {
> - dev_err(&udc->dev->dev,
> - "init phy error %d\n", retval);
> - udc_clock_disable(udc);
> - return retval;
> - }
> + retval = phy_init(udc->phy);
> + if (retval) {
> + dev_err(&udc->dev->dev, "init phy error %d\n", retval);
> + udc_clock_disable(udc);
> + return retval;
> }
> udc->active = 1;
>
> @@ -1095,8 +1092,7 @@ static void mv_udc_disable_internal(struct mv_udc *udc)
> {
> if (udc->active) {
> dev_dbg(&udc->dev->dev, "disable udc\n");
> - if (udc->pdata->phy_deinit)
> - udc->pdata->phy_deinit(udc->phy_regs);
> + phy_exit(udc->phy);
> udc_clock_disable(udc);
> udc->active = 0;
> }
> @@ -2147,30 +2143,16 @@ static int mv_udc_probe(struct platform_device *pdev)
> if (IS_ERR(udc->clk))
> return PTR_ERR(udc->clk);
>
> - r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs");
> + r = platform_get_resource(udc->dev, IORESOURCE_MEM, 0);
> if (r == NULL) {
> dev_err(&pdev->dev, "no I/O memory resource defined\n");
> return -ENODEV;
> }
>
> - udc->cap_regs = (struct mv_cap_regs __iomem *)
> - devm_ioremap(&pdev->dev, r->start, resource_size(r));
> - if (udc->cap_regs == NULL) {
> - dev_err(&pdev->dev, "failed to map I/O memory\n");
> - return -EBUSY;
> - }
> -
> - r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "phyregs");
> - if (r == NULL) {
> - dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
> - return -ENODEV;
> - }
> + udc->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
>
> - udc->phy_regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
> - if (udc->phy_regs == NULL) {
> - dev_err(&pdev->dev, "failed to map phy I/O memory\n");
> - return -EBUSY;
> - }
> + udc->cap_regs =
> + (void __iomem *) ((unsigned long)udc->base + U2x_CAPREGS_OFFSET);
>
> /* we will acces controller register, so enable the clk */
> retval = mv_udc_enable_internal(udc);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-05 9:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-05 9:20 [10/14] USB: gadget: mv-udc: use phy-pxa-usb Pavel Machek
-- strict thread matches above, loose matches on Subject: below --
2018-08-22 20:43 Lubomir Rintel
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).