11 Jan, 2012

40 commits

  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: Wire-up new system calls
    microblaze: Remove NO_IRQ from architecture
    input: xilinx_ps2: Don't use NO_IRQ
    block: xsysace: Don't use NO_IRQ
    microblaze: Trivial asm fix
    microblaze: Fix debug message in module
    microblaze: Remove eprintk macro
    microblaze: Send CR before LF for early console
    microblaze: Change NO_IRQ to 0
    microblaze: Use irq_of_parse_and_map for timer
    microblaze: intc: Change variable name
    microblaze: Use of_find_compatible_node for timer and intc
    microblaze: Add __cmpdi2
    microblaze: Synchronize __pa __va macros

    Linus Torvalds
     
  • * 'unicore32' of git://github.com/gxt/linux:
    rtc-puv3: solve section mismatch in rtc-puv3.c
    rtc-puv3: using module_platform_driver()
    i2c-puv3: using module_platform_driver()
    rtc-puv3: irq: remove IRQF_DISABLED
    unicore32: Remove IRQF_DISABLED
    unicore32: Use set_current_blocked()
    unicore32: add ioremap_nocache definition
    unicore32: delete specified xlate_dev_mem_ptr
    of: add include asm/setup.h in drivers/of/fdt.c
    unicore32: standardize /proc/iomem "Kernel code" name

    Linus Torvalds
     
  • Andrew elucidates:
    - First installmeant of MM. We have a HUGE number of MM patches this
    time. It's crazy.
    - MAINTAINERS updates
    - backlight updates
    - leds
    - checkpatch updates
    - misc ELF stuff
    - rtc updates
    - reiserfs
    - procfs
    - some misc other bits

    * akpm: (124 commits)
    user namespace: make signal.c respect user namespaces
    workqueue: make alloc_workqueue() take printf fmt and args for name
    procfs: add hidepid= and gid= mount options
    procfs: parse mount options
    procfs: introduce the /proc//map_files/ directory
    procfs: make proc_get_link to use dentry instead of inode
    signal: add block_sigmask() for adding sigmask to current->blocked
    sparc: make SA_NOMASK a synonym of SA_NODEFER
    reiserfs: don't lock root inode searching
    reiserfs: don't lock journal_init()
    reiserfs: delay reiserfs lock until journal initialization
    reiserfs: delete comments referring to the BKL
    drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range
    drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030
    drivers/rtc/: remove redundant spi driver bus initialization
    drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static
    drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static
    rtc: convert drivers/rtc/* to use module_platform_driver()
    drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()
    drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler
    ...

    Linus Torvalds
     
  • Commit f44f7f96a20a ("RTC: Initialize kernel state from RTC") introduced a
    potential infinite loop. If an alarm time contains a wildcard month and
    an invalid day (> 31), or a wildcard year and an invalid month (>= 12),
    the loop searching for the next matching date will never terminate. Treat
    the invalid values as wildcards.

    Fixes ,

    Reported-by: leo weppelman
    Reported-by: "P. van Gaans"
    Signed-off-by: Ben Hutchings
    Signed-off-by: Jonathan Nieder
    Cc: Mark Brown
    Cc: Marcelo Roberto Jimenez
    Cc: Thomas Gleixner
    Cc: John Stultz
    Acked-by: Alessandro Zummo
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Hutchings
     
  • Add the DT support for the TI rtc-twl present in the twl4030 and twl6030
    devices.

    Signed-off-by: Benoit Cousson
    Acked-by: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Benoit Cousson
     
  • In ancient times it was necessary to manually initialize the bus field of
    an spi_driver to spi_bus_type. These days this is done in
    spi_driver_register(), so we can drop the manual assignment.

    The patch was generated using the following coccinelle semantic patch:
    //
    @@
    identifier _driver;
    @@
    struct spi_driver _driver = {
    .driver = {
    - .bus = &spi_bus_type,
    },
    };
    //

    Signed-off-by: Lars-Peter Clausen
    Cc: John Stultz
    Cc: Alessandro Zummo
    Cc: Grant Likely
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Lars-Peter Clausen
     
  • Signed-off-by: Axel Lin
    Cc: Lars-Peter Clausen
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Signed-off-by: Axel Lin
    Acked-by: Uwe Kleine-König
    Cc: Alessandro Zummo
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • This patch converts the drivers in drivers/rtc/* to use the
    module_platform_driver() macro which makes the code smaller and a bit
    simpler.

    Signed-off-by: Axel Lin
    Acked-by: Mark Brown
    Acked-by: Mike Frysinger
    Acked-by: Guan Xuetao
    Acked-by: Linus Walleij
    Acked-by: Haojian Zhuang
    Cc: Alessandro Zummo
    Cc: Srinidhi Kasagar
    Cc: Lars-Peter Clausen
    Cc: Ben Dooks
    Cc: John Stultz
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Marginally less code and eliminate the possibility of memory leaks.

    Signed-off-by: Mark Brown
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Brown
     
  • Due to changes in the RTC core the period interrupt is now unused so
    delete the code managing it.

    Signed-off-by: Mark Brown
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Brown
     
  • The rtc_calibration attribute allows user-space to get and set the
    AB8500's RtcCalibration register. The AB8500 will then use the value in
    this register to compensate for RTC drift every 60 seconds.

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Mark Godfrey
    Signed-off-by: Linus Walleij
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Godfrey
     
  • The resolution of msleep is related to HZ, so with HZ set to 100 any
    msleep of less than 10ms will become ~10ms. This is not what we want.
    Use the hrtimer-based usleep_range() and allow for some slack in the
    non-critical path so we have more control of what is happening here.

    Signed-off-by: Linus Walleij
    Cc: Jonas Aaberg
    Cc: Alessandro Zummo
    Cc: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Linus Walleij
     
  • Set can_wake flag so wakealarm property is visible in sysfs.

    Signed-off-by: Andrew Lynn
    Reviewed-by: Jonas ABERG
    Signed-off-by: Linus Walleij
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Lynn
     
  • We want this driver to be able to wake up the system.

    Signed-off-by: Robert Marklund
    Signed-off-by: Linus Walleij
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robert Marklund
     
  • Fix alarm IRQ handling, make the alarm one-shot. Cleanup black magick
    with a validation of already validated time data.

    Add ability to wake the system with alarm.

    [akpm@linux-foundation.org: fix CONFIG_PM=n build]
    Signed-off-by: Yauhen Kharuzhy
    Cc: Daniel Mack
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yauhen Kharuzhy
     
  • There is no way to track year in the i.MX1 RTC: Days Counter register is
    9-bit wide only. Attempt to save date after 1970-01-01 plus 512 days
    causes endless loop in mxc_rtc_set_mmss(). Fix this by resetting year to
    1970.

    [akpm@linux-foundation.org: use conventional comment layout]
    Signed-off-by: Yauhen Kharuzhy
    Cc: Daniel Mack
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yauhen Kharuzhy
     
  • Fix writing to NVRAM bank 2 in rtc-cmos driver. It never worked since its
    introduction in 2.6.28 because of a typo.

    Signed-off-by: Ondrej Zary
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ondrej Zary
     
  • Saves a small amount of code and systematically eliminates leaks.

    Signed-off-by: Mark Brown
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Brown
     
  • Saves a small amount of code and systematically eliminates leaks.

    Signed-off-by: Mark Brown
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Brown
     
  • The LED id begins from 0. Thus the maximum number of leds should be
    MC13783_LED_MAX + 1.

    Signed-off-by: Axel Lin
    Acked-by: Philippe Retornaz
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • TI's TCA6507 is the LED driver in the GTA04 Openmoko motherboard. The
    driver provides full support for brightness levels and hardware blinking.

    This driver can drive each of 7 outputs as an LED or a GPIO output,
    and provides hardware-assist blinking.

    [akpm@linux-foundation.org: fix __mod_i2c_device_table alias]
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: NeilBrown
    Cc: Richard Purdie
    Cc: Randy Dunlap
    Cc: Dan Carpenter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    NeilBrown
     
  • Use gpio_request_one() instead of multiple gpiolib calls. This also
    simplifies error handling a bit.

    Signed-off-by: Axel Lin
    Cc: Simon Guinot
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Use gpio_request_one() instead of multiple gpiolib calls.

    Signed-off-by: Axel Lin
    Cc: Kim Kyuwon
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Signed-off-by: Axel Lin
    Cc: Samu Onkalo
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Factor out some boilerplate code for spi driver registration into
    module_spi_driver.

    Signed-off-by: Axel Lin
    Cc: Haojian Zhuang
    Cc: Mark Brown
    Cc: Richard Purdie
    Cc: Michael Hennerich
    Cc: Mike Rapoport
    Acked-by: Guennadi Liakhovetski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Factor out some boilerplate code for i2c driver registration
    into module_i2c_driver.

    Signed-off-by: Axel Lin
    Cc: Haojian Zhuang
    Cc: Mark Brown
    Cc: Richard Purdie
    Cc: Michael Hennerich
    Cc: Mike Rapoport
    Cc: Guennadi Liakhovetski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Factor out some boilerplate code for platform driver registration into
    module_platform_driver.

    Signed-off-by: Axel Lin
    Acked-by: Haojian Zhuang [led-88pm860x.c]
    Acked-by: Mark Brown
    Cc: Richard Purdie
    Cc: Michael Hennerich
    Cc: Mike Rapoport
    Cc: Guennadi Liakhovetski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Should be no functional changes, mainly a reorganisation to support future
    work.

    [akpm@linux-foundation.org: fix CONFIG_PM=n build]
    Signed-off-by: Mark Brown
    Cc: Richard Purdie
    Cc: Florian Tobias Schandinat
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Brown
     
  • Saves some error handling code and eliminates a class of leaks.

    Signed-off-by: Mark Brown
    Cc: Richard Purdie
    Cc: Florian Tobias Schandinat
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Brown
     
  • The usage of simple_strtoul() or strict_strtoul() is not preferred. Thus,
    kstrtoul should be used.

    This patch also fixes checkpatch error as follows:
    ERROR: space required after that ',' (ctx:VxV)

    Signed-off-by: Jingoo Han
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • module.h is included twice.

    Signed-off-by: Jingoo Han
    Acked-by: H Hartley Sweeten
    Cc: Ryan Mallon
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • This patch supports regulator power control in the driver. Current ld9040
    driver was controlled power on/off sequence by callback function in the
    board file. But, by doing this, there's no need to register lcd power
    on/off callback function in the board file.

    Signed-off-by: Donghwa Lee
    Signed-off-by: Kyungmin Park
    Signed-off-by: Inki Dae
    Cc: Richard Purdie
    Cc: Florian Tobias Schandinat
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Donghwa Lee
     
  • Convert the drivers in drivers/video/backlight/* to use the
    module_platform_driver() macro which makes the code smaller and a bit
    simpler.

    Signed-off-by: Axel Lin
    Acked-by: Haojian Zhuang
    Acked-by: H Hartley Sweeten [ep93xx_bl.c]
    Cc: Mike Rapoport
    Cc: Richard Purdie
    Acked-by: Michael Hennerich
    Acked-by: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Support for the Avionic Design Xanthos backlight device got added in
    commit 3b96ea9ef8 ("backlight: Add support for the Avionic Design Xanthos
    backlight device."). That support depends on ARCH_PXA_ADX. The code that
    should have provided that Kconfig symbol never got submitted. It has
    never been possible to even build this driver. Remove it.

    Signed-off-by: Paul Bolle
    Acked-by: Thierry Reding
    Cc: Richard Purdie
    Cc: Wim Van Sebroeck
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul Bolle
     
  • * 'linux-next' of git://git.infradead.org/ubifs-2.6:
    UBI: fix use-after-free on error path
    UBI: fix missing scrub when there is a bit-flip
    UBIFS: Use kmemdup rather than duplicating its implementation

    Linus Torvalds
     
  • MTD pull for 3.3

    * tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
    mtd: Fix dependency for MTD_DOC200x
    mtd: do not use mtd->block_markbad directly
    logfs: do not use 'mtd->block_isbad' directly
    mtd: introduce mtd_can_have_bb helper
    mtd: do not use mtd->suspend and mtd->resume directly
    mtd: do not use mtd->lock, unlock and is_locked directly
    mtd: do not use mtd->sync directly
    mtd: harmonize mtd_writev usage
    mtd: do not use mtd->lock_user_prot_reg directly
    mtd: mtd->write_user_prot_reg directly
    mtd: do not use mtd->read_*_prot_reg directly
    mtd: do not use mtd->get_*_prot_info directly
    mtd: do not use mtd->read_oob directly
    mtd: mtdoops: do not use mtd->panic_write directly
    romfs: do not use mtd->get_unmapped_area directly
    mtd: do not use mtd->get_unmapped_area directly
    mtd: do use mtd->point directly
    mtd: introduce mtd_has_oob helper
    mtd: mtdcore: export symbols cleanup
    mtd: clean-up the default_mtd_writev function
    ...

    Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (53 commits)
    iommu/amd: Set IOTLB invalidation timeout
    iommu/amd: Init stats for iommu=pt
    iommu/amd: Remove unnecessary cache flushes in amd_iommu_resume
    iommu/amd: Add invalidate-context call-back
    iommu/amd: Add amd_iommu_device_info() function
    iommu/amd: Adapt IOMMU driver to PCI register name changes
    iommu/amd: Add invalid_ppr callback
    iommu/amd: Implement notifiers for IOMMUv2
    iommu/amd: Implement IO page-fault handler
    iommu/amd: Add routines to bind/unbind a pasid
    iommu/amd: Implement device aquisition code for IOMMUv2
    iommu/amd: Add driver stub for AMD IOMMUv2 support
    iommu/amd: Add stat counter for IOMMUv2 events
    iommu/amd: Add device errata handling
    iommu/amd: Add function to get IOMMUv2 domain for pdev
    iommu/amd: Implement function to send PPR completions
    iommu/amd: Implement functions to manage GCR3 table
    iommu/amd: Implement IOMMUv2 TLB flushing routines
    iommu/amd: Add support for IOMMUv2 domain mode
    iommu/amd: Add amd_iommu_domain_direct_map function
    ...

    Linus Torvalds
     
  • * 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (307 commits)
    drm/nouveau/pm: fix build with HWMON off
    gma500: silence gcc warnings in mid_get_vbt_data()
    drm/ttm: fix condition (and vs or)
    drm/radeon: double lock typo in radeon_vm_bo_rmv()
    drm/radeon: use after free in radeon_vm_bo_add()
    drm/sis|via: don't return stack garbage from free_mem ioctl
    drm/radeon/kms: remove pointless CS flags priority struct
    drm/radeon/kms: check if vm is supported in VA ioctl
    drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)
    radeon: Fix disabling PCI bus mastering on big endian hosts.
    ttm: fix agp since ttm tt rework
    agp: Fix multi-line warning message whitespace
    drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don't try to free freed pages.
    drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.
    drm/radeon/kms: sync across multiple rings when doing bo moves v3
    drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)
    drm/radeon: GPU virtual memory support v22
    drm: make DRM_UNLOCKED ioctls with their own mutex
    drm: no need to hold global mutex for static data
    drm/radeon/benchmark: common modes sweep ignores 640x480@32
    ...

    Fix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
    Input: tc3589x-keypad - add missing kerneldoc
    Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages
    Input: ucb1400_ts - convert to threaded IRQ
    Input: ucb1400_ts - drop inline annotations
    Input: usb1400_ts - add __devinit/__devexit section annotations
    Input: ucb1400_ts - set driver owner
    Input: ucb1400_ts - convert to use dev_pm_ops
    Input: psmouse - make sure we do not use stale methods
    Input: evdev - do not block waiting for an event if fd is nonblock
    Input: evdev - if no events and non-block, return EAGAIN not 0
    Input: evdev - only allow reading events if a full packet is present
    Input: add driver for pixcir i2c touchscreens
    Input: samsung-keypad - implement runtime power management support
    Input: tegra-kbc - report wakeup key for some platforms
    Input: tegra-kbc - add device tree bindings
    Input: add driver for AUO In-Cell touchscreens using pixcir ICs
    Input: mpu3050 - configure the sampling method
    Input: mpu3050 - ensure we enable interrupts
    Input: mpu3050 - add of_match table for device-tree probing
    Input: sentelic - document the latest hardware
    ...

    Fix up fairly trivial conflicts (device tree matching conflicting with
    some independent cleanups) in drivers/input/keyboard/samsung-keypad.c

    Linus Torvalds