Now clock and reset drivers are available for respective SoC's so use clk and reset ops on musb driver.

Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- Changes for v3.1: - droped unused variables - add flags for checking reset require or not - handle clk and reset errors properly

drivers/usb/musb-new/sunxi.c | 89 ++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 30 deletions(-)

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 9f71b84fd1..e92ba97c0e 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -16,9 +16,11 @@ * This file is part of the Inventra Controller Driver for Linux. */ #include <common.h> +#include <clk.h> #include <dm.h> #include <generic-phy.h> #include <phy-sun4i-usb.h> +#include <reset.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> @@ -72,22 +74,25 @@ #define USBC_BP_ISCR_ID_CHANGE_DETECT_EN 1 #define USBC_BP_ISCR_DPDM_CHANGE_DETECT_EN 0

+/* flags */ +#define SUNXI_MUSB_FL_HAS_RESET 0 + /****************************************************************************** * From usbc/usbc.c ******************************************************************************/

struct sunxi_musb_config { struct musb_hdrc_config *config; - u8 rst_bit; - u8 clkgate_bit; };

struct sunxi_glue { struct musb_host_data mdata; - struct sunxi_ccm_reg *ccm; struct sunxi_musb_config *cfg; struct device dev; struct phy phy; + struct clk clk; + struct reset_ctl rst; + unsigned long flags; }; #define to_sunxi_glue(d) container_of(d, struct sunxi_glue, dev)

@@ -291,25 +296,28 @@ static int sunxi_musb_init(struct musb *musb)

pr_debug("%s():\n", __func__);

+ ret = clk_enable(&glue->clk); + if (ret) { + dev_err(dev, "failed to enable clock\n"); + return ret; + } + + if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) { + ret = reset_deassert(&glue->rst); + if (ret) { + dev_err(dev, "failed to deassert reset\n"); + goto err_clk; + } + } + ret = generic_phy_init(&glue->phy); if (ret) { pr_err("failed to init USB PHY\n"); - return ret; + goto err_rst; }

musb->isr = sunxi_musb_interrupt;

- setbits_le32(&glue->ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_USB0)); - if (glue->cfg->clkgate_bit) - setbits_le32(&glue->ccm->ahb_gate0, - BIT(glue->cfg->clkgate_bit)); -#ifdef CONFIG_SUNXI_GEN_SUN6I - setbits_le32(&glue->ccm->ahb_reset0_cfg, BIT(AHB_GATE_OFFSET_USB0)); - if (glue->cfg->rst_bit) - setbits_le32(&glue->ccm->ahb_reset0_cfg, - BIT(glue->cfg->rst_bit)); -#endif - USBC_ConfigFIFO_Base(); USBC_EnableDpDmPullUp(musb->mregs); USBC_EnableIdPullUp(musb->mregs); @@ -324,6 +332,13 @@ static int sunxi_musb_init(struct musb *musb) USBC_ForceVbusValidToHigh(musb->mregs);

return 0; + +err_rst: + if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) + reset_assert(&glue->rst); +err_clk: + clk_disable(&glue->clk); + return ret; }

static int sunxi_musb_exit(struct musb *musb) @@ -339,16 +354,19 @@ static int sunxi_musb_exit(struct musb *musb) } }

-#ifdef CONFIG_SUNXI_GEN_SUN6I - clrbits_le32(&glue->ccm->ahb_reset0_cfg, BIT(AHB_GATE_OFFSET_USB0)); - if (glue->cfg->rst_bit) - clrbits_le32(&glue->ccm->ahb_reset0_cfg, - BIT(glue->cfg->rst_bit)); -#endif - clrbits_le32(&glue->ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_USB0)); - if (glue->cfg->clkgate_bit) - clrbits_le32(&glue->ccm->ahb_gate0, - BIT(glue->cfg->clkgate_bit)); + if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) { + ret = reset_assert(&glue->rst); + if (ret) { + dev_err(dev, "failed to deassert reset\n"); + return ret; + } + } + + ret = clk_disable(&glue->clk); + if (ret) { + dev_err(dev, "failed to enable clock\n"); + return ret; + }

return 0; } @@ -442,9 +460,22 @@ static int musb_usb_probe(struct udevice *dev) if (!glue->cfg) return -EINVAL;

- glue->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; - if (IS_ERR(glue->ccm)) - return PTR_ERR(glue->ccm); + if (!(device_is_compatible(dev, "allwinner,sun4i-a10-musb"))) + test_and_set_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags); + + ret = clk_get_by_index(dev, 0, &glue->clk); + if (ret) { + dev_err(dev, "failed to get clock\n"); + return ret; + } + + if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) { + ret = reset_get_by_index(dev, 0, &glue->rst); + if (ret) { + dev_err(dev, "failed to get reset\n"); + return ret; + } + }

ret = generic_phy_get_by_name(dev, "usb", &glue->phy); if (ret) { @@ -499,8 +530,6 @@ static const struct sunxi_musb_config sun4i_a10_cfg = {

static const struct sunxi_musb_config sun8i_h3_cfg = { .config = &musb_config_h3, - .rst_bit = 23, - .clkgate_bit = 23, };

static const struct udevice_id sunxi_musb_ids[] = {