Skip to content

Commit

Permalink
Merge branch 'clk/mxs-for-3.6' of git://git.linaro.org/people/shawngu…
Browse files Browse the repository at this point in the history
…o/linux-2.6 into clk-next
  • Loading branch information
Mike Turquette committed Jul 12, 2012
2 parents 8d4d9f5 + 79ddff9 commit c782c38
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/clk/mxs/clk-imx28.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]]);
Expand Down

0 comments on commit c782c38

Please sign in to comment.