diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-24 07:59:18 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-24 07:59:18 +0300 |
| commit | 24da741c678f865de3182194604dbddcc7fc7f3c (patch) | |
| tree | 0322f37f8e9e4e945acc100a0d1821db268fe624 /arch/arm/mach-omap2/io.c | |
| parent | 97d9a3d0967f711e271ef950f1745307720c95d5 (diff) | |
| parent | 0f3ccb24c0347cd80160810df79bfa233749074e (diff) | |
| download | linux-24da741c678f865de3182194604dbddcc7fc7f3c.tar.xz | |
Merge branch 'dm814x-soc' into omap-for-v4.3/soc
Update dm814x changes for sparse fixes to make data structures
static.
Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index c10fb291b99f..4025e734ebd2 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -608,11 +608,11 @@ void __init ti814x_init_early(void) omap2_prcm_base_init(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); - ti81xx_clockdomains_init(); - ti81xx_hwmod_init(); + ti814x_clockdomains_init(); + dm814x_hwmod_init(); omap_hwmod_init_postsetup(); if (of_have_populated_dt()) - omap_clk_soc_init = ti81xx_dt_clk_init; + omap_clk_soc_init = dm814x_dt_clk_init; } void __init ti816x_init_early(void) @@ -625,11 +625,11 @@ void __init ti816x_init_early(void) omap2_prcm_base_init(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); - ti81xx_clockdomains_init(); - ti81xx_hwmod_init(); + ti816x_clockdomains_init(); + dm816x_hwmod_init(); omap_hwmod_init_postsetup(); if (of_have_populated_dt()) - omap_clk_soc_init = ti81xx_dt_clk_init; + omap_clk_soc_init = dm816x_dt_clk_init; } #endif |