1. 17 Sep, 2012 9 commits
    • 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
  2. 16 Sep, 2012 1 commit
  3. 14 Sep, 2012 6 commits
    • Stephen Warren's avatar
      ARM: dt: tegra: harmony: configure power off · be972c32
      Stephen Warren authored
      Add DT property to tell the TPS6586x that it should provide the
      pm_power_off() implementation. This allows "shutdown" to work.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      be972c32
    • Laxman Dewangan's avatar
      ARM: dt: tegra: harmony: add regulators · 3cc404de
      Laxman Dewangan authored
      Harmony uses a TPS6586x regulator. Instantiate this, and hook up a
      couple of fixed GPIO-controlled regulators too.
      
      Based on Ventana regulator patch by Stephen Warren <swarren@nvidia.com>
      and converted to Harmony.
      
      swarren made the following changes:
      * Added ldo0 regulator configuration to device tree, and updated
        board-harmony-pcie.c for the new regulator name.
      * Fixed vdd_1v05's voltage from 10.5V to 1.05V.
      * Modified board-harmony-pcie.c to obtain the en_vdd_1v05 GPIO number at
        run-time from device tree instead of hard-coding it.
      * Removed board-harmony{-power.c,.h} now that they're unused.
      * Disabled vdd_1v05 regulator; the code in board-harmony-pcie.c hijacks
        this GPIO for now. This will be fixed when the PCIe driver is re-
        written as a driver. The code can't regulator_get("vdd_1v05") right
        now, because the vdd_1v05 regulator's probe gets deferred due to its
        supply being the PMIC, which gets probed after the regulator the first
        time around, and this dependency is only resolved by repeated probing,
        which happens when deferred_probe_initcall() is called, which happens
        in a late initcall, whose runtime order relative to harmony_pcie_init()
        is undefined, since that's also called from a late initcall.
      * Removed unused harmony_pcie_initcall().
      Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      3cc404de
    • Stephen Warren's avatar
      ARM: tegra: remove board (but not DT) support for Harmony · bb25af81
      Stephen Warren authored
      Harmony can be booted using device tree with equal functionality as when
      booted using a board file. Remove as much of the board file as is
      possible, since it's no longer needed.
      
      Two special-cases are still left in board-dt-tegra20.c, since the Tegra
      PCIe driver doesn't support device tree yet, and the Harmony .dts file
      doesn't yet describe regulators which are needed for PCIe. This logic is
      now enabled unconditionally rather than via CONFIG_MACH_HARMONY. While
      this is more code than other boards, it's still unlikely to be much of a
      problem, and both regulators and PCIe should be supported via device tree
      in the near future, allowing the remaining code to be removed.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      bb25af81
    • Stephen Warren's avatar
      ARM: tegra: remove board (but not DT) support for Paz00 · cff1dfbf
      Stephen Warren authored
      Paz00 (Toshiba AC100) can be booted using device tree with equal
      functionality as when booted using a board file. Remove as much of the
      board file as is possible, since it's no longer needed.
      
      One special-case is still left in board-dt-tegra20.c, since there is no
      way to create a WiFi rfkill device from device tree yet. This logic is
      now enabled unconditionally rather than via CONFIG_MACH_PAZ00. The extra
      cases where it's enabled (.configs which did not enable Paz00 support)
      shouldn't impact much since the amount of code is tiny.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Acked-By: default avatarMarc Dietrich <marvin24@gmx.de>
      cff1dfbf
    • Stephen Warren's avatar
      ARM: tegra: remove board (but not DT) support for TrimSlice · be6a9194
      Stephen Warren authored
      TrimSlice can be booted using device tree with equal functionality as
      when booted using a board file. Remove the board file since it's no
      longer needed.
      
      One special-case is still left in board-dt-tegra20.c, since the Tegra
      PCIe driver doesn't support device tree yet. This logic is now enabled
      by CONFIG_TEGRA_PCI rather than via CONFIG_MACH_TRIMSLICE. The extra
      cases where it's enabled (.configs which did not enable TrimSlice
      support) shouldn't impact much since the amount of code is tiny.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      be6a9194
    • Stephen Warren's avatar
      1ab710fe
  4. 13 Sep, 2012 24 commits