Commit 7ab0305d authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Kishon Vijay Abraham I
Browse files

phy: renesas: rcar-gen3-usb2: unify OBINTEN handling 



This patch unifies the OBINTEN handling to clean-up the code.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 8dde0008

drivers/phy/renesas/phy-rcar-gen3-usb2.c

+15 −8
Original line number Original line Diff line number Diff line
@@ -142,6 +142,18 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus) 
	writel(val, usb2_base + USB2_ADPCTRL);

	writel(val, usb2_base + USB2_ADPCTRL);

}

}





static void rcar_gen3_control_otg_irq(struct rcar_gen3_chan *ch, int enable)

{

	void __iomem *usb2_base = ch->base;

	u32 val = readl(usb2_base + USB2_OBINTEN);



	if (enable)

		val |= USB2_OBINT_BITS;

	else

		val &= ~USB2_OBINT_BITS;

	writel(val, usb2_base + USB2_OBINTEN);

}



static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch)

static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch)

{

{

	rcar_gen3_set_linectrl(ch, 1, 1);

	rcar_gen3_set_linectrl(ch, 1, 1);
@@ -187,16 +199,12 @@ static void rcar_gen3_init_for_a_peri(struct rcar_gen3_chan *ch) 




static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)

static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)

{

{

	void __iomem *usb2_base = ch->base;

	rcar_gen3_control_otg_irq(ch, 0);

	u32 val;



	val = readl(usb2_base + USB2_OBINTEN);

	writel(val & ~USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);





	rcar_gen3_enable_vbus_ctrl(ch, 1);

	rcar_gen3_enable_vbus_ctrl(ch, 1);

	rcar_gen3_init_for_host(ch);

	rcar_gen3_init_for_host(ch);





	writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);

	rcar_gen3_control_otg_irq(ch, 1);

}

}





static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)

static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
@@ -286,8 +294,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch) 
	val = readl(usb2_base + USB2_VBCTRL);

	val = readl(usb2_base + USB2_VBCTRL);

	writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);

	writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);

	writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);

	writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);

	val = readl(usb2_base + USB2_OBINTEN);

	rcar_gen3_control_otg_irq(ch, 1);

	writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);

	val = readl(usb2_base + USB2_ADPCTRL);

	val = readl(usb2_base + USB2_ADPCTRL);

	writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);

	writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);

	val = readl(usb2_base + USB2_LINECTRL1);

	val = readl(usb2_base + USB2_LINECTRL1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE