27 May, 2011

40 commits

  • The Blackfin arch, like the x86 arch, needs to adjust the PC manually
    after a breakpoint is hit as normally this is handled by the remote gdb.
    However, rather than starting another arch ifdef mess, create a common
    GDB_ADJUSTS_BREAK_OFFSET define for any arch to opt-in via their kgdb.h.

    Signed-off-by: Mike Frysinger
    Cc: Oleg Nesterov
    Cc: Jason Wessel
    Cc: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Acked-by: Paul Mundt
    Acked-by: Dongdong Deng
    Cc: Sergei Shtylyov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • [akpm@linux-foundation.org: retain the code comments]
    Signed-off-by: Wolfram Sang
    Cc: Vladimir Zapolskiy
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wolfram Sang
     
  • Commit 51ba60c5 ("RTC: Cleanup rtc_class_ops->update_irq_enable()")
    removed the only user of the update IRQ, so there is no need to manage it
    any more.

    Signed-off-by: Lars-Peter Clausen
    Cc: Thomas Gleixner
    Cc: Alessandro Zummo
    Cc: Marcelo Roberto Jimenez
    Cc: John Stultz
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Lars-Peter Clausen
     
  • Signed-off-by: Rajeev Kumar
    Signed-off-by: Viresh Kumar
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rajeev Kumar
     
  • The memory allocated using request_mem_region should be released using
    release_mem_region, not release_region.

    The semantic patch that fixes part of this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @@
    expression E1,E2,E3;
    @@

    request_mem_region(E1,E2,E3)
    ...
    ?- release_region(E1,E2)
    + release_mem_region(E1,E2)
    //

    [akpm@linux-foundation.org: use resource_size()]
    Signed-off-by: Julia Lawall
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Julia Lawall
     
  • Add basic support for ST m41t93 SPI RTCs. Tested with factory-new and
    with "run-in" species with and without backup batteries.

    Signed-off-by: Nikolaus Voss
    Cc: Alessandro Zummo
    Cc: Grant Likely
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Voss, Nikolaus
     
  • Add support for the Micro Crystal RV3029-C2 RTC chips.

    Signed-off-by: Heiko Schocher
    Signed-off-by: Gregory Hermant
    Cc: Wan ZongShun
    Cc: Alessandro Zummo
    Acked-by: Wolfram Sang
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Heiko Schocher
     
  • Add support for EM Microelectronic EM3027 RTC chip.

    Signed-off-by: Mike Rapoport
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Rapoport
     
  • This adds a driver for the RTC devices in VIA and WonderMedia
    Systems-on-Chip. Alarm, 1Hz interrupts, reading and setting time are
    supported.

    Signed-off-by: Alexey Charkov
    Cc: Lars-Peter Clausen
    Cc: Alexey Charkov
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Charkov
     
  • spin_lock_irqsave() requires unsigned long.

    Signed-off-by: KOSAKI Motohiro
    Cc: Hirokazu Takata
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KOSAKI Motohiro
     
  • alpha allmodconfig:

    drivers/bcma/host_pci.c: In function 'bcma_host_pci_probe':
    drivers/bcma/host_pci.c:102: error: implicit declaration of function 'kzalloc'
    drivers/bcma/host_pci.c:102: warning: assignment makes pointer from integer without a cast

    Cc:
    Cc: John W. Linville
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • alpha allmodconfig:

    drivers/video/mb862xx/mb862xxfbdrv.c: In function 'mb862xxfb_ioctl':
    drivers/video/mb862xx/mb862xxfbdrv.c:323: error: implicit declaration of function 'copy_to_user'
    drivers/video/mb862xx/mb862xxfbdrv.c:327: error: implicit declaration of function 'copy_from_user'

    Cc: Paul Mundt
    Cc: Anatolij Gustschin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    gfs2: Drop __TIME__ usage
    isdn/diva: Drop __TIME__ usage
    atm: Drop __TIME__ usage
    dlm: Drop __TIME__ usage
    wan/pc300: Drop __TIME__ usage
    parport: Drop __TIME__ usage
    hdlcdrv: Drop __TIME__ usage
    baycom: Drop __TIME__ usage
    pmcraid: Drop __DATE__ usage
    edac: Drop __DATE__ usage
    rio: Drop __DATE__ usage
    scsi/wd33c93: Drop __TIME__ usage
    scsi/in2000: Drop __TIME__ usage
    aacraid: Drop __TIME__ usage
    media/cx231xx: Drop __TIME__ usage
    media/radio-maxiradio: Drop __TIME__ usage
    nozomi: Drop __TIME__ usage
    cyclades: Drop __TIME__ usage

    Linus Torvalds
     
  • * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
    gpio/via: rename VIA local config struct
    basic_mmio_gpio: split into a gpio library and platform device
    gpio: remove some legacy comments in build files
    gpio: add trace events for setting direction and value
    gpio/pca953x: Use handle_simple_irq instead of handle_edge_irq
    gpiolib: export gpiochip_find
    gpio: remove redundant Kconfig depends on GPIOLIB
    basic_mmio_gpio: convert to non-__raw* accessors
    basic_mmio_gpio: support direction registers
    basic_mmio_gpio: support different input/output registers
    basic_mmio_gpio: detect output method at probe time
    basic_mmio_gpio: request register regions
    basic_mmio_gpio: allow overriding number of gpio
    basic_mmio_gpio: convert to platform_{get,set}_drvdata()
    basic_mmio_gpio: remove runtime width/endianness evaluation

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (57 commits)
    regulator: Fix 88pm8607.c printk format warning
    input: Add support for Qualcomm PMIC8XXX power key
    input: Add Qualcomm pm8xxx keypad controller driver
    mfd: Add omap-usbhs runtime PM support
    mfd: Fix ASIC3 SD Host Controller Configuration size
    mfd: Fix omap_usbhs_alloc_children error handling
    mfd: Fix omap usbhs crash when rmmoding ehci or ohci
    mfd: Add ASIC3 LED support
    leds: Add ASIC3 LED support
    mfd: Update twl4030-code maintainer e-mail address
    mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
    mfd: Add manual ab8500-gpadc batt temp activation for AB8500 3.0
    mfd: Provide ab8500-core enumerators for chip cuts
    mfd: Check twl4030-power remove script error condition after i2cwrite
    mfd: Fix twl6030 irq definitions
    mfd: Add phoenix lite (twl6025) support to twl6030
    mfd: Avoid to use constraint name in 88pm860x regulator driver
    mfd: Remove checking on max8925 regulator[0]
    mfd: Remove unused parameter from 88pm860x API
    mfd: Avoid to allocate 88pm860x static platform data
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
    RDMA/cma: Save PID of ID's owner
    RDMA/cma: Add support for netlink statistics export
    RDMA/cma: Pass QP type into rdma_create_id()
    RDMA: Update exported headers list
    RDMA/cma: Export enum cma_state in
    RDMA/nes: Add a check for strict_strtoul()
    RDMA/cxgb3: Don't post zero-byte read if endpoint is going away
    RDMA/cxgb4: Use completion objects for event blocking
    IB/srp: Fix integer -> pointer cast warnings
    IB: Add devnode methods to cm_class and umad_class
    IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP required
    IB/uverbs: Add devnode method to set path/mode
    RDMA/ucma: Add .nodename/.mode to tell userspace where to create device node
    RDMA: Add netlink infrastructure
    RDMA: Add error handling to ib_core_init()

    Linus Torvalds
     
  • * 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
    spi/amba-pl022: work in polling or interrupt mode if pl022_dma_probe fails
    spi/spi_s3c24xx: Use spi_bitbang_stop instead of spi_unregister_master in s3c24xx_spi_remove
    spi/spi_nuc900: Use spi_bitbang_stop instead of spi_unregister_master in nuc900_spi_remove
    spi/spi_tegra: use spi_unregister_master() instead of spi_master_put()
    spi/spi_sh: use spi_unregister_master instead of spi_master_put in remove path
    spi: Use void pointers for data in simple SPI I/O operations
    spi/pl022: use cpu_relax in the busy loop
    spi/pl022: mark driver non-experimental
    spi/pl022: timeout on polled transfer v2
    spi/dw_spi: improve the interrupt mode with the batch ops
    spi/dw_spi: change poll mode transfer from byte ops to batch ops
    spi/dw_spi: remove the un-necessary flush()
    spi/dw_spi: unify the low level read/write routines

    Linus Torvalds
     
  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (33 commits)
    OMAP3: PM: Boot message is not an error, and not helpful, remove it
    OMAP3: cpuidle: change the power domains modes determination logic
    OMAP3: cpuidle: code rework for improved readability
    OMAP3: cpuidle: re-organize the C-states data
    OMAP3: clean-up mach specific cpuidle data structures
    OMAP3 cpuidle: remove useless SDP specific timings
    usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled
    usb: otg: OMAP4430: Fixing the omap4430_phy_init function
    usb: musb: am35x: fix compile error when building am35x
    usb: musb: OMAP4430: Power down the PHY during board init
    omap: drop board-igep0030.c
    omap: igep0020: add support for IGEP3
    omap: igep0020: minor refactoring
    omap: igep0020: name refactoring for future merge with IGEP3
    omap: Remove support for omap2evm
    arm: omap2plus: GPIO cleanup
    omap: musb: introduce default board config
    omap: move detection of NAND CS to common-board-devices
    omap: use common initialization for PMIC i2c bus
    omap: consolidate touch screen initialization among different boards
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
    xen: cleancache shim to Xen Transcendent Memory
    ocfs2: add cleancache support
    ext4: add cleancache support
    btrfs: add cleancache support
    ext3: add cleancache support
    mm/fs: add hooks to support cleancache
    mm: cleancache core ops functions and config
    fs: add field to superblock to support cleancache
    mm/fs: cleancache documentation

    Fix up trivial conflict in fs/btrfs/extent_io.c due to includes

    Linus Torvalds
     
  • Fix printk format warning (seen on x86_64) and change to unsigned
    output format:

    drivers/regulator/88pm8607.c:417: warning: format '%d' expects type 'int', but argument 3 has type 'resource_size_t'

    Signed-off-by: Randy Dunlap
    Acked-by: Mark Brown
    Signed-off-by: Samuel Ortiz

    Randy Dunlap
     
  • Add support for PMIC8XXX power key driven over dedicated
    KYPD_PWR_N pin.

    Acked-by: Dmitry Torokhov
    Signed-off-by: Trilok Soni
    Signed-off-by: Anirudh Ghayal
    Signed-off-by: Samuel Ortiz

    Trilok Soni
     
  • Add Qualcomm PMIC8XXX based keypad controller driver
    supporting upto 18x8 matrix configuration.

    Acked-by: Dmitry Torokhov
    Signed-off-by: Trilok Soni
    Signed-off-by: Anirudh Ghayal
    Signed-off-by: Samuel Ortiz

    Trilok Soni
     
  • The usbhs core driver does not enable/disable the interface and
    functional clocks; These clocks are handled by hwmod and runtime pm,
    hence insted of the clock enable/disable, the runtime pm APIS are
    used. however,the port clocks and tll clocks are handled
    by the usbhs core.

    Signed-off-by: Keshava Munegowda
    Signed-off-by: Samuel Ortiz

    Keshava Munegowda
     
  • The size of the TC6380AF SD Host Controller Configuration area is 0x200 bytes (assuming registers are aligned on 32-bit boundaries), not 0x400 bytes. Source: Toshiba TC6380AF Specification sections 4.2 and 4.3.1

    Signed-off-by: Paul Parsons
    Signed-off-by: Samuel Ortiz

    Paul Parsons
     
  • 1. Return proper error if omap_usbhs_alloc_child fails
    2. In the case of goto err_ehci, we should call platform_device_unregister(ehci)
    instead of platform_device_put(ehci) because we have already added the
    platform device to device hierarchy.

    Signed-off-by: Axel Lin
    Signed-off-by: Axel Lin
    Tested-by: Keshava Munegowda
    Acked-by: Felipe Balbi
    Signed-off-by: Samuel Ortiz

    Axel Lin
     
  • The disabling of clocks and freeing GPIO are changed
    to fix the occurrence of the crash of rmmod of ehci and ohci
    drivers. The GPIOs should be freed after the spin locks are
    unlocked.

    Signed-off-by: Keshava Munegowda
    Acked-by: Felipe Balbi
    Cc: stable@kernel.org
    Signed-off-by: Samuel Ortiz

    Keshava Munegowda
     
  • Add LED support for the HTC ASIC3. Underlying support is provided by the mfd/asic3 and leds/leds-asic3 drivers. An example configuration is provided by the pxa/hx4700 platform.

    Signed-off-by: Paul Parsons
    Signed-off-by: Samuel Ortiz

    Paul Parsons
     
  • Add LED support for the HTC ASIC3. Underlying support is provided by the mfd/asic3 and leds/leds-asic3 drivers. An example configuration is provided by the pxa/hx4700 platform.

    Signed-off-by: Paul Parsons
    Signed-off-by: Samuel Ortiz

    Paul Parsons
     
  • Signed-off-by: Peter Ujfalusi
    Signed-off-by: Samuel Ortiz

    Peter Ujfalusi
     
  • The bitmask for enabling the BatTemp pull-up was wrong and
    is corrected. The name is also changed to be inline with
    the AB8500 register description

    Signed-off-by: Johan Palsson
    Reviewed-by: Mattias Wallin
    Signed-off-by: Linus Walleij
    Signed-off-by: Samuel Ortiz

    Johan Palsson
     
  • In AB8500 3.0 the pull-up supplying the NTC must be manually activated.
    Add enumerators to chip version detection logic.

    Signed-off-by: Kalle Komierowski
    Reviewed-by: Johan Palsson
    Reviewed-by: Daniel Willerud
    Reviewed-by: Jonas Aberg
    Signed-off-by: Linus Walleij
    Signed-off-by: Samuel Ortiz

    Karl Komierowski
     
  • Since functionality in MFD cells may need to be adjusted according to
    chip revision, let's enumerate them and keep track of them.

    Signed-off-by: Linus Walleij
    Signed-off-by: Samuel Ortiz

    Linus Walleij
     
  • Fixing the error condition check in twl4030 remove script function.
    Due to some typo in commit ID: 11a441ce82d6ffecfd39b324024de0cd630b36c1

    Signed-off-by: Lesly A M
    Signed-off-by: Samuel Ortiz

    Lesly A M
     
  • The charger fault IRQs from the twl will in future patches be handled
    by a seperate IRQ handler in the charger driver than the general charger
    IRQ. Give them different IRQ numbers now to allow the charger driver to
    be merged in the future.

    Signed-off-by: Graeme Gregory
    Signed-off-by: Samuel Ortiz

    Graeme Gregory
     
  • Phoenix Lite is based on the twl6030 family of PMICs. It has mostly the
    same feature set of twl6030 but with small changes. The codec block has
    also been removed. It also has a new charger block and new features in
    its ADC block. VUSB handling also differs.

    Signed-off-by: Graeme Gregory
    Reviewed-by: Mark Brown
    Signed-off-by: Samuel Ortiz

    Graeme Gregory
     
  • Avoid to use constraint name in regulator driver. So use regulator id is used
    instead in platform driver.

    Signed-off-by: Haojian Zhuang
    Cc: Liam Girdwood
    Acked-by: Mark Brown
    Signed-off-by: Samuel Ortiz

    Haojian Zhuang
     
  • Since regulator[0] is always checking in mfd driver, it results in
    registration failure without regulator[0].

    Signed-off-by: Haojian Zhuang
    Reviewed-by: Mark Brown
    Signed-off-by: Samuel Ortiz

    Haojian Zhuang
     
  • i2c_client parameter isn't used in some functions. Just remove it.

    Signed-off-by: Haojian Zhuang
    Signed-off-by: Samuel Ortiz

    Haojian Zhuang
     
  • Maybe multiple PMIC devices are installed into one board. Static variable
    can only make driver logic mess. So remove these variable, and use
    platform data from platform driver instead.

    Signed-off-by: Haojian Zhuang
    Signed-off-by: Samuel Ortiz

    Haojian Zhuang
     
  • Enable rtc function in 88pm860x PMIC.

    Signed-off-by: Haojian Zhuang
    Cc: Alessandro Zummo
    Signed-off-by: Samuel Ortiz

    Haojian Zhuang