Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-19 01:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: at91_udc: Drop uclk clock

Browse Source 
Now that at91 system clocks forward set_rate request to their parent we
can remove the uclk clock and directly call clk_set_rate on fclk.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Boris Brezillon 2015-01-14 17:21:58 +01:00 committed by Nicolas Ferre
parent 7923540385
commit 9aa0216550
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/usb/gadget/udc/at91_udc.c
View File

@ -895,8 +895,6 @@ static void clk_on(struct at91_udc *udc)
return; return;
udc->clocked = 1; udc->clocked = 1;
if (IS_ENABLED(CONFIG_COMMON_CLK))
clk_enable(udc->uclk);
clk_enable(udc->iclk); clk_enable(udc->iclk);
clk_enable(udc->fclk); clk_enable(udc->fclk);
} }
@ -909,8 +907,6 @@ static void clk_off(struct at91_udc *udc)
udc->gadget.speed = USB_SPEED_UNKNOWN; udc->gadget.speed = USB_SPEED_UNKNOWN;
clk_disable(udc->fclk); clk_disable(udc->fclk);
clk_disable(udc->iclk); clk_disable(udc->iclk);
if (IS_ENABLED(CONFIG_COMMON_CLK))
clk_disable(udc->uclk);
} }
/* /*
@ -1781,25 +1777,17 @@ static int at91udc_probe(struct platform_device *pdev)
/* get interface and function clocks */ /* get interface and function clocks */
udc->iclk = clk_get(dev, "pclk"); udc->iclk = clk_get(dev, "pclk");
udc->fclk = clk_get(dev, "hclk"); udc->fclk = clk_get(dev, "hclk");
if (IS_ENABLED(CONFIG_COMMON_CLK)) if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk)) {
udc->uclk = clk_get(dev, "usb_clk");
if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk) ||
(IS_ENABLED(CONFIG_COMMON_CLK) && IS_ERR(udc->uclk))) {
DBG("clocks missing\n"); DBG("clocks missing\n");
retval = -ENODEV; retval = -ENODEV;
goto fail1; goto fail1;
} }
/* don't do anything until we have both gadget driver and VBUS */ /* don't do anything until we have both gadget driver and VBUS */
if (IS_ENABLED(CONFIG_COMMON_CLK)) { clk_set_rate(udc->fclk, 48000000);
clk_set_rate(udc->uclk, 48000000);
retval = clk_prepare(udc->uclk);
if (retval)
goto fail1;
}
retval = clk_prepare(udc->fclk); retval = clk_prepare(udc->fclk);
if (retval) if (retval)
goto fail1a; goto fail1;
retval = clk_prepare_enable(udc->iclk); retval = clk_prepare_enable(udc->iclk);
if (retval) if (retval)
@ -1873,12 +1861,7 @@ fail1c:
clk_unprepare(udc->iclk); clk_unprepare(udc->iclk);
fail1b: fail1b:
clk_unprepare(udc->fclk); clk_unprepare(udc->fclk);
fail1a:
if (IS_ENABLED(CONFIG_COMMON_CLK))
clk_unprepare(udc->uclk);
fail1: fail1:
if (IS_ENABLED(CONFIG_COMMON_CLK) && !IS_ERR(udc->uclk))
clk_put(udc->uclk);
if (!IS_ERR(udc->fclk)) if (!IS_ERR(udc->fclk))
clk_put(udc->fclk); clk_put(udc->fclk);
if (!IS_ERR(udc->iclk)) if (!IS_ERR(udc->iclk))
@ -1924,15 +1907,11 @@ static int __exit at91udc_remove(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
if (IS_ENABLED(CONFIG_COMMON_CLK))
clk_unprepare(udc->uclk);
clk_unprepare(udc->fclk); clk_unprepare(udc->fclk);
clk_unprepare(udc->iclk); clk_unprepare(udc->iclk);
clk_put(udc->iclk); clk_put(udc->iclk);
clk_put(udc->fclk); clk_put(udc->fclk);
if (IS_ENABLED(CONFIG_COMMON_CLK))
clk_put(udc->uclk);
return 0; return 0;
} }

2
drivers/usb/gadget/udc/at91_udc.h
View File

@ -126,7 +126,7 @@ struct at91_udc {
unsigned active_suspend:1; unsigned active_suspend:1;
u8 addr; u8 addr;
struct at91_udc_data board; struct at91_udc_data board;
struct clk *iclk, *fclk, *uclk; struct clk *iclk, *fclk;
struct platform_device *pdev; struct platform_device *pdev;
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
void __iomem *udp_baseaddr; void __iomem *udp_baseaddr;