* [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups
@ 2015-08-05 21:03 Adrian Alonso
2015-08-05 21:03 ` [U-Boot] [PATCH 2/3][v2] imx: usb: ehci-mx6: document board specific functions Adrian Alonso
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Adrian Alonso @ 2015-08-05 21:03 UTC (permalink / raw)
To: u-boot
Cleanup read/write register access, use clr/set bits_le32
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
---
Changes for V2:
Split from patch imx: usb: ehci-mx6: add usb support for imx7d soc
drivers/usb/host/ehci-mx6.c | 51 ++++++++++++++++-----------------------------
1 file changed, 18 insertions(+), 33 deletions(-)
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 951dd3b..0f94c8b 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -67,7 +67,7 @@ static void usb_internal_phy_clock_gate(int index, int on)
phy_reg = (void __iomem *)phy_bases[index];
phy_reg += on ? USBPHY_CTRL_CLR : USBPHY_CTRL_SET;
- __raw_writel(USBPHY_CTRL_CLKGATE, phy_reg);
+ writel(USBPHY_CTRL_CLKGATE, phy_reg);
}
static void usb_power_config(int index)
@@ -100,14 +100,14 @@ static void usb_power_config(int index)
* is totally controlled by IC, so the Software only needs
* to enable them at initializtion.
*/
- __raw_writel(ANADIG_USB2_CHRG_DETECT_EN_B |
+ writel(ANADIG_USB2_CHRG_DETECT_EN_B |
ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B,
chrg_detect);
- __raw_writel(ANADIG_USB2_PLL_480_CTRL_BYPASS,
+ writel(ANADIG_USB2_PLL_480_CTRL_BYPASS,
pll_480_ctrl_clr);
- __raw_writel(ANADIG_USB2_PLL_480_CTRL_ENABLE |
+ writel(ANADIG_USB2_PLL_480_CTRL_ENABLE |
ANADIG_USB2_PLL_480_CTRL_POWER |
ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS,
pll_480_ctrl_set);
@@ -119,7 +119,6 @@ static int usb_phy_enable(int index, struct usb_ehci *ehci)
void __iomem *phy_reg;
void __iomem *phy_ctrl;
void __iomem *usb_cmd;
- u32 val;
if (index >= ARRAY_SIZE(phy_bases))
return 0;
@@ -129,36 +128,27 @@ static int usb_phy_enable(int index, struct usb_ehci *ehci)
usb_cmd = (void __iomem *)&ehci->usbcmd;
/* Stop then Reset */
- val = __raw_readl(usb_cmd);
- val &= ~UCMD_RUN_STOP;
- __raw_writel(val, usb_cmd);
- while (__raw_readl(usb_cmd) & UCMD_RUN_STOP)
+ clrbits_le32(usb_cmd, UCMD_RUN_STOP);
+ while (readl(usb_cmd) & UCMD_RUN_STOP)
;
- val = __raw_readl(usb_cmd);
- val |= UCMD_RESET;
- __raw_writel(val, usb_cmd);
- while (__raw_readl(usb_cmd) & UCMD_RESET)
+ setbits_le32(usb_cmd, UCMD_RESET);
+ while (readl(usb_cmd) & UCMD_RESET)
;
/* Reset USBPHY module */
- val = __raw_readl(phy_ctrl);
- val |= USBPHY_CTRL_SFTRST;
- __raw_writel(val, phy_ctrl);
+ setbits_le32(phy_ctrl, USBPHY_CTRL_SFTRST);
udelay(10);
/* Remove CLKGATE and SFTRST */
- val = __raw_readl(phy_ctrl);
- val &= ~(USBPHY_CTRL_CLKGATE | USBPHY_CTRL_SFTRST);
- __raw_writel(val, phy_ctrl);
+ clrbits_le32(phy_ctrl, USBPHY_CTRL_CLKGATE | USBPHY_CTRL_SFTRST);
udelay(10);
/* Power up the PHY */
- __raw_writel(0, phy_reg + USBPHY_PWD);
+ writel(0, phy_reg + USBPHY_PWD);
/* enable FS/LS device */
- val = __raw_readl(phy_ctrl);
- val |= (USBPHY_CTRL_ENUTMILEVEL2 | USBPHY_CTRL_ENUTMILEVEL3);
- __raw_writel(val, phy_ctrl);
+ setbits_le32(phy_ctrl, USBPHY_CTRL_ENUTMILEVEL2 |
+ USBPHY_CTRL_ENUTMILEVEL3);
return 0;
}
@@ -177,20 +167,15 @@ static void usb_oc_config(int index)
struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
USB_OTHERREGS_OFFSET);
void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
- u32 val;
- val = __raw_readl(ctrl);
#if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2
/* mx6qarm2 seems to required a different setting*/
- val &= ~UCTRL_OVER_CUR_POL;
+ clrbits_le32(ctrl, UCTRL_OVER_CUR_POL);
#else
- val |= UCTRL_OVER_CUR_POL;
+ setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
#endif
- __raw_writel(val, ctrl);
- val = __raw_readl(ctrl);
- val |= UCTRL_OVER_CUR_DIS;
- __raw_writel(val, ctrl);
+ setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
}
int usb_phy_mode(int port)
@@ -202,7 +187,7 @@ int usb_phy_mode(int port)
phy_reg = (void __iomem *)phy_bases[port];
phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
- val = __raw_readl(phy_ctrl);
+ val = readl(phy_ctrl);
if (val & USBPHY_CTRL_OTG_ID)
return USB_INIT_DEVICE;
@@ -257,7 +242,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
if (type == USB_INIT_DEVICE)
return 0;
setbits_le32(&ehci->usbmode, CM_HOST);
- __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+ writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
setbits_le32(&ehci->portsc, USB_EN);
mdelay(10);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/3][v2] imx: usb: ehci-mx6: document board specific functions
2015-08-05 21:03 [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups Adrian Alonso
@ 2015-08-05 21:03 ` Adrian Alonso
2015-08-05 21:31 ` Marek Vasut
2015-08-05 21:03 ` [U-Boot] [PATCH 3/3][v2] imx: usb: ehci-mx6: add usb support for imx7d soc Adrian Alonso
2015-08-05 21:30 ` [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups Marek Vasut
2 siblings, 1 reply; 6+ messages in thread
From: Adrian Alonso @ 2015-08-05 21:03 UTC (permalink / raw)
To: u-boot
Document target board specific functions
board_ehci_hcd_init - override usb phy mode
board_ehci_hcd_init - set usb vbus voltage
board_ehci_power - enables/disables usb vbus voltage
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
---
Changes for V2:
Split from patch imx: usb: ehci-mx6: add usb support for imx7d soc
drivers/usb/host/ehci-mx6.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 0f94c8b..afc248b 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -195,16 +195,47 @@ int usb_phy_mode(int port)
return USB_INIT_HOST;
}
+/*
+ * board_ehci_hcd_init - override usb phy mode
+ * @port: usb host/otg port
+ *
+ * Target board specific, override usb_phy_mode.
+ * When usb-otg is used as usb host port, iomux pad usb_otg_id can be
+ * left disconnected in this case usb_phy_mode will not be able to identify
+ * the phy mode that usb port is used.
+ * Machine file overrides board_usb_phy_mode.
+ *
+ * Return: USB_INIT_DEVICE or USB_INIT_HOST
+ */
int __weak board_usb_phy_mode(int port)
{
return usb_phy_mode(port);
}
+/*
+ * board_ehci_hcd_init - set usb vbus voltage
+ * @port: usb otg port
+ *
+ * Target board specific, setup iomux pad to setup supply vbus voltage
+ * for usb otg port. Machine board file overrides board_ehci_hcd_init
+ *
+ * Return: 0 Success
+ */
int __weak board_ehci_hcd_init(int port)
{
return 0;
}
+/*
+ * board_ehci_power - enables/disables usb vbus voltage
+ * @port: usb otg port
+ * @on: on/off vbus voltage
+ *
+ * Enables/disables supply vbus voltage for usb otg port.
+ * Machine board file overrides board_ehci_power
+ *
+ * Return: 0 Success
+ */
int __weak board_ehci_power(int port, int on)
{
return 0;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/3][v2] imx: usb: ehci-mx6: document board specific functions
2015-08-05 21:03 ` [U-Boot] [PATCH 2/3][v2] imx: usb: ehci-mx6: document board specific functions Adrian Alonso
@ 2015-08-05 21:31 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2015-08-05 21:31 UTC (permalink / raw)
To: u-boot
On Wednesday, August 05, 2015 at 11:03:35 PM, Adrian Alonso wrote:
> Document target board specific functions
>
> board_ehci_hcd_init - override usb phy mode
> board_ehci_hcd_init - set usb vbus voltage
> board_ehci_power - enables/disables usb vbus voltage
>
> Signed-off-by: Adrian Alonso <aalonso@freescale.com>
> ---
> Changes for V2:
> Split from patch imx: usb: ehci-mx6: add usb support for imx7d soc
>
> drivers/usb/host/ehci-mx6.c | 31 +++++++++++++++++++++++++++++++
> 1 file changed, 31 insertions(+)
>
> diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
> index 0f94c8b..afc248b 100644
> --- a/drivers/usb/host/ehci-mx6.c
> +++ b/drivers/usb/host/ehci-mx6.c
> @@ -195,16 +195,47 @@ int usb_phy_mode(int port)
> return USB_INIT_HOST;
> }
>
> +/*
The kerneldoc starts with /** , the tool to generate the documentation
actually depends on that. Can you please fix this one thing and slap my
Acked-by: Marek Vasut <marex@denx.de>
on this patch when re-posting ?
[...]
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 3/3][v2] imx: usb: ehci-mx6: add usb support for imx7d soc
2015-08-05 21:03 [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups Adrian Alonso
2015-08-05 21:03 ` [U-Boot] [PATCH 2/3][v2] imx: usb: ehci-mx6: document board specific functions Adrian Alonso
@ 2015-08-05 21:03 ` Adrian Alonso
2015-08-05 21:34 ` Marek Vasut
2015-08-05 21:30 ` [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups Marek Vasut
2 siblings, 1 reply; 6+ messages in thread
From: Adrian Alonso @ 2015-08-05 21:03 UTC (permalink / raw)
To: u-boot
Extend ehci-mx6 usb driver to support imx7d usb
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
---
Changes for V2:
Add usb_power_config and usb_phy_mode for usb otg id detection for imx7d
drivers/usb/host/Makefile | 1 +
drivers/usb/host/ehci-mx6.c | 99 ++++++++++++++++++++++++++++++++++++---------
2 files changed, 81 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 6cc3bbd..8537b6b 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
obj-$(CONFIG_USB_EHCI_MXS) += ehci-mxs.o
obj-$(CONFIG_USB_EHCI_MX5) += ehci-mx5.o
obj-$(CONFIG_USB_EHCI_MX6) += ehci-mx6.o
+obj-$(CONFIG_USB_EHCI_MX7) += ehci-mx6.o
obj-$(CONFIG_USB_EHCI_OMAP) += ehci-omap.o
obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index afc248b..b10541d 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -45,7 +45,10 @@
#define ANADIG_USB2_PLL_480_CTRL_POWER 0x00001000
#define ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS 0x00000040
-
+#define USBNC_OFFSET 0x200
+#define USBNC_PHYSTATUS_ID_DIG (1 << 4) /* otg_id status */
+#define USBNC_PHYCFG2_ACAENB (1 << 4) /* otg_id detection enable */
+#define UCTRL_PM (1 << 9) /* OTG Power Mask */
#define UCTRL_OVER_CUR_POL (1 << 8) /* OTG Polarity of Overcurrent */
#define UCTRL_OVER_CUR_DIS (1 << 7) /* Disable OTG Overcurrent Detection */
@@ -53,6 +56,7 @@
#define UCMD_RUN_STOP (1 << 0) /* controller run/stop */
#define UCMD_RESET (1 << 1) /* controller reset */
+#if defined(CONFIG_MX6)
static const unsigned phy_bases[] = {
USB_PHY0_BASE_ADDR,
USB_PHY1_BASE_ADDR,
@@ -153,6 +157,23 @@ static int usb_phy_enable(int index, struct usb_ehci *ehci)
return 0;
}
+int usb_phy_mode(int port)
+{
+ void __iomem *phy_reg;
+ void __iomem *phy_ctrl;
+ u32 val;
+
+ phy_reg = (void __iomem *)phy_bases[port];
+ phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
+
+ val = readl(phy_ctrl);
+
+ if (val & USBPHY_CTRL_OTG_ID)
+ return USB_INIT_DEVICE;
+ else
+ return USB_INIT_HOST;
+}
+
/* Base address for this IP block is 0x02184800 */
struct usbnc_regs {
u32 ctrl[4]; /* otg/host1-3 */
@@ -161,12 +182,56 @@ struct usbnc_regs {
u32 otg_phy_ctrl_0;
u32 uh1_phy_ctrl_0;
};
+#elif defined(CONFIG_MX7)
+struct usbnc_regs {
+ u32 ctrl1;
+ u32 ctrl2;
+ u32 reserve1[10];
+ u32 phy_cfg1;
+ u32 phy_cfg2;
+ u32 phy_status;
+ u32 reserve2[4];
+ u32 adp_cfg1;
+ u32 adp_cfg2;
+ u32 adp_status;
+};
+
+static void usb_power_config(int index)
+{
+ struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
+ (0x10000 * index) + USBNC_OFFSET);
+ void __iomem *phy_cfg2 = (void __iomem *)(&usbnc->phy_cfg2);
+
+ /* Enable usb_otg_id detection */
+ setbits_le32(phy_cfg2, USBNC_PHYCFG2_ACAENB);
+}
+
+int usb_phy_mode(int port){
+ struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
+ (0x10000 * port) + USBNC_OFFSET);
+ void __iomem *status = (void __iomem *)(&usbnc->phy_status);
+ u32 val;
+
+ val = readl(status);
+
+ if (val & USBNC_PHYSTATUS_ID_DIG)
+ return USB_INIT_DEVICE;
+ else
+ return USB_INIT_HOST;
+}
+#endif
static void usb_oc_config(int index)
{
+#if defined(CONFIG_MX6)
struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
USB_OTHERREGS_OFFSET);
void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
+#elif defined(CONFIG_MX7)
+ struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
+ (0x10000 * index) + USBNC_OFFSET);
+ void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl1);
+#endif
#if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2
/* mx6qarm2 seems to required a different setting*/
@@ -175,24 +240,11 @@ static void usb_oc_config(int index)
setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
#endif
+#if defined(CONFIG_MX6)
setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
-}
-
-int usb_phy_mode(int port)
-{
- void __iomem *phy_reg;
- void __iomem *phy_ctrl;
- u32 val;
-
- phy_reg = (void __iomem *)phy_bases[port];
- phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
-
- val = readl(phy_ctrl);
-
- if (val & USBPHY_CTRL_OTG_ID)
- return USB_INIT_DEVICE;
- else
- return USB_INIT_HOST;
+#elif defined(CONFIG_MX7)
+ setbits_le32(ctrl, UCTRL_OVER_CUR_DIS | UCTRL_PM);
+#endif
}
/*
@@ -245,8 +297,13 @@ int ehci_hcd_init(int index, enum usb_init_type init,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{
enum usb_init_type type;
+#if defined(CONFIG_MX6)
+ u32 controller_spacing = 0x200;
+#elif defined(CONFIG_MX7)
+ u32 controller_spacing = 0x10000;
+#endif
struct usb_ehci *ehci = (struct usb_ehci *)(USB_BASE_ADDR +
- (0x200 * index));
+ (controller_spacing * index));
if (index > 3)
return -EINVAL;
@@ -258,8 +315,11 @@ int ehci_hcd_init(int index, enum usb_init_type init,
usb_power_config(index);
usb_oc_config(index);
+
+#if defined(CONFIG_MX6)
usb_internal_phy_clock_gate(index, 1);
usb_phy_enable(index, ehci);
+#endif
type = board_usb_phy_mode(index);
*hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
@@ -272,6 +332,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
return -ENODEV;
if (type == USB_INIT_DEVICE)
return 0;
+
setbits_le32(&ehci->usbmode, CM_HOST);
writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
setbits_le32(&ehci->portsc, USB_EN);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 3/3][v2] imx: usb: ehci-mx6: add usb support for imx7d soc
2015-08-05 21:03 ` [U-Boot] [PATCH 3/3][v2] imx: usb: ehci-mx6: add usb support for imx7d soc Adrian Alonso
@ 2015-08-05 21:34 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2015-08-05 21:34 UTC (permalink / raw)
To: u-boot
On Wednesday, August 05, 2015 at 11:03:36 PM, Adrian Alonso wrote:
> Extend ehci-mx6 usb driver to support imx7d usb
>
> Signed-off-by: Adrian Alonso <aalonso@freescale.com>
> ---
> Changes for V2:
> Add usb_power_config and usb_phy_mode for usb otg id detection for imx7d
>
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/ehci-mx6.c | 99
> ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 81
> insertions(+), 19 deletions(-)
>
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index 6cc3bbd..8537b6b 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -36,6 +36,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
> obj-$(CONFIG_USB_EHCI_MXS) += ehci-mxs.o
> obj-$(CONFIG_USB_EHCI_MX5) += ehci-mx5.o
> obj-$(CONFIG_USB_EHCI_MX6) += ehci-mx6.o
> +obj-$(CONFIG_USB_EHCI_MX7) += ehci-mx6.o
> obj-$(CONFIG_USB_EHCI_OMAP) += ehci-omap.o
> obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
> obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
> diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
> index afc248b..b10541d 100644
> --- a/drivers/usb/host/ehci-mx6.c
> +++ b/drivers/usb/host/ehci-mx6.c
> @@ -45,7 +45,10 @@
> #define ANADIG_USB2_PLL_480_CTRL_POWER 0x00001000
> #define ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS 0x00000040
>
> -
> +#define USBNC_OFFSET 0x200
> +#define USBNC_PHYSTATUS_ID_DIG (1 << 4) /* otg_id status */
> +#define USBNC_PHYCFG2_ACAENB (1 << 4) /* otg_id detection enable */
> +#define UCTRL_PM (1 << 9) /* OTG Power Mask */
> #define UCTRL_OVER_CUR_POL (1 << 8) /* OTG Polarity of Overcurrent */
> #define UCTRL_OVER_CUR_DIS (1 << 7) /* Disable OTG Overcurrent Detection
> */
>
> @@ -53,6 +56,7 @@
> #define UCMD_RUN_STOP (1 << 0) /* controller run/stop */
> #define UCMD_RESET (1 << 1) /* controller reset */
>
> +#if defined(CONFIG_MX6)
> static const unsigned phy_bases[] = {
> USB_PHY0_BASE_ADDR,
> USB_PHY1_BASE_ADDR,
> @@ -153,6 +157,23 @@ static int usb_phy_enable(int index, struct usb_ehci
> *ehci) return 0;
> }
>
> +int usb_phy_mode(int port)
> +{
> + void __iomem *phy_reg;
> + void __iomem *phy_ctrl;
> + u32 val;
> +
> + phy_reg = (void __iomem *)phy_bases[port];
> + phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
> +
> + val = readl(phy_ctrl);
> +
> + if (val & USBPHY_CTRL_OTG_ID)
> + return USB_INIT_DEVICE;
> + else
> + return USB_INIT_HOST;
> +}
> +
> /* Base address for this IP block is 0x02184800 */
> struct usbnc_regs {
> u32 ctrl[4]; /* otg/host1-3 */
> @@ -161,12 +182,56 @@ struct usbnc_regs {
> u32 otg_phy_ctrl_0;
> u32 uh1_phy_ctrl_0;
> };
> +#elif defined(CONFIG_MX7)
> +struct usbnc_regs {
> + u32 ctrl1;
> + u32 ctrl2;
> + u32 reserve1[10];
> + u32 phy_cfg1;
> + u32 phy_cfg2;
> + u32 phy_status;
> + u32 reserve2[4];
> + u32 adp_cfg1;
> + u32 adp_cfg2;
> + u32 adp_status;
> +};
This structure has some indentation problems. Did you run checkpatch on
this patch ? Otherwise, the series looks good. Please fix minor things
and I'll pick it. Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups
2015-08-05 21:03 [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups Adrian Alonso
2015-08-05 21:03 ` [U-Boot] [PATCH 2/3][v2] imx: usb: ehci-mx6: document board specific functions Adrian Alonso
2015-08-05 21:03 ` [U-Boot] [PATCH 3/3][v2] imx: usb: ehci-mx6: add usb support for imx7d soc Adrian Alonso
@ 2015-08-05 21:30 ` Marek Vasut
2 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2015-08-05 21:30 UTC (permalink / raw)
To: u-boot
On Wednesday, August 05, 2015 at 11:03:34 PM, Adrian Alonso wrote:
> Cleanup read/write register access, use clr/set bits_le32
>
> Signed-off-by: Adrian Alonso <aalonso@freescale.com>
> ---
> Changes for V2:
> Split from patch imx: usb: ehci-mx6: add usb support for imx7d soc
Acked-by: Marek Vasut <marex@denx.de>
btw ...
> drivers/usb/host/ehci-mx6.c | 51
> ++++++++++++++++----------------------------- 1 file changed, 18
> insertions(+), 33 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
> index 951dd3b..0f94c8b 100644
> --- a/drivers/usb/host/ehci-mx6.c
> +++ b/drivers/usb/host/ehci-mx6.c
> @@ -67,7 +67,7 @@ static void usb_internal_phy_clock_gate(int index, int
> on)
>
> phy_reg = (void __iomem *)phy_bases[index];
> phy_reg += on ? USBPHY_CTRL_CLR : USBPHY_CTRL_SET;
> - __raw_writel(USBPHY_CTRL_CLKGATE, phy_reg);
> + writel(USBPHY_CTRL_CLKGATE, phy_reg);
> }
>
> static void usb_power_config(int index)
> @@ -100,14 +100,14 @@ static void usb_power_config(int index)
> * is totally controlled by IC, so the Software only needs
> * to enable them at initializtion.
> */
> - __raw_writel(ANADIG_USB2_CHRG_DETECT_EN_B |
> + writel(ANADIG_USB2_CHRG_DETECT_EN_B |
> ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B,
> chrg_detect);
>
> - __raw_writel(ANADIG_USB2_PLL_480_CTRL_BYPASS,
> + writel(ANADIG_USB2_PLL_480_CTRL_BYPASS,
> pll_480_ctrl_clr);
>
> - __raw_writel(ANADIG_USB2_PLL_480_CTRL_ENABLE |
> + writel(ANADIG_USB2_PLL_480_CTRL_ENABLE |
> ANADIG_USB2_PLL_480_CTRL_POWER |
> ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS,
> pll_480_ctrl_set);
> @@ -119,7 +119,6 @@ static int usb_phy_enable(int index, struct usb_ehci
> *ehci) void __iomem *phy_reg;
> void __iomem *phy_ctrl;
> void __iomem *usb_cmd;
> - u32 val;
>
> if (index >= ARRAY_SIZE(phy_bases))
> return 0;
> @@ -129,36 +128,27 @@ static int usb_phy_enable(int index, struct usb_ehci
> *ehci) usb_cmd = (void __iomem *)&ehci->usbcmd;
>
> /* Stop then Reset */
> - val = __raw_readl(usb_cmd);
> - val &= ~UCMD_RUN_STOP;
> - __raw_writel(val, usb_cmd);
> - while (__raw_readl(usb_cmd) & UCMD_RUN_STOP)
> + clrbits_le32(usb_cmd, UCMD_RUN_STOP);
> + while (readl(usb_cmd) & UCMD_RUN_STOP)
> ;
While you're at this, can you please zap these unbounded loops and replace
them with something like wait_for_bit():
+static int wait_for_bit(u32 *reg, const u32 mask, bool set,
+ const unsigned int timeout)
+{
+ u32 val;
+ unsigned long start = get_timer(0);
+
+ while (1) {
+ val = readl(reg);
+ if (!set)
+ val = ~val;
+
+ if ((val & mask) == mask)
+ return 0;
+
+ if (get_timer(start) > timeout)
+ break;
+
+ udelay(1);
+ }
+
+ debug("%s: Timeout (reg=%p mask=%08x wait_set=%i)\n",
+ __func__, reg, mask, set);
+
+ return -ETIMEDOUT;
+}
[...]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-08-05 21:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-05 21:03 [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups Adrian Alonso
2015-08-05 21:03 ` [U-Boot] [PATCH 2/3][v2] imx: usb: ehci-mx6: document board specific functions Adrian Alonso
2015-08-05 21:31 ` Marek Vasut
2015-08-05 21:03 ` [U-Boot] [PATCH 3/3][v2] imx: usb: ehci-mx6: add usb support for imx7d soc Adrian Alonso
2015-08-05 21:34 ` Marek Vasut
2015-08-05 21:30 ` [U-Boot] [PATCH 1/3][v2] imx: usb: ehci-mx6: reg accessor cleanups Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox