• Linus Torvalds's avatar
    Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · fde75430
    Linus Torvalds authored
    Pull arm-soc cleanups, part 2, from Arnd Bergmann:
     "These omap cleanups have dependencies on earlier omap branches that in
      turn depend on other cleanups, so they could not go into the same
      branch."
    
    * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
      ARM: OMAP2+: dmtimer: cleanup fclk usage
      ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
      ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
      ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
      ARM: OMAP2+: am33xx: Make am33xx as a separate class
      ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
      ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
      ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
      ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
      ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
      ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
      ARM: OMAP3+: dpll: optimize noncore dpll locking logic
      ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
      ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
      ARM: OMAP4: clockdomain/CM code: Update supported transition modes
      ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
      ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx
    fde75430
Makefile 10.7 KB