diff options
| author | Tony Lindgren | 2015-07-24 06:59:18 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2015-07-24 06:59:18 +0200 |
| commit | 24da741c678f865de3182194604dbddcc7fc7f3c (patch) | |
| tree | 0322f37f8e9e4e945acc100a0d1821db268fe624 /arch/arm/mach-omap2/clockdomains81xx_data.c | |
| parent | Merge tag 'for-v4.3/omap-hwmod-prcm-a' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | ARM: OMAP2: Add minimal dm814x hwmod support (diff) | |
| download | kernel-qcow2-linux-24da741c678f865de3182194604dbddcc7fc7f3c.tar.gz kernel-qcow2-linux-24da741c678f865de3182194604dbddcc7fc7f3c.tar.xz kernel-qcow2-linux-24da741c678f865de3182194604dbddcc7fc7f3c.zip | |
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/clockdomains81xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clockdomains81xx_data.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/clockdomains81xx_data.c b/arch/arm/mach-omap2/clockdomains81xx_data.c index ce2a82001d0d..53442c86a820 100644 --- a/arch/arm/mach-omap2/clockdomains81xx_data.c +++ b/arch/arm/mach-omap2/clockdomains81xx_data.c @@ -165,7 +165,24 @@ static struct clockdomain default_l3_slow_816x_clkdm = { .flags = CLKDM_CAN_SWSUP, }; -static struct clockdomain *clockdomains_ti81xx[] __initdata = { +static struct clockdomain *clockdomains_ti814x[] __initdata = { + &alwon_l3_slow_81xx_clkdm, + &alwon_l3_med_81xx_clkdm, + &alwon_l3_fast_81xx_clkdm, + &alwon_ethernet_81xx_clkdm, + &mmu_81xx_clkdm, + &mmu_cfg_81xx_clkdm, + NULL, +}; + +void __init ti814x_clockdomains_init(void) +{ + clkdm_register_platform_funcs(&am33xx_clkdm_operations); + clkdm_register_clkdms(clockdomains_ti814x); + clkdm_complete_init(); +} + +static struct clockdomain *clockdomains_ti816x[] __initdata = { &alwon_mpu_816x_clkdm, &alwon_l3_slow_81xx_clkdm, &alwon_l3_med_81xx_clkdm, @@ -185,10 +202,10 @@ static struct clockdomain *clockdomains_ti81xx[] __initdata = { NULL, }; -void __init ti81xx_clockdomains_init(void) +void __init ti816x_clockdomains_init(void) { clkdm_register_platform_funcs(&am33xx_clkdm_operations); - clkdm_register_clkdms(clockdomains_ti81xx); + clkdm_register_clkdms(clockdomains_ti816x); clkdm_complete_init(); } #endif |