summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-09 18:27:28 -0800
committerOlof Johansson <olof@lixom.net>2013-02-09 18:27:28 -0800
commit877cd953167bc50765719ca047a3ac2c4fdd7aaf (patch)
tree80b284bbdcf7014932d4c5f8ed4ad2427f030af4 /drivers/clk
parentf58cf70ed954c179825cd0c51f5f64cd1ed74ed3 (diff)
parente1ab0056df613662929290f385590da2cccb8c19 (diff)
downloadop-kernel-dev-877cd953167bc50765719ca047a3ac2c4fdd7aaf.zip
op-kernel-dev-877cd953167bc50765719ca047a3ac2c4fdd7aaf.tar.gz
Merge tag 'mxs-soc-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
From Shawn Guo: mxs soc changes for 3.9 - A couple of optimization on timer - Some updates on mxs_defconfig * tag 'mxs-soc-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles ARM: mxs: use apbx bus clock to drive the timers on timrotv2 ARM: mxs: Update mxs_defconfig
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/mxs/clk-imx28.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c
index db3af08..0174270 100644
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@ -238,7 +238,7 @@ int __init mx28_clocks_init(void)
of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
}
- clk_register_clkdev(clks[clk32k], NULL, "timrot");
+ clk_register_clkdev(clks[xbus], NULL, "timrot");
clk_register_clkdev(clks[enet_out], NULL, "enet_out");
for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
OpenPOWER on IntegriCloud