Commit 3a1a388e authored by Tero Kristo's avatar Tero Kristo
Browse files

ARM: OMAP2+: PRCM: rename of_prcm_init to omap_prcm_init 



This avoids conflicts in the global namespace, and is more descriptive
of the purpose anyway.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent c807dbed

arch/arm/mach-omap2/io.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ int __init omap_clk_init(void) 
	ti_clk_init_features();



	if (of_have_populated_dt()) {

		ret = of_prcm_init();

		ret = omap_prcm_init();

		if (ret)

			return ret;

arch/arm/mach-omap2/prm.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
extern void __iomem *prm_base;

extern u16 prm_features;

extern void omap2_set_globals_prm(void __iomem *prm);

int of_prcm_init(void);

int omap_prcm_init(void);

void omap3_prcm_legacy_iomaps_init(void);

# endif

arch/arm/mach-omap2/prm_common.c

+7 −1
Original line number Diff line number Diff line
@@ -625,7 +625,13 @@ static struct ti_clk_ll_ops omap_clk_ll_ops = { 
	.clk_writel = prm_clk_writel,

};



int __init of_prcm_init(void)

/**

 * omap_prcm_init - low level init for the PRCM drivers

 *

 * Initializes the low level clock infrastructure for PRCM drivers.

 * Returns 0 in success, negative error value in failure.

 */

int __init omap_prcm_init(void)

{

	struct device_node *np;

	void __iomem *mem;