Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76280832 authored by Boris Brezillon's avatar Boris Brezillon Committed by Felipe Balbi
Browse files

usb: gadget: at91_udc: prepare clk before calling enable 



Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
avoid common clk framework warnings.

Signed-off-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 88ae7423

drivers/usb/gadget/at91_udc.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -870,8 +870,8 @@ static void clk_on(struct at91_udc *udc) 
	if (udc->clocked)

	if (udc->clocked)

		return;

		return;

	udc->clocked = 1;

	udc->clocked = 1;

	clk_enable(udc->iclk);

	clk_prepare_enable(udc->iclk);

	clk_enable(udc->fclk);

	clk_prepare_enable(udc->fclk);

}

}





static void clk_off(struct at91_udc *udc)

static void clk_off(struct at91_udc *udc)
@@ -880,8 +880,8 @@ static void clk_off(struct at91_udc *udc) 
		return;

		return;

	udc->clocked = 0;

	udc->clocked = 0;

	udc->gadget.speed = USB_SPEED_UNKNOWN;

	udc->gadget.speed = USB_SPEED_UNKNOWN;

	clk_disable(udc->fclk);

	clk_disable_unprepare(udc->fclk);

	clk_disable(udc->iclk);

	clk_disable_unprepare(udc->iclk);

}

}





/*

/*
@@ -1782,12 +1782,14 @@ static int at91udc_probe(struct platform_device *pdev) 
	}

	}





	/* don't do anything until we have both gadget driver and VBUS */

	/* don't do anything until we have both gadget driver and VBUS */

	clk_enable(udc->iclk);

	retval = clk_prepare_enable(udc->iclk);

	if (retval)

		goto fail1;

	at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);

	at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);

	at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff);

	at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff);

	/* Clear all pending interrupts - UDP may be used by bootloader. */

	/* Clear all pending interrupts - UDP may be used by bootloader. */

	at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff);

	at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff);

	clk_disable(udc->iclk);

	clk_disable_unprepare(udc->iclk);





	/* request UDC and maybe VBUS irqs */

	/* request UDC and maybe VBUS irqs */

	udc->udp_irq = platform_get_irq(pdev, 0);

	udc->udp_irq = platform_get_irq(pdev, 0);