Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8cb8de5d

Commit 8cb8de5d authored 12 years ago by Paul Walmsley

Downloads
- Plain Diff

Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and...

Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6

parents 768c69f5 d49cae92 6668546f

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/mach-omap2/clockdomain44xx.c 7 additions, 3 deletions

arch/arm/mach-omap2/clockdomain44xx.c
arch/arm/mach-omap2/cminst44xx.c 0 additions, 14 deletions

arch/arm/mach-omap2/cminst44xx.c
arch/arm/mach-omap2/cminst44xx.h 0 additions, 25 deletions

arch/arm/mach-omap2/cminst44xx.h
arch/arm/mach-omap2/control.h 1 addition, 0 deletions

arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/dpll3xxx.c 11 additions, 1 deletion

arch/arm/mach-omap2/dpll3xxx.c
arch/arm/mach-omap2/omap_hwmod.c 71 additions, 5 deletions

arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_common_data.c 1 addition, 0 deletions

arch/arm/mach-omap2/omap_hwmod_common_data.c
arch/arm/mach-omap2/powerdomain.c 5 additions, 1 deletion

arch/arm/mach-omap2/powerdomain.c
arch/arm/mach-omap2/prcm.c 23 additions, 0 deletions

arch/arm/mach-omap2/prcm.c
arch/arm/mach-omap2/prm2xxx_3xxx.h 0 additions, 65 deletions

arch/arm/mach-omap2/prm2xxx_3xxx.h
arch/arm/mach-omap2/prm_common.c 62 additions, 0 deletions

arch/arm/mach-omap2/prm_common.c
arch/arm/plat-omap/include/plat/omap_hwmod.h 7 additions, 0 deletions

arch/arm/plat-omap/include/plat/omap_hwmod.h

with 188 additions and 114 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment