Permalink
Switch branches/tags
Commits on Mar 8, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console

    * git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console:
      virtio: console: Use better variable names for fill_queue operation
      virtio: console: Fix type of 'len' as unsigned int
    torvalds committed Mar 8, 2010
Commits on Mar 7, 2010
  1. Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/lin…

    …ux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
      x86, mrst: Fix whitespace breakage in apb_timer.c
      x86, mrst: Fix APB timer per cpu clockevent
      x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC
      x86, olpc: Use pci subarch init for OLPC
      x86, pci: Add arch_init to x86_init abstraction
      x86, mrst: Add Kconfig dependencies for Moorestown
      x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n
      x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI
      x86, pci: Add sanity check for PCI fixed bar probing
      x86, legacy_irq: Remove duplicate vector assigment
      x86, legacy_irq: Remove left over nr_legacy_irqs
      x86, mrst: Platform clock setup code
      x86, apbt: Moorestown APB system timer driver
      x86, mrst: Add vrtc platform data setup code
      x86, mrst: Add platform timer info parsing code
      x86, mrst: Fill in PCI functions in x86_init layer
      x86, mrst: Add dummy legacy pic to platform setup
      x86/PCI: Moorestown PCI support
      x86, ioapic: Add dummy ioapic functions
      x86, ioapic: Early enable ioapic for timer irq
      ...
    
    Fixed up semantic conflict of new clocksources due to commit
    1762233 ("clocksource: add argument to resume callback").
    torvalds committed Mar 7, 2010
  2. Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux

    * 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
      i2c: Add support for Xilinx XPS IIC Bus Interface
      i2c: omap: Add support for 16-bit registers
      i2c-pnx: fix setting start/stop condition
      powerpc: doc/dts-bindings: update doc of FSL I2C bindings
      i2c-mpc: add support for the MPC512x processors from Freescale
      i2c-mpc: rename "setclock" initialization functions to "setup"
      i2c-mpc: use __devinit[data] for initialization functions and data
      i2c/imx: don't add probe function to the driver struct
      i2c: Add support for Ux500/Nomadik I2C controller
    torvalds committed Mar 7, 2010
  3. Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/sameo/mfd-2.6
    
    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (66 commits)
      mfd: Fix ucb1x00 build failure for collie_defconfig
      mfd: Fix lpc_sch related depends/selects, fix build error
      gpio: Fix sch_gpio warning
      gpio: add Intel SCH GPIO controller driver
      i2c: convert i2c-isch to platform_device
      mfd: Use completion interrupt for WM831x AUXADC
      mfd: Use completion interrupt for WM835x AUXADC
      mfd: Introduce remove_script function for twl4030
      mfd/mmc: SDHI Kconfig update
      mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support
      gpiolib: Force wm831x GPIOs into GPIO mode when requested
      mfd: Add WM831x revision B support
      gpiolib: Correct debugfs display of WM831x GPIO inversion
      gpiolib: Actually set output state in wm831x_gpio_direction_output()
      tmio_mmc: Balance cell enable()/disable() calls
      tmio_mmc: Remove const from platform data V3
      tmio_mmc: Use 100ms mmc_detect_change() delay
      tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2
      tmio_mmc: Keep card-detect interrupts enabled
      mfd: Add twl6030 base addr for ID0, ID1, ID2
      ...
    torvalds committed Mar 7, 2010
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (368 commits)
      Staging: winbond: fix up wireless api errors
      Staging: dream: camera: sk5k3e2fx: fix code style issues
      Staging: dream: camera: msm_camera: fix code style issues
      Staging: wlan-ng: More checkpatch.pl error cleanups
      Staging: wlan-ng - checkpatch.pl fixups
      Staging: comedi: comedi_fops.c: Checkpatch cleanup
      Staging: comedi: fix suspect code indent in ni_labpc.c
      Staging: comedi: fix yet another brace coding style issue in ni_labpc.c
      Staging: comedi: fix another brace coding style issues in ni_labpc.c
      Staging: comedi: fix brace coding style issue in ni_labpc.c
      Staging: comedi: poc: Adding some KERN_ facility level
      Staging: dream: camera: msm_camera: fix some code style issues
      Staging: wlan-ng: fix most of the style issues in hfa384x.h
      Staging: dream: camera: msm_camera: fix coding style issues
      Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c
      Staging: comedi: fix bracing coding style issue in ni_65xx.c
      Staging: comedi: pcmad: Checkpatch cleanups
      Staging: comedi: poc: fix coding style issues
      staging: dt3155: revert u_long to u64 usage
      Staging: comedi: drivers.c: Checkpatch cleanup
      ...
    torvalds committed Mar 7, 2010
  5. seq_file: fix new kernel-doc warnings

    Fix kernel-doc notation in new seq-file functions and
    correct spelling.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Randy Dunlap committed with torvalds Mar 4, 2010
  6. Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits)
      sh: Convert sh to use read/update_persistent_clock
      sh: Move PMB debugfs entry initialization to later stage
      sh: Fix up flush_cache_vmap() on SMP.
      sh: fix up MMU reset with variable PMB mapping sizes.
      sh: establish PMB mappings for NUMA nodes.
      sh: check for existing mappings for bolted PMB entries.
      sh: fixed virt/phys mapping helpers for PMB.
      sh: make pmb iomapping configurable.
      sh: reworked dynamic PMB mapping.
      sh: Fix up cpumask_of_pcibus() for the NUMA build.
      serial: sh-sci: Tidy up build warnings.
      sh: Fix up ctrl_read/write stragglers in migor setup.
      serial: sh-sci: Add DMA support.
      dmaengine: shdma: extend .device_terminate_all() to record partial transfer
      sh: merge sh7722 and sh7724 DMA register definitions
      sh: activate runtime PM for dmaengine on sh7722 and sh7724
      dmaengine: shdma: add runtime PM support.
      dmaengine: shdma: separate DMA headers.
      dmaengine: shdma: convert to platform device resources
      dmaengine: shdma: fix DMA error handling.
      ...
    torvalds committed Mar 7, 2010
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/kyle/parisc-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
      parisc: use __ratelimit in unaligned.c
      parisc: Convert to read/update_persistent_clock
      parisc: Simplify param.h by including <asm-generic/param.h>
      parisc: drop unnecessary cast in __ldcw_align() macro
      parisc: add strict copy size checks (v2)
      parisc: remove trailing space in messages
      parisc: ditto sys_accept4
      parisc: wire up sys_recvmmsg
    torvalds committed Mar 7, 2010
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/rafael/suspend-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM: Provide generic subsystem-level callbacks
      PM / Runtime: Document power.runtime_auto and related functions
    torvalds committed Mar 7, 2010
  9. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mst/vhost
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
      virtio: set pci bus master enable bit
    torvalds committed Mar 7, 2010
  10. Merge branch 'next-i2c-xilinx' into next-i2c

    Ben Dooks committed Mar 7, 2010
  11. Merge branch 'next-i2c-omap' into next-i2c

    Ben Dooks committed Mar 7, 2010
  12. Merge branch 'next-i2c-mpc-v8' into next-i2c

    Ben Dooks committed Mar 7, 2010
  13. i2c: Add support for Xilinx XPS IIC Bus Interface

    This patch adds support for the Xilinx XPS IIC Bus Interface.
    
    The driver uses the dynamic mode, supporting to put several
    I2C messages in the FIFO to reduce the number of interrupts.
    
    It has the same feature as ocores, it can be passed a list
    of devices that will be added when the bus is probed.
    
    Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Richard Röjfors committed with Ben Dooks Feb 11, 2010
  14. i2c: omap: Add support for 16-bit registers

    The current i2c-omap driver is set up for 32-bit registers, which
    corresponds to most OMAP devices.  However, OMAP730/850 based
    devices use a 16-bit register size.
    
    This change modifies the driver to perform a runtime CPU type check
    to determine the register sizes, and uses a bit shift of either 1
    or 2 bits to compute the proper register sizes for all registers.
    
    Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com>
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    darkstar62 committed with Ben Dooks Dec 13, 2009
  15. i2c-pnx: fix setting start/stop condition

    The start/stop condtions are set in different places repetedly in the i2c-pnx
    driver.  Beside in i2c_pnx_start and i2c_pnx_stop the start/stop bit are also
    set during the transfer of a i2c message in the master_xmit/rcv calls. This is
    wrong since we can't set the start/stop condition during the transaction of a
    single message any way. As a matter of fact, the driver will sometimes set both
    the start and the stop bits at one time. This can be easily reproduced by
    sending a simple read request like e.g
    struct i2c_msg msgs[] = {
    { addr, 0, 1, buf },
    { addr, I2C_M_RD, offset, buf }
    };
    While processing the first message the i2c_pnx_master_xmit will set both the
    start_bit and the stop_bit, which will eventually confuse the slave.
    
    Fixed by remove setting start/stop condition from the transmit routines.
    
    Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Luotao Fu committed with Ben Dooks Mar 1, 2010
  16. powerpc: doc/dts-bindings: update doc of FSL I2C bindings

    This patch adds the MPC5121 to the list of supported devices,
    enhances the doc of the "clock-frequency" property and removes
    the obsolete "cell-index", "device_type" and "fsl-i2c" property.
    Furthermore an example for the MPC5121 has been added.
    
    Signed-off-by: Wolfgang Grandegger <wg@denx.de>
    Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Wolfgang Grandegger committed with Ben Dooks Feb 17, 2010
  17. i2c-mpc: add support for the MPC512x processors from Freescale

    As I2C interrupts must  be enabled for the MPC512x by the setup function
    as well, "fsl,preserve-clocking" is handled in a slighly different way.
    Also, the old settings are now reported calling dev_dbg(). For the
    MPC512x the clock setup function of the MPC52xx can be re-used.
    Furthermore, the Kconfig help has been updated and corrected.
    
    Signed-off-by: Wolfgang Grandegger <wg@denx.de>
    Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Wolfgang Grandegger committed with Ben Dooks Feb 17, 2010
  18. i2c-mpc: rename "setclock" initialization functions to "setup"

    To prepare  support for the MPC512x processors from Freescale the
    "setclock" initialization functions have been renamed to "setup"
    because I2C interrupts must be enabled for the MPC512x by this
    function as well.
    
    Signed-off-by: Wolfgang Grandegger <wg@denx.de>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Wolfgang Grandegger committed with Ben Dooks Feb 17, 2010
  19. i2c-mpc: use __devinit[data] for initialization functions and data

    "__devinit[data]" has not yet been used for all initialization functions
    and data. To avoid truncating lines, the struct "mpc_i2c_match_data" has
    been renamed to "mpc_i2c_data", which is even the better name.
    
    Signed-off-by: Wolfgang Grandegger <wg@denx.de>
    Tested-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Wolfgang Grandegger committed with Ben Dooks Feb 17, 2010
  20. i2c/imx: don't add probe function to the driver struct

    Having a pointer to the probe function is unnecessary when using
    platform_driver_probe and yields a section mismatch warning after
    removing the white list entry "*driver" for
    { .data$, .data.rel$ } -> { .init.* } mismatches in modpost.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Uwe Kleine-König committed with Ben Dooks Feb 1, 2010
  21. i2c: Add support for Ux500/Nomadik I2C controller

    This adds support for ST-Ericsson's I2C block found
    in Ux500 and Nomadik 8815 platforms.
    
    Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
    Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
    Acked-by: Linus Walleij <linus.walleij@stericsson.com>
    Reviewed-by: Linus Walleij <linus.walleij@stericsson.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    srinidhi kasagar committed with Ben Dooks Feb 1, 2010
  22. mfd: Fix ucb1x00 build failure for collie_defconfig

    This patch fixes a build failure[1], by adding the missing semaphore.h include
    
    References:
    [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2234322/
    
    Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    PeterHuewe committed with sameo Mar 6, 2010
  23. mfd: Fix lpc_sch related depends/selects, fix build error

    LPC_SCH is selected by GPI_SCH and I2C_ISCH, even when PCI is not
    enabled, but LPC_SCH depends on PCI, so make GPI_SCH and I2C_ISCH
    also depend on PCI.
    
    Those 2 selects also need to select what LPC_SCH selects,
    since kconfig does not follow selects.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Denis Turischev <denis@compulab.co.il>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Randy Dunlap committed with sameo Mar 5, 2010
  24. gpio: Fix sch_gpio warning

    We need to check for gpiochip_remove() errors.
    
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    sameo committed Mar 5, 2010
  25. gpio: add Intel SCH GPIO controller driver

    Signed-off-by: Denis Turischev <denis@compulab.co.il>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Denis Turischev committed with sameo Mar 2, 2010
  26. i2c: convert i2c-isch to platform_device

    Convert i2c-isch to platform_device for the lpc mfd core to add it at probe
    time.
    
    Signed-off-by: Denis Turischev <denis@compulab.co.il>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Denis Turischev committed with sameo Mar 1, 2010
  27. mfd: Use completion interrupt for WM831x AUXADC

    Use the completion interrupt generated by the device rather than
    polling for conversions to complete. As a backup we still check
    the status of the AUXADC if we don't get a completion, mostly for
    systems that don't have the WM831x interrupt infrastructure hooked
    up.
    
    Also reduce the timeout for completion of conversions to 5ms from
    the previous 10ms, the lower timeout should be sufficient.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    broonie committed with sameo Feb 23, 2010
  28. mfd: Use completion interrupt for WM835x AUXADC

    Use the completion interrupt generated by the device rather than
    polling for conversions to complete. As a backup we still check
    the state of the AUXADC if we don't get a completion, mostly for
    systems that don't have the WM8350 interrupt infrastructure hooked
    up.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    broonie committed with sameo Feb 23, 2010
  29. mfd: Introduce remove_script function for twl4030

    New function twl4030_remove_script(u8 flags) takes a script type as
    defined in twl.h and prevents any script already loaded in that position
    from running.  This is accomplished by programming SEQ_ADD_* to 0x3f,
    the END_OF_SCRIPT value, where SEQ_ADD_* is determined by flags.
    
    (Future) users of this function include OMAP board files for machines
    facing a race condition between sleep and warm reset.
    
    Signed-off-by: Mike Turquette <mturquette@ti.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Mike Turquette committed with sameo Feb 22, 2010
  30. mfd/mmc: SDHI Kconfig update

    Enable the sh_mobile_sdhi mfd driver on SH-Mobile ARM
    processors. While at it, make CONFIG_TMIO_MMC depend on
    CONFIG_MFD_SH_MOBILE_SDHI.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Magnus Damm committed with sameo Feb 22, 2010
  31. mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support

    Add MMC_CAP_MMC_HIGHSPEED support to the sh_mobile_sdhi
    driver. Also, remove type cast and FIXME comment.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Magnus Damm committed with sameo Feb 22, 2010
  32. gpiolib: Force wm831x GPIOs into GPIO mode when requested

    This is the chip default but it's possible the bootloader or OTP
    will have been configured to a different mode (eg, to provide
    feedback during startup).
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    broonie committed with sameo Feb 17, 2010
  33. mfd: Add WM831x revision B support

    Revision B of the WM831x devices changes the sense of the tristate
    bit for GPIO configuration, inverting it to become an enable instead.
    Take account of this in the gpiolib driver.
    
    A current sink regulation status bit has also been added in revision B,
    add a flag indicating if it's present but don't use it yet.
    
    This revision also adds an interrupt on key up for the ON pin event
    which the existing code is able to take advantage of.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    broonie committed with sameo Feb 17, 2010
  34. gpiolib: Correct debugfs display of WM831x GPIO inversion

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    broonie committed with sameo Feb 17, 2010