sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: i.MX5: ccm: combine initcalls and drop ifdefs 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-05-10 18:29:58 +02:00
parent 29c366dceb
commit 505a1b4e7e
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/mach-imx/clk-imx5.c
View File

@ -254,7 +254,6 @@ static void mx5_clocks_ipu_init(void __iomem *regs)
clks[IMX5_CLK_IPU_SEL] = imx_clk_mux("ipu_sel", regs + CCM_CBCMR, 6, 2, ipu_sel, ARRAY_SIZE(ipu_sel));
}
#ifdef CONFIG_ARCH_IMX51
static void mx51_clocks_ipu_init(void __iomem *regs)
{
clks[IMX5_CLK_IPU_DI0_SEL] = imx_clk_mux_p("ipu_di0_sel", regs + CCM_CSCMR2, 26, 3,
@ -332,14 +331,6 @@ static struct driver_d imx51_ccm_driver = {
.of_compatible = DRV_OF_COMPAT(imx51_ccm_dt_ids),
};
static int imx51_ccm_init(void)
{
return platform_driver_register(&imx51_ccm_driver);
}
core_initcall(imx51_ccm_init);
#endif
#ifdef CONFIG_ARCH_IMX53
static void mx53_clocks_ipu_init(void __iomem *regs)
{
clks[IMX5_CLK_LDB_DI1_DIV_3_5] = imx_clk_fixed_factor("ldb_di1_div_3_5", "ldb_di1_sel", 2, 7);
@ -426,9 +417,13 @@ static struct driver_d imx53_ccm_driver = {
.of_compatible = DRV_OF_COMPAT(imx53_ccm_dt_ids),
};
static int imx53_ccm_init(void)
static int imx5_ccm_init(void)
{
return platform_driver_register(&imx53_ccm_driver);
if (IS_ENABLED(CONFIG_ARCH_IMX51))
platform_driver_register(&imx51_ccm_driver);
if (IS_ENABLED(CONFIG_ARCH_IMX53))
platform_driver_register(&imx53_ccm_driver);
return 0;
}
core_initcall(imx53_ccm_init);
#endif
core_initcall(imx5_ccm_init);