1. 15 Nov, 2013 10 commits
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of... · 6886059f
      Olof Johansson authored
      Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Few clock fixes, a runtime PM fix, and pinctrl-single fix along
      with few other fixes that popped up during the merge window.
      
      * tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
        ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
        doc: devicetree: Add bindings documentation for omap-des driver
        ARM: dts: doc: Document missing compatible property for omap-sham driver
        ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
        ARM: OMAP: devicetree: fix SPI node compatible property syntax items
        pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
        ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
        + sync with newer trunk
      6886059f
    • Olof Johansson's avatar
      Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91 into fixes · ca439c9b
      Olof Johansson authored
      From Nicolas Ferre, fixes for early boot hangs on at91:
      
      Fixes for RTT & RTC interrupts that can fire early during boot process
      and kill the system.
      
      * tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
        ARM: at91: fix hanged boot due to early rtt-interrupt
        ARM: at91: fix hanged boot due to early rtc-interrupt
      ca439c9b
    • Tony Lindgren's avatar
      ARM: OMAP2+: Fix build for dra7xx without omap4 and 5 · 26273e02
      Tony Lindgren authored
      Otherwise we can get errors like:
      
      arch/arm/mach-omap2/prm44xx.c:274: error: redefinition of ‘omap44xx_prm_reconfigure_io_chain’
      arch/arm/mach-omap2/built-in.o: In function `default_finish_suspend':
      arch/arm/mach-omap2/omap-mpuss-lowpower.c:95: undefined reference to `omap_do_wfi'
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      26273e02
    • Nishanth Menon's avatar
      ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume · 3522bf7b
      Nishanth Menon authored
      OMAP device hooks around suspend|resume_noirq ensures that hwmod
      devices are forced to idle using omap_device_idle/enable as part of
      the last stage of suspend activity.
      
      For a device such as i2c who uses autosuspend, it is possible to enter
      the suspend path with dev->power.runtime_status = RPM_ACTIVE.
      
      As part of the suspend flow, the generic runtime logic would increment
      it's dev->power.disable_depth to 1. This should prevent further
      pm_runtime_get_sync from succeeding once the runtime_status has been
      set to RPM_SUSPENDED.
      
      Now, as part of the suspend_noirq handler in omap_device, we force the
      following: if the device status is !suspended, we force the device
      to idle using omap_device_idle (clocks are cut etc..). This ensures
      that from a hardware perspective, the device is "suspended". However,
      runtime_status is left to be active.
      
      *if* an operation is attempted after this point to
      pm_runtime_get_sync, runtime framework depends on runtime_status to
      indicate accurately the device status, and since it sees it to be
      ACTIVE, it assumes the module is functional and returns a non-error
      value. As a result the user will see pm_runtime_get succeed, however a
      register access will crash due to the lack of clocks.
      
      To prevent this from happening, we should ensure that runtime_status
      exactly indicates the device status. As a result of this change
      any further calls to pm_runtime_get* would return -EACCES (since
      disable_depth is 1). On resume, we restore the clocks and runtime
      status exactly as we suspended with. These operations are not expected
      to fail as we update the states after the core runtime framework has
      suspended itself and restore before the core runtime framework has
      resumed.
      
      Cc: stable@vger.kernel.org # v3.4+
      Reported-by: default avatarJ Keerthy <j-keerthy@ti.com>
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      Acked-by: default avatarRajendra Nayak <rnayak@ti.com>
      Acked-by: default avatarKevin Hilman <khilman@linaro.org>
      Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      3522bf7b
    • Joel Fernandes's avatar
      doc: devicetree: Add bindings documentation for omap-des driver · 31844434
      Joel Fernandes authored
      Add documentation for the generic OMAP DES crypto modul describing the device
      tree bindings.
      Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
      Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: default avatarJoel Fernandes <joelf@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      31844434
    • Lokesh Vutla's avatar
      ARM: dts: doc: Document missing compatible property for omap-sham driver · cd6d364f
      Lokesh Vutla authored
      A new compatible property "ti,omap5-sham" is added to the omap-sham driver
      recently to support SHA/MD5 for OMAP5,DRA7 and AM43XX. Documenting the
      same.
      Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      cd6d364f
    • Wei Yongjun's avatar
      ARM: OMAP3: Beagle: fix return value check in beagle_opp_init() · c27f2de7
      Wei Yongjun authored
      In case of error, the function get_cpu_device() returns NULL pointer
      not ERR_PTR(). The IS_ERR() test in the return value check should be
      replaced with NULL test.
      Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      c27f2de7
    • Johan Hovold's avatar
      ARM: at91: fix hanged boot due to early rtt-interrupt · 94c4c79f
      Johan Hovold authored
      Make sure the RTT-interrupts are masked at boot by adding a new helper
      function to be used at SOC-init.
      
      This fixes hanged boot on all AT91 SOCs with an RTT, for example, if an
      RTT-alarm goes off after a non-clean shutdown (e.g. when using RTC
      wakeup).
      
      The RTC and RTT-peripherals are powered by backup power (VDDBU) (on all
      AT91 SOCs but RM9200) and are not reset on wake-up, user, watchdog or
      software reset. This means that their interrupts may be enabled during
      early boot if, for example, they where not disabled during a previous
      shutdown (e.g. due to a buggy driver or a non-clean shutdown such as a
      user reset). Furthermore, an RTC or RTT-alarm may also be active.
      
      The RTC and RTT-interrupts use the shared system-interrupt line, which
      is also used by the PIT, and if an interrupt occurs before a handler
      (e.g. RTC-driver) has been installed this leads to the system interrupt
      being disabled and prevents the system from booting.
      
      Note that when boot hangs due to an early RTC or RTT-interrupt, the only
      way to get the system to start again is to remove the backup power (e.g.
      battery) or to disable the interrupt manually from the bootloader. In
      particular, a user reset is not sufficient.
      Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Cc: stable@vger.kernel.org # 3.11.x
      94c4c79f
    • Johan Hovold's avatar
      ARM: at91: fix hanged boot due to early rtc-interrupt · 6de714c2
      Johan Hovold authored
      Make sure the RTC-interrupts are masked at boot by adding a new helper
      function to be used at SOC-init.
      
      This fixes hanged boot on all AT91 SOCs with an RTC (but RM9200), for
      example, after a reset during an RTC-update or if an RTC-alarm goes off
      after shutdown (e.g. when using RTC wakeup).
      
      The RTC and RTT-peripherals are powered by backup power (VDDBU) (on all
      AT91 SOCs but RM9200) and are not reset on wake-up, user, watchdog or
      software reset. This means that their interrupts may be enabled during
      early boot if, for example, they where not disabled during a previous
      shutdown (e.g. due to a buggy driver or a non-clean shutdown such as a
      user reset). Furthermore, an RTC or RTT-alarm may also be active.
      
      The RTC and RTT-interrupts use the shared system-interrupt line, which
      is also used by the PIT, and if an interrupt occurs before a handler
      (e.g. RTC-driver) has been installed this leads to the system interrupt
      being disabled and prevents the system from booting.
      
      Note that when boot hangs due to an early RTC or RTT-interrupt, the only
      way to get the system to start again is to remove the backup power (e.g.
      battery) or to disable the interrupt manually from the bootloader. In
      particular, a user reset is not sufficient.
      Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Cc: stable@vger.kernel.org # 3.11.x
      6de714c2
    • Olof Johansson's avatar
      video: exynos_mipi_dsim: Remove unused variable · ba52b7d4
      Olof Johansson authored
      commit 7e0be9f9 ('video: exynos_mipi_dsim:
      Use the generic PHY driver') resulted in a warning about an unused
      variable:
      
      drivers/video/exynos/exynos_mipi_dsi.c:144:26: warning: unused variable
          'pdev' [-Wunused-variable]
      
      It is indeed unused; remove it.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
      Acked-by: default avatarInki Dae <inki.dae@samsung.com>
      ba52b7d4
  2. 14 Nov, 2013 9 commits
  3. 12 Nov, 2013 21 commits
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 10d0c970
      Linus Torvalds authored
      Pull devicetree updates from Rob Herring:
       "DeviceTree updates for 3.13.  This is a bit larger pull request than
        usual for this cycle with lots of clean-up.
      
         - Cross arch clean-up and consolidation of early DT scanning code.
         - Clean-up and removal of arch prom.h headers.  Makes arch specific
           prom.h optional on all but Sparc.
         - Addition of interrupts-extended property for devices connected to
           multiple interrupt controllers.
         - Refactoring of DT interrupt parsing code in preparation for
           deferred probe of interrupts.
         - ARM cpu and cpu topology bindings documentation.
         - Various DT vendor binding documentation updates"
      
      * tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (82 commits)
        powerpc: add missing explicit OF includes for ppc
        dt/irq: add empty of_irq_count for !OF_IRQ
        dt: disable self-tests for !OF_IRQ
        of: irq: Fix interrupt-map entry matching
        MIPS: Netlogic: replace early_init_devtree() call
        of: Add Panasonic Corporation vendor prefix
        of: Add Chunghwa Picture Tubes Ltd. vendor prefix
        of: Add AU Optronics Corporation vendor prefix
        of/irq: Fix potential buffer overflow
        of/irq: Fix bug in interrupt parsing refactor.
        of: set dma_mask to point to coherent_dma_mask
        of: add vendor prefix for PHYTEC Messtechnik GmbH
        DT: sort vendor-prefixes.txt
        of: Add vendor prefix for Cadence
        of: Add empty for_each_available_child_of_node() macro definition
        arm/versatile: Fix versatile irq specifications.
        of/irq: create interrupts-extended property
        microblaze/pci: Drop PowerPC-ism from irq parsing
        of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
        of/irq: Use irq_of_parse_and_map()
        ...
      10d0c970
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · 85b656cf
      Linus Torvalds authored
      Pull LED subsystem changes from Bryan Wu:
       "LED subsystem updates for 3.13 are basically cleanup and also add a
        new driver for PCA9685"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
        leds: lp55xx: handle enable pin in driver
        leds-gpio: of: led should not be created if its status is disabled
        of: introduce of_get_available_child_count
        leds: Added driver for the NXP PCA9685 I2C chip
        leds: pwm: Remove redundant of_match_ptr
        leds: Include linux/of.h header
        leds: dac124s085: Remove redundant spi_set_drvdata
        leds: lp55xx: enable setting default trigger
        leds: blinkm: Remove redundant break
      85b656cf
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus-3.13' of git://git.linaro.org/people/mturquette/linux · 2b684c07
      Linus Torvalds authored
      Pull clock framework changes from Mike Turquette:
       "The clock changes for 3.13 are an even mix of framework improvements &
        bug fixes along with updates to existing clock drivers and the
        additional of new clock drivers"
      
      * tag 'clk-for-linus-3.13' of git://git.linaro.org/people/mturquette/linux:
        clk: new driver for efm32 SoC
        clk: of: helper for determining number of parent clocks
        clk/zynq: Fix possible memory leak
        clk: keystone: Build Keystone clock drivers
        clk: keystone: Add gate control clock driver
        clk: keystone: add Keystone PLL clock driver
        Documentation: Add documentation for APM X-Gene clock binding
        clk: arm64: Add DTS clock entry for APM X-Gene Storm SoC
        clk: Add APM X-Gene SoC clock driver
        clk: wm831x: get rid of the implementation of remove function
        clk: Correct lookup logic in clk_fetch_parent_index()
        clk: Use kcalloc() to allocate arrays
        clk: Add error handling to clk_fetch_parent_index()
      2b684c07
    • Linus Torvalds's avatar
      Merge tag 'gpio-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · c2d33069
      Linus Torvalds authored
      Pull GPIO changes from Linus Walleij:
       "Here is the bulk of GPIO changes for the v3.13 development cycle.
      
        I've got ACKs for the things that affect other subsystems (or it's my
        own subsystem, like pinctrl).  Most of that pertain to an attempt from
        my side to consolidate and get rid of custom GPIO implementations in
        the ARM tree.  I will continue doing this.
      
        The main change this time is the new GPIO descriptor API, background
        for this can be found in Corbet's summary from this january in LWN:
      
          http://lwn.net/Articles/533632/
      
        Summary:
      
         - Merged the GPIO descriptor API from Alexandre Courbot.  This is a
           first step toward trying to get rid of the global GPIO numberspace
           for the future.
      
         - Add an API so that driver can flag that a certain GPIO line is
           being used by a irqchip backend for generating IRQs, so that we can
           enforce checks, like not allowing users to switch that line to an
           output at runtime, since this makes no sense.  Implemented
           corresponding calls in a few select drivers.
      
         - ACPI GPIO cleanups, refactorings and switch to using the
           descriptor-based interface.
      
         - Support for the TPS80036 Palmas GPIO variant.
      
         - A new driver for the Broadcom Kona GPIO SoC IP block.
      
         - Device tree support for the PCF857x driver.
      
         - A set of ARM GPIO refactorings with the goal of getting rid of a
           bunch of custom GPIO implementations from the arch/arm/* tree:
      
           * Move the IOP GPIO driver to the GPIO subsystem and fix all users
             to use the gpiolib API for accessing GPIOs.  Delete the old
             custom GPIO implementation.
      
           * Delete the unused custom PXA GPIO implemention.
      
           * Convert all users of the IXP4 custom GPIO implementation to use
             gpiolib and delete the custom implementation.
      
           * Delete the custom Gemini GPIO implementation, also completely
             unused.
      
         - Various cleanups and renamings"
      
      * tag 'gpio-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (85 commits)
        gpio: gpio-mxs: Remove unneeded dt checks
        gpio: pl061: don't depend on CONFIG_ARM
        gpio: bcm-kona: add missing .owner to struct gpio_chip
        gpiolib: provide a declaration of seq_file in gpio/driver.h
        gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio()
        gpio: provide stubs for devres gpio functions
        gpiolib: devres: add missing headers
        gpiolib: make GPIO_DEVRES depend on GPIOLIB
        gpiolib: devres: fix devm_gpiod_get_index()
        gpiolib / ACPI: document the GPIO descriptor based interface
        gpiolib / ACPI: allow passing GPIOF_ACTIVE_LOW for GpioInt resources
        gpiolib / ACPI: add ACPI support for gpiod_get_index()
        gpiolib / ACPI: convert to gpiod interfaces
        gpiolib: add gpiod_get() and gpiod_put() functions
        gpiolib: port of_ functions to use gpiod
        gpiolib: export descriptor-based GPIO interface
        Fixup "MAINTAINERS: GPIO-INTEL-MID: add maintainer"
        gpio: bcm281xx: Don't print addresses of GPIO area in probe()
        gpio: tegra: use new gpio_lock_as_irq() API
        gpio: rcar: Include linux/of.h header
        ...
      c2d33069
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-for-v3.13-1' of... · 8a5dc585
      Linus Torvalds authored
      Merge tag 'pinctrl-for-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
      
      Pull pin control updates from Linus Walleij:
       "Main pin control pull request for the v3.13 cycle.
      
        The changes hitting arch/blackfin are ACKed by the Blackfin
        maintainer, and the device tree bindings are ACKed to the extent
        possible by someone from the device tree maintainers group.
      
         - Blackfin ADI pin control driver, we move yet another architecture
           under this subsystem umbrella.
      
         - Incremental updates to the Renesas Super-H PFC pin control driver.
           New subdriver for the r8a7791 SoC.
      
         - Non-linear GPIO ranges from the gpiolib side of things, this
           enabled simplified device tree bindings by referring entire groups
           of pins on some pin controller to act as back-end for a certain
           GPIO-chip driver.
      
         - Add the Abilis TB10x pin control driver used on the ARC
           architecture.  Also the corresponding GPIO driver is merged through
           this tree, so the ARC has full support for pins and GPIOs after
           this.
      
         - Subdrivers for Freescale i.MX1, i.MX27 and i.MX50 pin controller
           instances.  The i.MX1 and i.MX27 is an entirely new family
           (silicon) of controllers whereas i.MX50 is a variant of the
           previous supported controller.
      
         - Then the usual slew of fixes, cleanups and incremental updates"
      
      The ARC DT changes are apparently still pending, that hopefully gets
      sorted out in a timely manner.
      
      * tag 'pinctrl-for-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (48 commits)
        pinctrl: imx50: add pinctrl support code for the IMX50 SoC
        pinctrl: at91: copy define to driver
        pinctrl: remove minor dead code
        pinctrl: imx: fix using pin->input_val wrongly
        pinctrl: imx1: fix return value check in imx1_pinctrl_core_probe()
        gpio: tb10x: fix return value check in tb10x_gpio_probe()
        gpio: tb10x: use module_platform_driver to simplify the code
        pinctrl: imx27: imx27 pincontrol driver
        pinctrl: imx1 core driver
        pinctrl: sh-pfc: r8a7791 PFC support
        sh-pfc: r8a7778: Add CAN pin groups
        gpio: add TB10x GPIO driver
        pinctrl: at91: correct a few typos
        pinctrl: mvebu: remove redundant of_match_ptr
        pinctrl: tb10x: use module_platform_driver to simplify the code
        pinctrl: tb10x: fix the error handling in tb10x_pinctrl_probe()
        pinctrl: add documentation for pinctrl_get_group_pins()
        pinctrl: rockchip: emulate both edge triggered interrupts
        pinctrl: rockchip: add rk3188 specifics
        pinctrl: rockchip: remove redundant check
        ...
      8a5dc585
    • Linus Torvalds's avatar
      Merge tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · eeab517b
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "There are no too intrusive changes in this update batch.  The biggest
        LOC is found in the new DICE driver, and other small changes are
        scattered over the whole sound subtree (which is a common pattern).
      
        Below are highlights:
      
         - ALSA core:
           * Memory allocation support with genpool
           * Fix blocking in drain ioctl of compress_offload
      
         - HD-audio:
           * Improved AMD HDMI supports
           * Intel HDMI detection improvements
           * thinkpad_acpi mute-key integration
           * New PCI ID, New ALC255,285,293 codecs, CX20952
      
         - USB-audio:
           * New buffer size management
           * Clean up endpoint handling codes
      
         - ASoC:
           * Further work on the dmaengine helpers, including support for
             configuring the parameters for DMA by reading the capabilities of
             the DMA controller which removes some guesswork and magic numbers
             from drivers.
           * A refresh of the documentation.
           * Conversions of many drivers to direct regmap API usage in order
             to allow the ASoC level register I/O code to be removed, this
             will hopefully be completed by v3.14.
           * Support for using async register I/O in DAPM, reducing the time
             taken to implement power transitions on systems that support it.
      
         - Firewire: DICE driver
      
         - Lots of small fixes for bugs reported by Coverity"
      
      * tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (382 commits)
        ALSA: hda/realtek - Add new codec ALC255/ALC3234 UAJ supported
        ALSA: hda - Apply MacBook fixups for CS4208 correctly
        ASoC: fsl: imx-wm8962: remove an unneeded check
        ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
        ALSA: hda/realtek - Make fixup regs persist after resume
        ALSA: hda_intel: ratelimit "spurious response" message
        ASoC: generic-dmaengine-pcm: Use SNDRV_DMA_TYPE_DEV_IRAM as default
        ASoC: dapm: Use WARN_ON() instead of BUG_ON()
        ASoC: wm_adsp: Fix BUG_ON() and WARN_ON() usages
        ASoC: Replace BUG() with WARN()
        ASoC: wm_hubs: Replace BUG() with WARN()
        ASoC: wm8996: Replace BUG() with WARN()
        ASoC: wm8962: Replace BUG() with WARN()
        ASoC: wm8958: Replace BUG() with WARN()
        ASoC: wm8904: Replace BUG() with WARN()
        ASoC: wm8900: Replace BUG() with WARN()
        ASoC: wm8350: Replace BUG() with WARN()
        ASoC: txx9: Use WARN_ON() instead of BUG_ON()
        ASoC: sh: Use WARN_ON() instead of BUG_ON()
        ASoC: rcar: Use WARN_ON() instead of BUG_ON()
        ...
      eeab517b
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · f095ca6b
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "As well as the usual driver updates and cleanups there's a few
        improvements to the core here:
      
         - The start of some improvements to factor out more of the SPI
           message loop into the core.  Right now this is just simplifying the
           code a bit but hopefully next time around we'll also have managed
           to roll out some noticable performance improvements which drivers
           can take advantage of.
         - Support for loading modules for ACPI enumerated SPI devices.
         - Managed registration for SPI controllers.
         - Helper for another common I/O pattern"
      
      * tag 'spi-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (116 commits)
        spi/hspi: add device tree support
        spi: atmel: fix return value check in atmel_spi_probe()
        spi: spi-imx: only enable the clocks when we start to transfer a message
        spi/s3c64xx: Fix doubled clock disable on suspend
        spi/s3c64xx: Do not ignore return value of spi_master_resume/suspend
        spi: spi-mxs: Use u32 instead of uint32_t
        spi: spi-mxs: Don't set clock for each xfer
        spi: spi-mxs: Clean up setup_transfer function
        spi: spi-mxs: Remove check of spi mode bits
        spi: spi-mxs: Fix race in setup method
        spi: spi-mxs: Remove bogus setting of ssp clk rate field
        spi: spi-mxs: Remove full duplex check, spi core already does it
        spi: spi-mxs: Fix chip select control bits in DMA mode
        spi: spi-mxs: Fix extra CS pulses and read mode in multi-transfer messages
        spi: spi-mxs: Change flag arguments in txrx functions to bit flags
        spi: spi-mxs: Always clear INGORE_CRC, to keep CS asserted
        spi: spi-mxs: Remove mxs_spi_enable and mxs_spi_disable
        spi: spi-mxs: Always set LOCK_CS
        spi/s3c64xx: Add missing pm_runtime_put on setup fail
        spi/s3c64xx: Add missing pm_runtime_set_active() call in probe()
        ...
      f095ca6b
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · c6d65bf2
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "Lots of driver updates here plus some nice new core features, the main
        one being the first:
      
         - Enable support for providing a dummy regulator when we know that
           one must exist for the device to be functional.  This makes it much
           easier to add regulator support to drivers since we don't require
           that the machine integration for all systems using the device be
           updated to provide regulators.
         - Substantial reduction in the amount of busy waiting done while
           waiting for enables to complete.
         - Allow MFDs to distribute regulator supplies to child devices so we
           don't have to expose the internal structure of MFDs outside of the
           driver.
         - Managed registeration for regulators"
      
      * tag 'regulator-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (113 commits)
        regulator: s5m8767: Modify parsing method of the voltage table of buck2/3/4
        regulator: s5m8767: Modify parse_dt function to parse data related to ramp
        regulator: da9052: Revert se apply_[reg|bit] with regmap based voltage_sel operations
        mfd: arizona: Specify supply mappings for Arizona CODECs
        mfd: Allow mapping regulator supplies to MFD device from children
        regulator: core: Add ability to create a lookup alias for supply
        regulator: tps65910: Fix checkpatch issue
        regulator: tps65023: Fix checkpatch issue
        regulator: tps6105x: Fix checkpatch issue
        regulator: mc13783: Fix checkpatch issue
        regulator: max8997: Fix checkpatch issue
        regulator: lp3971: Fix checkpatch issue
        regulator: fixed: Fix checkpatch issue
        regulator: anatop: Fix checkpatch issue
        regulator: Add REGULATOR_LINEAR_RANGE macro
        regulator: Remove max_uV from struct regulator_linear_range
        regulator: ti-abb: Fix operator precedence typo
        regulator: tps65910: get regulators node from parent node only
        regulator: tps6586x: get regulators node from parent node only
        regulator: tps65090: get regulators node from parent node only
        ...
      c6d65bf2
    • Linus Torvalds's avatar
      Merge tag 'regmap-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 4fc9ed33
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "The main thing this time around has been some improvments to async
        I/O.
      
         - Cleaned up the async I/O support and extended it to allow single
           register writes more easily.  This is now used where possible for
           internally generated I/O, providing performance improvements for
           devices that can do async I/O.
         - An API for issuing a sequence of register writes as a single
           operation.  Some devices and buses can take advantage of this to do
           the I/O faster.
         - Addition of regmap_field APIs which help drivers for devices with
           repeated IPs or which move registers around between revisions to
           share helpers.
         - Support for SPMI buses"
      
      * tag 'regmap-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: add SPMI support
        regmap: debugfs: Fix a boot time crash with early regmap init
        regmap: irq: clear status when disable irq
        regmap: Only send a single buffer for async I/O if writing one register
        regmap: spi: Handle async writes of only one buffer
        regmap: new API regmap_multi_reg_write() definition
        regmap: Use async I/O during cache sync
        regmap: Use async I/O for patch application
        regmap: Fix regmap_bulk_write single-rw mutex deadlock
        regmap: Provide asynchronous write and update bits operations
        regmap: Simplify the initiation of async I/O
        regmap: Don't generate gather writes for single register raw writes
        regmap: Cache async work structures
        regmap: add helper macro to set min/max range of register
        regmap: Add regmap_fields APIs
        regmap: add regmap_field_update_bits()
      4fc9ed33
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 7e238a2e
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "Introduce new hwmon API functions hwmon_device_register_with_groups
        and devm_hwmon_device_register_with_groups, and convert several
        drivers to use the new API.
      
        Add support for EMC1404, EMC1424, LTC2977, LTC2978A, LM25063 to
        existing drivers
      
        Various cleanups in several drivers"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (49 commits)
        hwmon: (w83793) Clean up a signedness issue
        hwmon: (nct6775) Remove an unused variable
        hwmon: (emc1403) Add support for EMC1404 and EMC1424
        hwmon: (emc1403) Convert to use devm_hwmon_device_register_with_groups
        hwmon: (pmbus/ltc2978): Add support for LTC2978A
        hwmon: (pmbus/ltc2978): Add support for LTC2977
        hwmon: (pmbus/lm25066) Add support for LM25063
        hwmon: Correct some typos
        hwmon: (gpio-fan) Include linux/of.h header
        hwmon: (lm70) Remove redundant spi_set_drvdata
        hwmon: (adcxx) Remove redundant spi_set_drvdata
        hwmon: (jc42) fix coccinelle warnings
        hwmon: (ltc4261) fix coccinelle warnings
        hwmon: (lm95234) fix coccinelle warnings
        hwmon: (max6697) fix coccinelle warnings
        hwmon: (max6642 fix coccinelle warnings
        hwmon: (ds1621) fix coccinelle warnings
        hwmon: (nct6775) fix coccinelle warnings
        hwmon: (jc42) Convert to use devm_hwmon_device_register_with_groups
        hwmon: (ltc4261) Convert to use devm_hwmon_device_register_with_groups
        ...
      7e238a2e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 66a173b9
      Linus Torvalds authored
      Pull powerpc updates from Benjamin Herrenschmidt:
       "The bulk of this is LE updates.  One should now be able to build an LE
        kernel and even run some things in it.
      
        I'm still sitting on a handful of patches to enable the new ABI that I
        *might* still send this merge window around, but due to the
        incertainty (they are pretty fresh) I want to keep them separate.
      
        Other notable changes are some infrastructure bits to better handle
        PCI pass-through under KVM, some bits and pieces added to the new
        PowerNV platform support such as access to the CPU SCOM bus via sysfs,
        and support for EEH error handling on PHB3 (Power8 PCIe).
      
        We also grew arch_get_random_long() for both pseries and powernv when
        running on P7+ and P8, exploiting the HW rng.
      
        And finally various embedded updates from freescale"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (154 commits)
        powerpc: Fix fatal SLB miss when restoring PPR
        powerpc/powernv: Reserve the correct PE number
        powerpc/powernv: Add PE to its own PELTV
        powerpc/powernv: Add support for indirect XSCOM via debugfs
        powerpc/scom: Improve debugfs interface
        powerpc/scom: Enable 64-bit addresses
        powerpc/boot: Properly handle the base "of" boot wrapper
        powerpc/bpf: Support MOD operation
        powerpc/bpf: Fix DIVWU instruction opcode
        of: Move definition of of_find_next_cache_node into common code.
        powerpc: Remove big endianness assumption in of_find_next_cache_node
        powerpc/tm: Remove interrupt disable in __switch_to()
        powerpc: word-at-a-time optimization for 64-bit Little Endian
        powerpc/bpf: BPF JIT compiler for 64-bit Little Endian
        powerpc: Only save/restore SDR1 if in hypervisor mode
        powerpc/pmu: Fix ADB_PMU_LED_IDE dependencies
        powerpc/nvram: Fix endian issue when using the partition length
        powerpc/nvram: Fix endian issue when reading the NVRAM size
        powerpc/nvram: Scan partitions only once
        powerpc/mpc512x: remove unnecessary #if
        ...
      66a173b9
    • Linus Torvalds's avatar
      Merge tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 11db81a5
      Linus Torvalds authored
      Pull microblaze updates from Michal Simek:
       - Get rid of NO_MMU Kconfig
       - mmap2 fixups
       - Some minor cleanups
      
      * tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Remove incorrect file path
        microblaze: Fix bug with mmap2 syscall MB implementation
        microblaze: Use predefined SYSCALL_DEFINE macro
        microblaze: Remove deprecated IRQF_DISABLED
        microblaze: Calculate kernel pad automatically
        microblaze: Remove unused NO_MMU Kconfig parameter
      11db81a5
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 0993537b
      Linus Torvalds authored
      Pull metag architecture changes from James Hogan:
       - A change to remove the last dependence on bootloader exception
         handlers so that QEMU can more easily boot an SMP Linux/Meta kernel
         image directly.
       - A fix for a minor off by one error in a BUG_ON condition found by Dan
         Carpenter.
      
      * tag 'metag-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag: off by one in setup_bootmem_node()
        metag: handle low level kicks directly
      0993537b
    • Linus Torvalds's avatar
      Merge tag 'h8300-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 4b4d2b46
      Linus Torvalds authored
      Pull h8300 platform removal from Guenter Roeck:
       "The patch series has been in -next for more than one relase cycle.  I
        did get a number of Acks, and no objections.
      
        H8/300 has been dead for several years, the kernel for it has not
        compiled for ages, and recent versions of gcc for it are broken.
        Remove support for it"
      
      * tag 'h8300-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        CREDITS: Add Yoshinori Sato for h8300
        fs/minix: Drop dependency on H8300
        Drop remaining references to H8/300 architecture
        Drop MAINTAINERS entry for H8/300
        watchdog: Drop references to H8300 architecture
        net/ethernet: Drop H8/300 Ethernet driver
        net/ethernet: smsc9194: Drop conditional code for H8/300
        ide: Drop H8/300 driver
        Drop support for Renesas H8/300 (h8300) architecture
      4b4d2b46
    • Linus Torvalds's avatar
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9b66bfb2
      Linus Torvalds authored
      Pull x86 UV debug changes from Ingo Molnar:
       "Various SGI UV debuggability improvements, amongst them KDB support,
        with related core KDB enabling patches changing kernel/debug/kdb/"
      
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "x86/UV: Add uvtrace support"
        x86/UV: Add call to KGDB/KDB from NMI handler
        kdb: Add support for external NMI handler to call KGDB/KDB
        x86/UV: Check for alloc_cpumask_var() failures properly in uv_nmi_setup()
        x86/UV: Add uvtrace support
        x86/UV: Add kdump to UV NMI handler
        x86/UV: Add summary of cpu activity to UV NMI handler
        x86/UV: Update UV support for external NMI signals
        x86/UV: Move NMI support
      9b66bfb2
    • Linus Torvalds's avatar
      Merge branch 'x86-uaccess-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c2136301
      Linus Torvalds authored
      Pull x86 uaccess changes from Ingo Molnar:
       "A single change that micro-optimizes __copy_*_user_inatomic(), used by
        the futex code"
      
      * 'x86-uaccess-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Add 1/2/4/8 byte optimization to 64bit __copy_{from,to}_user_inatomic
      c2136301
    • Linus Torvalds's avatar
      Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 986189f9
      Linus Torvalds authored
      Pull x86 reboot changes from Ingo Molnar:
       "Misc changes - the only one with functional impact should be commit
        16c21ae5 ("reboot: Allow specifying warm/cold reset for CF9 boot
        type") which extends cold/warm reboot handling to the 0xCF9 reboot
        method"
      
      * 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()
        x86/reboot: Sort reboot DMI quirks by vendor
        x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list
        reboot: Allow specifying warm/cold reset for CF9 boot type
      986189f9
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2934578e
      Linus Torvalds authored
      Pull x86 platform fixlet from Ingo Molnar:
       "A single __initdata fix"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/geode: Fix incorrect placement of __initdata tag
      2934578e
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2612c49d
      Linus Torvalds authored
      Pull x86 mm fixlet from Ingo Molnar:
       "One cleanup that documents a particular detail in init_mem_mapping()"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Add 'step_size' comments to init_mem_mapping()
      2612c49d
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 340286cd
      Linus Torvalds authored
      Pull x86 RAS changes from Ingo Molnar:
       "The biggest change adds support for Intel 'CPER' (UEFI Common Platform
        Error Record) error logging, which builds upon an enhanced error
        logging mechanism available on Xeon processors.
      
        Full description is here:
      
          http://www.intel.com/content/www/us/en/architecture-and-technology/enhanced-mca-logging-xeon-paper.html
      
        This change provides a module (and support code) to check for an
        extended error log and prints extra details about the error on the
        console"
      
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ACPI, x86: Fix extended error log driver to depend on CONFIG_X86_LOCAL_APIC
        dmi: Avoid unaligned memory access in save_mem_devices()
        Move cper.c from drivers/acpi/apei to drivers/firmware/efi
        EDAC, GHES: Update ghes error record info
        ACPI, APEI, CPER: Cleanup CPER memory error output format
        ACPI, APEI, CPER: Enhance memory reporting capability
        ACPI, APEI, CPER: Add UEFI 2.4 support for memory error
        DMI: Parse memory device (type 17) in SMBIOS
        ACPI, x86: Extended error log driver for x86 platform
        bitops: Introduce a more generic BITMASK macro
        ACPI, CPER: Update cper info
        ACPI, APEI, CPER: Fix status check during error printing
      340286cd
    • Linus Torvalds's avatar
      Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 339a4b72
      Linus Torvalds authored
      Pull x86 iommu changes from Ingo Molnar:
       "Make it easier to turn off the old AMD GART code"
      
      * 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/iommu: Clean up the CONFIG_GART_IOMMU config option a bit
        x86/iommu: Don't make AMD_GART depend on EXPERT and default y
      339a4b72