diff options
| author | Mike Turquette <mturquette@linaro.org> | 2012-07-12 09:48:19 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-07-12 09:48:19 -0700 |
| commit | c782c384d289a382baf4a1ab544f6f4b9e72405b (patch) | |
| tree | c0b3324b3b8a5f3e276c096b8bc135a7ed4e7d6e /drivers/clk | |
| parent | 8d4d9f52081cd45bde42b9452eba95f38feb7dae (diff) | |
| parent | 79ddff903e054e14c4109b4f86ec5333665b1ddd (diff) | |
| download | linux-c782c384d289a382baf4a1ab544f6f4b9e72405b.tar.gz linux-c782c384d289a382baf4a1ab544f6f4b9e72405b.tar.bz2 linux-c782c384d289a382baf4a1ab544f6f4b9e72405b.zip | |
Merge branch 'clk/mxs-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into clk-next
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/mxs/clk-imx28.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 957eaaccb5f8..e3aab67b3eb7 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -329,6 +329,10 @@ int __init mx28_clocks_init(void) clk_register_clkdevs(clks[fec], fec_lookups, ARRAY_SIZE(fec_lookups)); clk_register_clkdevs(clks[can0], can0_lookups, ARRAY_SIZE(can0_lookups)); clk_register_clkdevs(clks[can1], can1_lookups, ARRAY_SIZE(can1_lookups)); + clk_register_clkdev(clks[usb0_pwr], NULL, "8007c000.usbphy"); + clk_register_clkdev(clks[usb1_pwr], NULL, "8007e000.usbphy"); + clk_register_clkdev(clks[usb0], NULL, "80080000.usb"); + clk_register_clkdev(clks[usb1], NULL, "80090000.usb"); for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); |