1. 11 May, 2012 3 commits
    • 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
    • Olof Johansson's avatar
      Merge tag 'omap-cleanup-renames-for-v3.5' of... · 5056c073
      Olof Johansson authored
      Merge tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2
      
      Simplify some SoC config options before things get too unreadable.
      
      Note that this depends on a fix in omap-fixes-non-critical-for-v3.5,
      so it's based on that.
      
      By Kevin Hilman (3) and others
      via Tony Lindgren
      * tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
        ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
        ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally
        ARM: OMAP2+: INTC: fix Kconfig option for TI81XX
        ARM: OMAP2+: remove incorrect irq_chip ack field
        ARM: OMAP4: Adding ID for OMAP4460 ES1.1
        ARM: OMAP4: panda: add statics to remove warnings
        ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox
        ARM: OMAP: fix trivial warnings for dspbridge
        ARM: OMAP4: hsmmc: check for null pointer
        ARM: OMAP1: fix compilation issue in board-sx1.c
      5056c073
    • Olof Johansson's avatar
      Merge tag 'omap-cleanup-for-v3.5' of... · 812655e9
      Olof Johansson authored
      Merge tag 'omap-cleanup-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2
      
      Clean up to make it easier to add support for new SoCs.
      
      Note that these have a merge dependency to omap-devel-hwmod-for-v3.5
      branch for the Makefile changes.
      
      By Paul Walmsley (37) and others
      via Tony Lindgren
      * tag 'omap-cleanup-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (55 commits)
        GPMC: add ECC control definitions
        ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore
        ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
        ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505
        ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.
        ARM: OMAP4: Reduce the static IO mapping
        ARM: All OMAP2PLUS machines use omap2 directory so just add one entry
        ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.
        ARM: OMAP4: Remove un-used WakeupGen register defines.
        ARM: OMAP2+: Clean up wrapping multiple objects in Makefile
        ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds.
        ARM: OMAP4: hwmod data: add DEBUGSS skeleton
        ARM: OMAP4: hwmod data: add PRCM and related IP blocks
        ARM: OMAP4: hwmod data: add System Control Module
        ARM: OMAP4: hwmod data: add the OCP-WP IP block
        ARM: OMAP4: hwmod data: add OCM RAM IP block
        ARM: OMAP4: hwmod data: add remaining USB-related IP blocks
        ARM: OMAP4: hwmod data: add some interconnect-related IP blocks
        ARM: OMAP4: hwmod data: add McASP
        ARM: OMAP4: hwmod data: add the Slimbus IP blocks
        ...
      812655e9
  2. 10 May, 2012 7 commits
  3. 09 May, 2012 17 commits
  4. 08 May, 2012 13 commits