Merge branch 'imx6q/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes (33e1e10a) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/mach-imx/clock-imx6q.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1953,14 +1953,17 @@ static struct map_desc imx6q_clock_desc[] = {
		imx_map_entry(MX6Q, ANATOP, MT_DEVICE),
		};

		void __init imx6q_clock_map_io(void)
		{
		iotable_init(imx6q_clock_desc, ARRAY_SIZE(imx6q_clock_desc));
		}

		int __init mx6q_clocks_init(void)
		{
		struct device_node *np;
		void __iomem *base;
		int i, irq;

		iotable_init(imx6q_clock_desc, ARRAY_SIZE(imx6q_clock_desc));

		/* retrieve the freqency of fixed clocks from device tree */
		for_each_compatible_node(np, NULL, "fixed-clock") {
		u32 rate;

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ static void __init imx6q_map_io(void)
		{
		imx_lluart_map_io();
		imx_scu_map_io();
		imx6q_clock_map_io();
		}

		static void __init imx6q_gpio_add_irq_domain(struct device_node *np,

+1 −0

Original line number	Diff line number	Diff line
		@@ -133,4 +133,5 @@ extern void imx53_qsb_common_init(void);
		extern void imx53_smd_common_init(void);
		extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
		extern void imx6q_pm_init(void);
		extern void imx6q_clock_map_io(void);
		#endif