diff options
| author | Michael Turquette <mturquette@linaro.org> | 2014-12-15 13:30:05 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-12-15 17:05:07 -0800 |
| commit | b1924c2ec1db98278100010ef87b54406d5ce612 (patch) | |
| tree | e8cab2230cdf0e85920075bf2489b04030d4a78e /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 89f7e9de59bf3e3cda2e00de12c66db22675a7cf (diff) | |
| parent | 79005fbd3e1d671d08c45c9140ee9826efdc367c (diff) | |
| download | linux-b1924c2ec1db98278100010ef87b54406d5ce612.tar.bz2 | |
Merge tag 'for-v3.19/omap-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into tmp
Some OMAP clock/hwmod patches for v3.19.
Most of the patches are clock-related. The DPLL implementation is
changed to better align to the common clock framework.
There is also a patch that removes a few lines from the hwmod code -
this patch should have no functional effect.
Basic build, boot, and PM test logs for these patches can be found here:
http://www.pwsan.com/omap/testlogs/omap-a-for-v3.19/20141113094101/
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 716247ed9e0c..acae6d5d1151 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2832,12 +2832,10 @@ static int __init _add_link(struct omap_hwmod_ocp_if *oi) _alloc_links(&ml, &sl); ml->ocp_if = oi; - INIT_LIST_HEAD(&ml->node); list_add(&ml->node, &oi->master->master_ports); oi->master->masters_cnt++; sl->ocp_if = oi; - INIT_LIST_HEAD(&sl->node); list_add(&sl->node, &oi->slave->slave_ports); oi->slave->slaves_cnt++; |