1. 20 Sep, 2012 26 commits
  2. 19 Sep, 2012 2 commits
  3. 17 Sep, 2012 12 commits
    • Tony Lindgren's avatar
      ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3 · de6ca33a
      Tony Lindgren authored
      Merge of the LED related changes with omap sparse IRQ and
      hardware.h related changes causes a build issue otherwise:
      
      arch/arm/mach-omap1/board-h2.c:319: error: implicit declaration of function ‘OMAP_MPUIO’
      arch/arm/mach-omap1/board-h2.c:319: error: initializer element is not constant
      arch/arm/mach-omap1/board-h2.c:319: error: (near initialization for ‘h2_gpio_led_pins[1].gpio’)
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      de6ca33a
    • Matt Porter's avatar
      ARM: OMAP2+: Enable pinctrl dummy states · 484202f4
      Matt Porter authored
      Enable pinctrl dummy states for all OMAP platforms that don't
      populate DT. This allows drivers to be converted to pinctrl
      and not generate new warnings on platforms that do not provide
      pinctrl data. These platforms already have pinmuxes configured
      before the drivers probe.
      Signed-off-by: default avatarMatt Porter <mporter@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      484202f4
    • Tony Lindgren's avatar
      mfd: Fix compile for twl-core.c by removing cpu_is_omap usage · defa6be1
      Tony Lindgren authored
      Commit 7d7e1eba (ARM: OMAP2+: Prepare for irqs.h removal) broke
      compile for non-omap as include plat/cpu.h was added. This header
      was indirectly included earlier when SPARSE_IRQ was not set, but
      does not exist on most platforms.
      
      Fix the problem by removing the cpu_is_omap usage that should
      not exist in drivers at all. We can do this by adding proper
      clock aliases for the twl-core.c drivers, and drop separate
      handling for cases when clock framework is not available as
      the behaviour will stay the same.
      
      Note that we need to add a platform device to avoid using the
      i2c provided names that may be different on various omaps.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Paul Walmsley <paul@pwsan.com>
      Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Olof Johansson <olof@lixom.net>
      Cc: Felipe Balbi <balbi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      defa6be1
    • Olof Johansson's avatar
      Merge tag 'omap-cleanup-makefile-sparse-for-v3.7' of... · 3a839ce4
      Olof Johansson authored
      Merge tag 'omap-cleanup-makefile-sparse-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      From Tony Lindgren:
      From Paul Walmsley <paul@pwsan.com>:
      
      Clean up and standardize several parts of
      arch/arm/mach-omap2/Makefile.  Beyond readability and diffstat
      improvements, the series should reduce the risk of conflicts during
      future cleanups by ensuring related lines are in the same section of the
      Makefile.
      
      smatch and string-wrapping cleanups for the OMAP subarch code.
      
      These changes fix some of the more meaningful warnings that smatch
      returns for the OMAP subarch code, and unwraps strings that are
      wrapped at the 80-column boundary, to conform with the current
      practice.
      
      * tag 'omap-cleanup-makefile-sparse-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP: unwrap strings
        ARM: OMAP: clean up some smatch warnings, fix some printk(KERN_ERR ...
        ARM: OMAP2+: clean up PRCM sections of the Makefile
        ARM: OMAP2+: clean up OMAP clock Makefile sections
        ARM: OMAP2+: clean up OMAP4 PRM & sleep build directives in Makefile
        ARM: OMAP2+: move MPU INTCPS, secure monitor, SDRC build directives in Makefile
        ARM: OMAP2+: clean up omap_hwmod.o build directives in Makefile
        ARM: OMAP2+: clean up whitespace in Makefile
      3a839ce4
    • Olof Johansson's avatar
      Merge tag 'omap-cleanup-sparseirq-for-v3.7' of... · 8e51036d
      Olof Johansson authored
      Merge tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      From Tony Lindgren:
      
      This branch contains changes needed to make omap2+
      work properly with sparse IRQ. It also removes
      dependencies to mach/hardware.h. These help moving
      things towards ARM single zImage support.
      
      This branch is based on a commit in tty-next
      branch with omap-devel-gpmc-fixed-for-v3.7 and
      cleanup-omap-tags-for-v3.7 merged in to keep things
      compiling and sort out some merge conflicts.
      
      * tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP1: Move SoC specific headers from plat to mach for omap1
        ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
        ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+
        ARM: OMAP: Remove unused old gpio-switch.h
        ARM: OMAP1: Move plat/irqs.h to mach/irqs.h
        ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ
        ARM: OMAP2+: Prepare for irqs.h removal
        W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h
        Input: omap-keypad: Remove dependencies to mach includes
        ARM: OMAP: Move gpio.h to include/linux/platform_data
        ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
        ARM: OMAP2+: Remove unused nand_irq for GPMC
        ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
        ARM: OMAP1: Define OMAP1_INT_I2C locally
        ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h
      8e51036d
    • Olof Johansson's avatar
      Merge branch 'depends/tty-omap-serial' into next/cleanup · a73403d8
      Olof Johansson authored
      This part of the tty tree (unfortunately with all the preceding patches
      as well) is a dependency for some of the OMAP cleanups, so we've pulled
      it in as a dependency based on agreement with Greg.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a73403d8
    • Olof Johansson's avatar
      Merge tag 'cleanup-omap-tags-for-v3.7' of... · e640ca0f
      Olof Johansson authored
      Merge tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      From Tony Lindgren:
      
      Remove the ancient omap specific atags that are no longer needed.
      
      At some point we were planning to pass the bootloader information
      with custom atags that did not work out too well.
      
      There's no need for these any longer as the kernel has been booting
      fine without them for quite some time. And Now we have device tree
      support that can be used instead.
      
      * tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP: remove plat/board.h file
        ARM: OMAP: move debug_card_init() function
        ARM: OMAP1: move lcd pdata out of arch/arm/*
        ARM: OMAP1: move omap1_bl pdata out of arch/arm/*
        ARM: OMAP: remove the omap custom tags
        ARM: OMAP1: remove the crystal type tag parsing
        ARM: OMAP: remove the sti console workaround
        ARM: OMAP: omap3evm: cleanup revision bits
        ARM: OMAP: cleanup struct omap_board_config_kernel
        + sync to 3.6-rc5
      e640ca0f
    • Olof Johansson's avatar
      Merge tag 'omap-devel-gpmc-fixed-for-v3.7' of... · 5ec8d8c9
      Olof Johansson authored
      Merge tag 'omap-devel-gpmc-fixed-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      From Tony Lindgren:
      
      Changes for GPMC (General Purpose Memory Controller) that take it
      closer for being just a regular device driver.
      
      * tag 'omap-devel-gpmc-fixed-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        mtd: nand: omap2: use gpmc provided irqs
        ARM: OMAP2+: gpmc-nand: Modify Interrupt handling
        ARM: OMAP2+: gpmc: Modify interrupt handling
        mtd: onenand: omap2: obtain memory from resource
        mtd: nand: omap2: obtain memory from resource
        ARM: OMAP2+: gpmc-onenand: provide memory as resource
        ARM: OMAP2+: gpmc-nand: update resource with memory
        mtd: nand: omap2: handle nand on gpmc
        ARM: OMAP2+: gpmc-nand: update gpmc-nand regs
        ARM: OMAP2+: gpmc: update nand register helper
      5ec8d8c9
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.7-board-removal' of... · afdeeccb
      Olof Johansson authored
      Merge tag 'tegra-for-3.7-board-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
      
      From Stephen Warren:
      
      ARM: tegra: remove board files
      
      This branch removes all remaining board files for Tegra; booting is
      now through device tree only.
      
      Related, the Harmony DT is augmented with regulators, since this allows
      removal of board-harmony-power.c; no other boards had regulator support.
      This change depends on an enhancement to the TPS6586x regulator driver,
      hence the dependency mentioned below.
      
      * tag 'tegra-for-3.7-board-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        ARM: dt: tegra: harmony: configure power off
        ARM: dt: tegra: harmony: add regulators
        ARM: tegra: remove board (but not DT) support for Harmony
        ARM: tegra: remove board (but not DT) support for Paz00
        ARM: tegra: remove board (but not DT) support for TrimSlice
      afdeeccb
    • Olof Johansson's avatar
      Merge branch 'depends/tps6589x-dt' into next/cleanup · d6530016
      Olof Johansson authored
      Pull in a dependent branch from Mark Brown's regulator tree for the tegra/cleanup branch.
      
      * depends/tps6589x-dt:
        regulator: tps6586x: add support for SYS rail
      d6530016
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.7-cleanup' of... · 0968d018
      Olof Johansson authored
      Merge tag 'tegra-for-3.7-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
      
      From Stephen Warren:
      
      This branch contains a few early cleanups; consistent use of IO_ADDRESS,
      always selecting USE_OF since we're converting to device-tree-only this
      merge window, and removing includes of some header files as part of
      working towards single zImage.
      
      * tag 'tegra-for-3.7-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        mmc: tegra: remove useless include of <mach/*.h>
        gpio: tegra: remove useless includes of <mach/*.h>
        ARM: tegra: remove duplicate select USE_OF
        ARM: tegra: use IO_ADDRESS for getting virtual address
      0968d018
    • Olof Johansson's avatar
      Merge tag 'msm-cleanup-for-3.7' of... · c098c9f2
      Olof Johansson authored
      Merge tag 'msm-cleanup-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup
      
      From David Brown:
      
      Various cleanups for the msm targets.  Most of this is removing dead
      code, along with a fix of a sparse warning, a list fix from a semantic
      patch, and marking some functions as static.
      
      * tag 'msm-cleanup-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
        ARM: msm: Remove uncompiled board-msm7x27
        ARM: msm: Remove unused acpuclock-arm11
        ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
        ARM: msm: Fix sparse warnings due to incorrect type
        ARM: msm: Remove unused idle.c
        ARM: msm: clock-pcom: Mark functions static
        ARM: msm: Remove msm_hw_reset_hook
      c098c9f2