1. 01 Mar, 2013 38 commits
    • Joachim Eastwood's avatar
      watchdog: at91rm9200: add DT support · a6a1bcd3
      Joachim Eastwood authored
      Add DT support for at91rm9200_wdt.
      Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      a6a1bcd3
    • Fabio Porcedda's avatar
      watchdog: add timeout-sec property binding · c1fd5f64
      Fabio Porcedda authored
      this patchset add the timeout-sec property to the following drivers:
      orion_wdt, pnx4008_wdt, s3c2410_wdt and at91sam9_wdt.
      
      The at91sam9_wdt is tested on evk-pr3,
      the other drivers are compile tested only.
      Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
      Cc: Andrew Lunn <andrew@lunn.ch>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Wolfram Sang <w.sang@pengutronix.de>
      Cc: Masanari Iida <standby24x7@gmail.com>
      Cc: Ben Dooks <ben-linux@fluff.org>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Cc: Andrew Victor <linux@maxim.org.za>
      Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      c1fd5f64
    • Wenyou Yang's avatar
      watchdog: at91sam9_wdt: Convert to use the watchdog framework · 490ac7af
      Wenyou Yang authored
      According to Documentation/watchdog/convert_drivers_to_kernel_api.txt,
      remove the file_operations struct, miscdevice, and obsolete includes
      
      Since the at91sam watchdog inherent characteristics, add the watchdog
      operations: at91wdt_start, at91wdt_stop and at91wdt_ping.
      Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Cc: linux-watchdog@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      490ac7af
    • Pali Rohár's avatar
      watchdog: omap_wdt: Add option nowayout · 2dd7b244
      Pali Rohár authored
      Like other watchdog drivers, this patch adds new option nowayout
      which overwrite WATCHDOG_NOWAYOUT.
      Signed-off-by: default avatarPali Rohar <pali.rohar@gmail.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      2dd7b244
    • Fabio Porcedda's avatar
      watchdog: core: dt: add support for the timeout-sec dt property · 3048253e
      Fabio Porcedda authored
      Add support for watchdog drivers to initialize/set the timeout field
      of the watchdog_device structure. The timeout field is initialised
      either with the module timeout parameter value (if valid) or with the
      timeout-sec dt property (if valid). If both are invalid the initial
      value is unchanged.
      Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      3048253e
    • Hauke Mehrtens's avatar
      watchdog: bcm47xx_wdt.c: add hard timer · e3e83d00
      Hauke Mehrtens authored
      The more recent devices have a watchdog timer which could be configured
      for over 2 hours and not just 2 seconds like the first generation
      devices. For those devices do not use the extra software timer, but
      directly program the time into the register. This will automatically be
      used if the timer supports more than a minute.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      e3e83d00
    • Hauke Mehrtens's avatar
      watchdog: bcm47xx_wdt.c: rename wdt_time to timeout · 93aed1f0
      Hauke Mehrtens authored
      Rename wdt_time to timeout to name it like the other watchdog
      driver do it.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      93aed1f0
    • Hauke Mehrtens's avatar
      watchdog: bcm47xx_wdt.c: rename ops methods · a3906892
      Hauke Mehrtens authored
      Rename the methods registered to struct watchdog_ops bcm47xx_wdt_ops in
      order to add an other struct watchdog_ops using different ops in the
      next patch.
      Also rename WDT_MAX_TIME to WDT_SOFTTIMER_MAX.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      a3906892
    • Hauke Mehrtens's avatar
      watchdog: bcm47xx_wdt.c: use platform device · f82dedf8
      Hauke Mehrtens authored
      Instead of accessing the function to set the watchdog timer directly,
      register a platform driver the platform could register to use this
      watchdog driver.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      f82dedf8
    • Hauke Mehrtens's avatar
      watchdog: bcm47xx_wdt.c: convert to watchdog core api · 5434a04d
      Hauke Mehrtens authored
      Convert the bcm47xx_wdt.c driver to the new watchdog core api.
      
      The nowayout parameter is now added unconditionally to the module.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      5434a04d
    • Guenter Roeck's avatar
    • Jingoo Han's avatar
      watchdog: s3c2410_wdt: Use devm_* functions · 04ecc7dc
      Jingoo Han authored
      Use devm_* functions to make cleanup paths more simple.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      04ecc7dc
    • Wolfram Sang's avatar
      watchdog: remove old STMP3xxx driver · e4504dab
      Wolfram Sang authored
      Now that the new driver is in place, we can remove the old one.
      Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      e4504dab
    • Wolfram Sang's avatar
      watchdog: add new driver for STMP3xxx and i.MX23/28 · de6303ab
      Wolfram Sang authored
      Replace the existing STMP3xxx driver because it has enough drawbacks
      that a rewrite is apropriate. The new driver is designed to use the
      watchdog framework which makes it a lot smaller and avoids open coding
      the watchdog API again. It also uses now an explicitly exported function
      from the RTC driver to set up its registers (the old driver silently
      reused the hopefully(!) already remapped RTC registers). Also, this
      driver is mach independent, while the old one depends on a mach replaced
      by another one a year ago. Since the user interface is still the
      standard watchdog API, users don't need to adapt.
      Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      de6303ab
    • Wolfram Sang's avatar
      rtc: stmp3xxx: add wdt-accessor function · 1a71fb84
      Wolfram Sang authored
      This RTC also includes a watchdog timer. Provide an accessor function
      for setting the watchdog timeout value which will be picked up by a
      watchdog driver. Also register the platform_device for the watchdog here
      to get the boot-time dependencies right.
      Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
      Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      1a71fb84
    • Aaro Koskinen's avatar
      watchdog: introduce retu_wdt driver · 3d3a6d18
      Aaro Koskinen authored
      Introduce Retu watchdog driver.
      
      Cc: linux-watchdog@vger.kernel.org
      Acked-by: default avatarFelipe Balbi <balbi@ti.com>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      3d3a6d18
    • Wim Van Sebroeck's avatar
      watchdog: intel_scu_watchdog: fix Kconfig dependency · d1ec74ab
      Wim Van Sebroeck authored
      Kernel symbol X86_MRST has been removed from the kernel.
      INTEL_SCU_WATCHDOG driver can never be compiled due dependence of X86_MRST
      which remained in the drivers/watchdog/Kconfig.
      Reported-by: default avatarAlexander Shiyan <shc_work@mail.ru>
      Cc: Alan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      d1ec74ab
    • Lubomir Rintel's avatar
      watchdog: orion_wdt: Add platform alias · f3ea733e
      Lubomir Rintel authored
      ...so that it's automatically picked up on relevant platforms.
      Tested on Kirkwood-based GuruPlug.
      Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      f3ea733e
    • Gabor Juhos's avatar
      watchdog: ath79_wdt: add device tree matching · 15920d12
      Gabor Juhos authored
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: devicetree-discuss@lists.ozlabs.org
      Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      15920d12
    • Gabor Juhos's avatar
      watchdog: ath79_wdt: get register base from platform device's resources · 09f5100a
      Gabor Juhos authored
      The ath79_wdt driver uses a fixed memory address
      currently. Although this is working with each
      currently supported SoCs, but this may change
      in the future. Additionally, the driver includes
      platform specific header files in order to be
      able to get the memory base of the watchdog
      device.
      
      The patch adds a memory resource to the platform
      device, and converts the driver to get the base
      address of the watchdog device from that.
      Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      09f5100a
    • Gabor Juhos's avatar
      MIPS: ath79: use dynamically allocated watchdog device · 0f2ad9ed
      Gabor Juhos authored
      Remove the static watchdog device variable and use
      the 'platform_device_register_simple' helper to
      allocate and register the device in one step.
      
      This allows us to save a few bytes in the kernel image.
      Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      0f2ad9ed
    • Gabor Juhos's avatar
      watchdog: ath79_wdt: convert to use devm_clk_get · 5071a884
      Gabor Juhos authored
      Use the managed version of clk_get. This allows to
      simplify the probe/remove functions a bit.
      Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      5071a884
    • Takahisa Tanaka's avatar
      watchdog: sp5100_tco: Write back the original value to reserved bits, instead of zero · 41adafbd
      Takahisa Tanaka authored
      In case of SP5100 or SB7x0 chipsets, the sp5100_tco module writes zero to
      reserved bits. The module, however, shouldn't depend on specific default
      value, and should perform a read-merge-write operation for the reserved
      bits.
      
      This patch makes the sp5100_tco module perform a read-merge-write operation
      on all the chipset (sp5100, sb7x0, sb8x0 or later).
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43176Signed-off-by: default avatarTakahisa Tanaka <mc74hc00@gmail.com>
      Tested-by: default avatarPaul Menzel <paulepanter@users.sourceforge.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Cc: stable <stable@vger.kernel.org>
      41adafbd
    • Takahisa Tanaka's avatar
      watchdog: sp5100_tco: Fix wrong indirect I/O access for getting value of reserved bits · 10ab329b
      Takahisa Tanaka authored
      In case of SB800 or later chipset and re-programming MMIO address(*),
      sp5100_tco module may read incorrect value of reserved bit, because the module
      reads a value from an incorrect I/O address. However, this bug doesn't cause
      a problem, because when re-programming MMIO address, by chance the module
      writes zero (this is BIOS's default value) to the low three bits of register.
      * In most cases, PC with SB8x0 or later chipset doesn't need to re-programming
        MMIO address, because such PC can enable AcpiMmio and can use 0xfed80b00 for
        watchdog register base address.
      
      This patch fixes this bug.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43176Signed-off-by: default avatarTakahisa Tanaka <mc74hc00@gmail.com>
      Tested-by: default avatarPaul Menzel <paulepanter@users.sourceforge.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Cc: stable <stable@vger.kernel.org>
      10ab329b
    • Devendra Naga's avatar
      watchdog: gef_wdt.c: add missing remove callback · 67371765
      Devendra Naga authored
      this module missed a remove callback in the platform ops.
      Signed-off-by: default avatarDevendra Naga <devendra.aaru@gmail.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      67371765
    • Arnd Bergmann's avatar
      watchdog: at91sam9: at91_wdt_dt_ids cannot be __init · 6c41e474
      Arnd Bergmann authored
      The device IDs are referenced by the driver and potentially
      used beyond the init time, as kbuild correctly warns
      about. Remove the __initconst annotation.
      
      Without this patch, building at91_dt_defconfig results in:
      
      WARNING: drivers/watchdog/built-in.o(.data+0x28): Section mismatch in reference from the variable at91wdt_driver to the (unknown reference) .init.rodata:(unknown)
      The variable at91wdt_driver references
      the (unknown reference) __initconst (unknown)
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Tested-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Cc: linux-watchdog@vger.kernel.org
      6c41e474
    • Randy Dunlap's avatar
      watchdog: da9055_wdt needs to select WATCHDOG_CORE · 12a5c05c
      Randy Dunlap authored
      DA9055_WATCHDOG (introduced in v3.8) needs to select WATCHDOG_CORE so that it will
      build cleanly.  Fixes these build errors:
      
      da9055_wdt.c:(.text+0xe9bc7): undefined reference to `watchdog_unregister_device'
      da9055_wdt.c:(.text+0xe9f4b): undefined reference to `watchdog_register_device'
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: David Dajun Chen <dchen@diasemi.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Cc: linux-watchdog@vger.kernel.org
      Cc: stable <stable@vger.kernel.org>
      12a5c05c
    • Linus Torvalds's avatar
      Merge tag 'lzo-update-signature-20130226' of git://github.com/markus-oberhumer/linux · b0af9cd9
      Linus Torvalds authored
      Pull LZO compression update from Markus Oberhumer:
       "Summary:
        ========
      
        Update the Linux kernel LZO compression and decompression code to the
        current upstream version which features significant performance
        improvements on modern machines.
      
        Some *synthetic* benchmarks:
        ============================
      
          x86_64 (Sandy Bridge), gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :         150 MB/sec          468 MB/sec
          LZO-2012    :         434 MB/sec         1210 MB/sec
      
          i386 (Sandy Bridge), gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :         143 MB/sec          409 MB/sec
          LZO-2012    :         372 MB/sec         1121 MB/sec
      
          armv7 (Cortex-A9), Linaro gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :          27 MB/sec           84 MB/sec
          LZO-2012    :          44 MB/sec          117 MB/sec
        **LZO-2013-UA :          47 MB/sec          167 MB/sec
      
        Legend:
      
          LZO-2005    : LZO version in current 3.8 kernel (which is based on
                           the LZO 2.02 release from 2005)
          LZO-2012    : updated LZO version available in linux-next
        **LZO-2013-UA : updated LZO version available in linux-next plus experimental
                           ARM Unaligned Access patch. This needs approval
                           from some ARM maintainer ist NOT YET INCLUDED."
      
      Andrew Morton <akpm@linux-foundation.org> acks it and says:
       "There's a new LZ4 on the block which is even faster than the sped-up
        LZO, but various filesystems and things use LZO"
      
      * tag 'lzo-update-signature-20130226' of git://github.com/markus-oberhumer/linux:
        crypto: testmgr - update LZO compression test vectors
        lib/lzo: Update LZO compression to current upstream version
        lib/lzo: Rename lzo1x_decompress.c to lzo1x_decompress_safe.c
      b0af9cd9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 1e500597
      Linus Torvalds authored
      Pull one kvm bugfix from Gleb Natapov.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        x86/kvm: Fix pvclock vsyscall fixmap
      1e500597
    • Linus Torvalds's avatar
      Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · ad6c2c2e
      Linus Torvalds authored
      Pull EDAC fixes and ghes-edac from Mauro Carvalho Chehab:
       "For:
      
         - Some fixes at edac drivers (i7core_edac, sb_edac, i3200_edac);
         - error injection support for i5100, when EDAC debug is enabled;
         - fix edac when it is loaded builtin (early init for the subsystem);
         - a "Firmware First" EDAC driver, allowing ghes to report errors via
           EDAC (ghes-edac).
      
        With regards to ghes-edac, this fixes a longstanding BZ at Red Hat
        that happens with Nehalem and Sandy Bridge CPUs: when both GHES and
        i7core_edac or sb_edac are running, the error reports are
        unpredictable, as both BIOS and OS race to access the registers.  With
        ghes-edac, the EDAC core will refuse to register any other concurrent
        memory error driver.
      
        This patchset moves the ghes struct definitions to a separate header
        file (include/acpi/ghes.h) and adds 3 hooks at apei/ghes.c to
        register/unregister and to report errors via ghes-edac.  Those changes
        were acked by ghes driver maintainer (Huang)."
      
      * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (30 commits)
        i5100_edac: convert to use simple_open()
        ghes_edac: fix to use list_for_each_entry_safe() when delete list items
        ghes_edac: Fix RAS tracing
        ghes_edac: Make it compliant with UEFI spec 2.3.1
        ghes_edac: Improve driver's printk messages
        ghes_edac: Don't credit the same memory dimm twice
        ghes_edac: do a better job of filling EDAC DIMM info
        ghes_edac: add support for reporting errors via EDAC
        ghes_edac: Register at EDAC core the BIOS report
        ghes: add the needed hooks for EDAC error report
        ghes: move structures/enum to a header file
        edac: add support for error type "Info"
        edac: add support for raw error reports
        edac: reduce stack pressure by using a pre-allocated buffer
        edac: lock module owner to avoid error report conflicts
        edac: remove proc_name from mci structure
        edac: add a new memory layer type
        edac: initialize the core earlier
        edac: better report error conditions in debug mode
        i5100_edac: Remove two checkpatch warnings
        ...
      ad6c2c2e
    • Linus Torvalds's avatar
      Fix mis-merge of intel_powerclamp.c resulting in compile error · 19cc90f5
      Linus Torvalds authored
      The new intel_powerclamp thermal cooling device driver was merged in
      commit 2af78448 (Pull thermal management updates from Zhang Rui)
      without any data conflicts.  But there was a more subtle conflict I
      missed: the driver uses MAX_USER_RT_PRIO, but commit 8bd75c77
      ("sched/rt: Move rt specific bits into new header file") had moved that
      define from <linux/sched.h> to <linux/sched/rt.h>.
      
      Which caused this build failure:
      
        drivers/thermal/intel_powerclamp.c: In function ‘clamp_thread’:
        drivers/thermal/intel_powerclamp.c:360:21: error: ‘MAX_USER_RT_PRIO’ undeclared (first use in this function)
        drivers/thermal/intel_powerclamp.c:360:21: note: each undeclared identifier is reported only once for each function it appears in
      
      And because I don't do a full "make allmodconfig" build after each pull,
      I didn't notice until too late.  So now the fix is here, separately from
      the merge commit.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      19cc90f5
    • Linus Torvalds's avatar
      Merge tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1a32c58b
      Linus Torvalds authored
      Pull ARM SoC mvebu platform changes from Olof Johansson:
       "This series contains changes for the Marvell EBU platforms (mvebu,
        orion, kirkwood, dove) that were not part of the first set of pull
        requests because of dependencies on the MMC tree, and being submitted
        a little late.
      
        Notable changes are:
      
         - More devices get moved out of board files into device tree
           descriptions.  The remaining devices listed in there have patches
           that will get sent for 3.10, after which we can remove a lot of the
           board files entirely.  We are doing the pinctrl and mmc drivers
           here, ethernet and PCI still remain.
      
         - SMP support for mvebu is improved with support for the local
           interrupt controller.
      
         - The Guruplug board file gets replaced with a DT description.
      
        Unfortunately, the dependency on the MMC tree turned out to be a much
        larger problem than expected, when the MMC maintainer rebased the
        patches in his tree that all of the patches in this branch are based
        on, which caused merge conflicts between the new and old versions of
        those patches.
      
        To work around the merge conflicts, this branch rebases all patches on
        top of the respective MMC patches that did get merged into 3.9.  The
        patches are all identical to the versions that were part of
        linux-next, but have a new commit date."
      
      * tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (90 commits)
        arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
        ARM: kirkwood: topkick: init mvsdio via DT
        ARM: kirkwood: nsa310: convert to pinctrl
        ARM: Kirkwood: topkick: Enable i2c bus.
        ARM: kirkwood: topkick: convert to pinctrl
        ARM: dove: convert serial DT nodes to clocks property
        arm: mvebu: Add SPI flash on Armada 370 DB board
        arm: mvebu: Add SPI flash on Armada XP-DB board
        arm: mvebu: Add SPI flash on Armada XP-GP board
        arm: mvebu: Add support for SPI controller in Armada 370/XP
        clocksource: update and move armada-370-xp-timer documentation to timer directory
        arm: mvebu: update DT to support local timers
        ARM: Dove: convert usb host controller to DT
        arm: mvebu: Enable USB controllers on Armada 370/XP boards
        arm: mvebu: Add support for USB host controllers in Armada 370/XP
        arm: mvebu: add button for OpenBlocks AX3-4
        ARM: Kirkwood: Convert NS2 to gpio-poweroff.
        ARM: Kirkwood: Convert NSA310 I2C to device tree
        ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
        ARM: Kirkwood: Convert NSA310 to DT based regulators.
        ...
      1a32c58b
    • Linus Torvalds's avatar
      Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7307c00f
      Linus Torvalds authored
      Pull ARM SoC late OMAP changes from Olof Johansson:
       "This branch contains changes for OMAP that came in late during the
        release staging, close to when the merge window opened.
      
        It contains, among other things:
      
         - OMAP PM fixes and some patches for audio device integration
         - OMAP clock fixes related to common clock conversion
         - A set of patches cleaning up WFI entry and blocking.
         - A set of fixes and IP block support for PM on TI AM33xx SoCs
           (Beaglebone, etc)
         - A set of smaller fixes and cleanups around AM33xx restart and
           revision detection, as well as removal of some dead code
           (CONFIG_32K_TIMER_HZ)"
      
      * tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
        ARM: omap2: include linux/errno.h in hwmod_reset
        ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
        ARM: OMAP4: hwmod data: Enable AESS hwmod device
        ARM: OMAP4: hwmod data: Update AESS data with memory bank area
        ARM: OMAP4+: AESS: enable internal auto-gating during initial setup
        ASoC: TI AESS: add autogating-enable function, callable from architecture code
        ARM: OMAP2+: hwmod: add enable_preprogram hook
        ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb
        ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
        ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug
        ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags
        ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem
        ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries
        ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3
        ARM: OMAP2+: AM33XX: Update the hardreset API
        ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit
        ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry
        ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags
        ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod
        ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files
        ...
      7307c00f
    • Linus Torvalds's avatar
      Merge tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f8f466c8
      Linus Torvalds authored
      Pull ARM SoC i.MX DT changes from Olof Johansson:
       "This branch contains of devicetree changes for the Freescale i.MX
        platform.
      
        The base patch of the branch changes the format of the dts files to a
        slightly different format that makes it easier to do derivative board
        definitions, but it also introduces a lot of churn in the process
        since every line of the file is touched.
      
        On top of that are a handful of the regular changes; enabling more
        boards as DT-based instead of legacy board files (mx25pdk), enabling
        another driver for devicetree and thus adding bindings (onewire), etc.
      
        I'm not happy about the churn, and will likely not take it for other
        platforms in the future."
      
      * tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
        ARM: dts: add dtsi for imx6q and imx6dl
        ARM: dts: rename imx6q.dtsi to imx6qdl.dtsi
        ARM: dts: i.MX6: Add regulator delay support
        ARM: dts: Add device tree entry for onewire master on i.MX53
        ARM: i.MX53: Add clocks for i.mx53 onewire master.
        W1: Add device tree support to MXC onewire master.
        ARM: imx: enable imx6q-cpufreq support
        ARM: dts: Add apf51 basic support
        ARM i.MX6: change mxs usbphy clock usage
        ARM: dts: imx6q: Remove silicon version from SDMA firmware
        ARM i.MX53: dts: add oftree for MBa53 baseboard
        ARM i.MX53: add dts for the TQ tqma53 module
        ARM: dts: imx53: pinctrl update
        ARM i.MX51 babbage: Add keypad support
        ARM: dts: imx: Add imx51 KPP entry
        ARM: dts: imx25-karo-tx25: Put status entry in the end
        ARM: mx25pdk: Add device tree support
        ARM: dts: imx: use nodes label in board dts
        ARM: dts: add missing imx dtb targets
        ARM: boot: dts: Add an entry for imx27-pdk.dtb
        ...
      f8f466c8
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2af78448
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "Highlights:
      
         - introduction of Dove thermal sensor driver.
      
         - introduction of Kirkwood thermal sensor driver.
      
         - introduction of intel_powerclamp thermal cooling device driver.
      
         - add interrupt and DT support for rcar thermal driver.
      
         - add thermal emulation support which allows platform thermal driver
           to do software/hardware emulation for thermal issues."
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)
        thermal: rcar: remove __devinitconst
        thermal: return an error on failure to register thermal class
        Thermal: rename thermal governor Kconfig option to avoid generic naming
        thermal: exynos: Use the new thermal trend type for quick cooling action.
        Thermal: exynos: Add support for temperature falling interrupt.
        Thermal: Dove: Add Themal sensor support for Dove.
        thermal: Add support for the thermal sensor on Kirkwood SoCs
        thermal: rcar: add Device Tree support
        thermal: rcar: remove machine_power_off() from rcar_thermal_notify()
        thermal: rcar: add interrupt support
        thermal: rcar: add read/write functions for common/priv data
        thermal: rcar: multi channel support
        thermal: rcar: use mutex lock instead of spin lock
        thermal: rcar: enable CPCTL to use hardware TSC deciding
        thermal: rcar: use parenthesis on macro
        Thermal: fix a build warning when CONFIG_THERMAL_EMULATION cleared
        Thermal: fix a wrong comment
        thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation
        PM: intel_powerclamp: off by one in start_power_clamp()
        thermal: exynos: Miscellaneous fixes to support falling threshold interrupt
        ...
      2af78448
    • Linus Torvalds's avatar
      Merge tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf · 5e04f4b4
      Linus Torvalds authored
      Pull dma-buf framework updates from Sumit Semwal:
       "Refcounting implemented for vmap in core dma-buf"
      
      * tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
        CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap
        dma-buf: implement vmap refcounting in the interface logic
      5e04f4b4
    • Linus Torvalds's avatar
      Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux · b6669737
      Linus Torvalds authored
      Pull nfsd changes from J Bruce Fields:
       "Miscellaneous bugfixes, plus:
      
         - An overhaul of the DRC cache by Jeff Layton.  The main effect is
           just to make it larger.  This decreases the chances of intermittent
           errors especially in the UDP case.  But we'll need to watch for any
           reports of performance regressions.
      
         - Containerized nfsd: with some limitations, we now support
           per-container nfs-service, thanks to extensive work from Stanislav
           Kinsbursky over the last year."
      
      Some notes about conflicts, since there were *two* non-data semantic
      conflicts here:
      
       - idr_remove_all() had been added by a memory leak fix, but has since
         become deprecated since idr_destroy() does it for us now.
      
       - xs_local_connect() had been added by this branch to make AF_LOCAL
         connections be synchronous, but in the meantime Trond had changed the
         calling convention in order to avoid a RCU dereference.
      
      There were a couple of more obvious actual source-level conflicts due to
      the hlist traversal changes and one just due to code changes next to
      each other, but those were trivial.
      
      * 'for-3.9' of git://linux-nfs.org/~bfields/linux: (49 commits)
        SUNRPC: make AF_LOCAL connect synchronous
        nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum
        svcrpc: fix rpc server shutdown races
        svcrpc: make svc_age_temp_xprts enqueue under sv_lock
        lockd: nlmclnt_reclaim(): avoid stack overflow
        nfsd: enable NFSv4 state in containers
        nfsd: disable usermode helper client tracker in container
        nfsd: use proper net while reading "exports" file
        nfsd: containerize NFSd filesystem
        nfsd: fix comments on nfsd_cache_lookup
        SUNRPC: move cache_detail->cache_request callback call to cache_read()
        SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function
        SUNRPC: rework cache upcall logic
        SUNRPC: introduce cache_detail->cache_request callback
        NFS: simplify and clean cache library
        NFS: use SUNRPC cache creation and destruction helper for DNS cache
        nfsd4: free_stid can be static
        nfsd: keep a checksum of the first 256 bytes of request
        sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer
        sunrpc: fix comment in struct xdr_buf definition
        ...
      b6669737
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 1cf0209c
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "A few groups of patches here.  Alex has been hard at work improving
        the RBD code, layout groundwork for understanding the new formats and
        doing layering.  Most of the infrastructure is now in place for the
        final bits that will come with the next window.
      
        There are a few changes to the data layout.  Jim Schutt's patch fixes
        some non-ideal CRUSH behavior, and a set of patches from me updates
        the client to speak a newer version of the protocol and implement an
        improved hashing strategy across storage nodes (when the server side
        supports it too).
      
        A pair of patches from Sam Lang fix the atomicity of open+create
        operations.  Several patches from Yan, Zheng fix various mds/client
        issues that turned up during multi-mds torture tests.
      
        A final set of patches expose file layouts via virtual xattrs, and
        allow the policies to be set on directories via xattrs as well
        (avoiding the awkward ioctl interface and providing a consistent
        interface for both kernel mount and ceph-fuse users)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (143 commits)
        libceph: add support for HASHPSPOOL pool flag
        libceph: update osd request/reply encoding
        libceph: calculate placement based on the internal data types
        ceph: update support for PGID64, PGPOOL3, OSDENC protocol features
        ceph: update "ceph_features.h"
        libceph: decode into cpu-native ceph_pg type
        libceph: rename ceph_pg -> ceph_pg_v1
        rbd: pass length, not op for osd completions
        rbd: move rbd_osd_trivial_callback()
        libceph: use a do..while loop in con_work()
        libceph: use a flag to indicate a fault has occurred
        libceph: separate non-locked fault handling
        libceph: encapsulate connection backoff
        libceph: eliminate sparse warnings
        ceph: eliminate sparse warnings in fs code
        rbd: eliminate sparse warnings
        libceph: define connection flag helpers
        rbd: normalize dout() calls
        rbd: barriers are hard
        rbd: ignore zero-length requests
        ...
      1cf0209c
  2. 28 Feb, 2013 2 commits
    • Linus Torvalds's avatar
      Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux · de1a2262
      Linus Torvalds authored
      Pull writeback fixes from Wu Fengguang:
       "Two writeback fixes
      
         - fix negative (setpoint - dirty) in 32bit archs
      
         - use down_read_trylock() in writeback_inodes_sb(_nr)_if_idle()"
      
      * tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
        Negative (setpoint-dirty) in bdi_position_ratio()
        vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them
      de1a2262
    • Linus Torvalds's avatar
      Merge branch 'for-3.9/drivers' of git://git.kernel.dk/linux-block · f042fea0
      Linus Torvalds authored
      Pull block driver bits from Jens Axboe:
       "After the block IO core bits are in, please grab the driver updates
        from below as well.  It contains:
      
         - Fix ancient regression in dac960.  Nobody must be using that
           anymore...
      
         - Some good fixes from Guo Ghao for loop, fixing both potential
           oopses and deadlocks.
      
         - Improve mtip32xx for NUMA systems, by being a bit more clever in
           distributing work.
      
         - Add IBM RamSan 70/80 driver.  A second round of fixes for that is
           pending, that will come in through for-linus during the 3.9 cycle
           as per usual.
      
         - A few xen-blk{back,front} fixes from Konrad and Roger.
      
         - Other minor fixes and improvements."
      
      * 'for-3.9/drivers' of git://git.kernel.dk/linux-block:
        loopdev: ignore negative offset when calculate loop device size
        loopdev: remove an user triggerable oops
        loopdev: move common code into loop_figure_size()
        loopdev: update block device size in loop_set_status()
        loopdev: fix a deadlock
        xen-blkback: use balloon pages for persistent grants
        xen-blkfront: drop the use of llist_for_each_entry_safe
        xen/blkback: Don't trust the handle from the frontend.
        xen-blkback: do not leak mode property
        block: IBM RamSan 70/80 driver fixes
        rsxx: add slab.h include to dma.c
        drivers/block/mtip32xx: add missing GENERIC_HARDIRQS dependency
        block: remove new __devinit/exit annotations on ramsam driver
        block: IBM RamSan 70/80 device driver
        drivers/block/mtip32xx/mtip32xx.c:1726:5: sparse: symbol 'mtip_send_trim' was not declared. Should it be static?
        drivers/block/mtip32xx/mtip32xx.c:4029:1: sparse: symbol 'mtip_workq_sdbf0' was not declared. Should it be static?
        dac960: return success instead of -ENOTTY
        mtip32xx: add trim support
        mtip32xx: Add workqueue and NUMA support
        block: delete super ancient PC-XT driver for 1980's hardware
      f042fea0