• Olof Johansson's avatar
    Merge tag 'omap-cleanup-devices-for-v3.5' of... · e2e9bbee
    Olof Johansson authored
    Merge tag 'omap-cleanup-devices-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2
    
    Changes to split plat-omap/devices.c into mach-omap1 and mach-omap2
    except for the RNG driver that will be done later on.
    
    As this depends on omap-devel-hwmod-data-for-v3.5 and causes merge
    conflict with omap-fixes-non-critical-for-v3.5, this branch is based
    on merge of the two.
    
    By Tony Lindgren (7) and others
    via Tony Lindgren (4) and Paul Walmsley (1)
    * tag 'omap-cleanup-devices-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
      ARM: OMAP1: Pass dma request lines in platform data to MMC driver
      ARM: OMAP: Move omap_mmc_add() to mach-omap1
      ARM: OMAP2: Use hwmod to initialize mmc for 2420
      ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2
      ARM: OMAP1: Move omap_init_uwire to mach-omap1
      ARM: OMAP1: Move omap_init_audio() to keep the devices in alphabetical order
      ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset
      ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database
      ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
      ARM: OMAP4: hwmod data: I2C: add flag for context restore
      ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
      ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod
      ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod
      ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data
      ARM: OMAP2+: HDQ1W: add custom reset function
      ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420
      arm: omap3: clockdomain data: Remove superfluous commas from gfx_sgx_3xxx_wkdeps[]
      ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API
      ARM: OMAP3: clock data: add clockdomain for HDQ functional clock
      ARM: OMAP3+: dpll: Configure autoidle mode only if it's supported
      ...
    e2e9bbee
Makefile 10.2 KB