1. 16 Nov, 2013 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · e0da5c9a
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       - i2c-hid is not querying init reports any more, as it's not mandated
         by the spec, and annoys quite a few devices during enumeration, by
         Bibek Basu
       - a lot of fixes for Logitech devices, by Simon Wood
       - hid-apple now has an option to switch between Option and Command
         mode, by Nanno Langstraat
       - Some more workarounds for severely broken ELO devices, by Oliver
         Neukum
       - more devm conversions, by Benjamin Tissoires
       - wiimote correctness fixes, by David Herrmann
       - a lot of added support for various new device IDs and random small
         fixes here and there"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits)
        HID: enable Mayflash USB Gamecube Adapter
        HID: sony: Add force feedback support for Dualshock3 USB
        Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
        HID: don't ignore eGalax/D-Wav/EETI HIDs
        HID: roccat: add missing special driver declarations
        HID:hid-lg4ff: Correct Auto-center strength for wheels other than MOMO and MOMO2
        HID:hid-lg4ff: Initialize device properties before we touch autocentering.
        HID:hid-lg4ff: ensure ConstantForce is disabled when set to 0
        HID:hid-lg4ff: Switch autocentering off when strength is set to zero.
        HID:hid-lg4ff: Scale autocentering force properly on Logitech wheel
        HID: roccat: fix Coverity CID 141438
        HID: multitouch: add manufacturer to Kconfig help text
        HID: logitech-dj: small cleanup in rdcat()
        HID: remove self-assignment from hid_input_report
        HID: hid-sensor-hub: fix report size
        HID: i2c-hid: Stop querying for init reports
        HID: roccat: add support for Ryos MK keyboards
        HID: roccat: generalize some common code
        HID: roccat: add new device return value
        HID: wiimote: add pro-controller analog stick calibration
        ...
      e0da5c9a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 9073e1a8
      Linus Torvalds authored
      Pull trivial tree updates from Jiri Kosina:
       "Usual earth-shaking, news-breaking, rocket science pile from
        trivial.git"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
        doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
        doc: add missing files to timers/00-INDEX
        timekeeping: Fix some trivial typos in comments
        mm: Fix some trivial typos in comments
        irq: Fix some trivial typos in comments
        NUMA: fix typos in Kconfig help text
        mm: update 00-INDEX
        doc: Documentation/DMA-attributes.txt fix typo
        DRM: comment: `halve' -> `half'
        Docs: Kconfig: `devlopers' -> `developers'
        doc: typo on word accounting in kprobes.c in mutliple architectures
        treewide: fix "usefull" typo
        treewide: fix "distingush" typo
        mm/Kconfig: Grammar s/an/a/
        kexec: Typo s/the/then/
        Documentation/kvm: Update cpuid documentation for steal time and pv eoi
        treewide: Fix common typo in "identify"
        __page_to_pfn: Fix typo in comment
        Correct some typos for word frequency
        clk: fixed-factor: Fix a trivial typo
        ...
      9073e1a8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4937e2a6
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "Updates for the input subsystem.  You will get an new drivers for
        Hyper-V synthetic keyboard and for Neonode zForce touchscreens, plus a
        bunch of driver fixes and cleanups"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (49 commits)
        Revert "Input: ALPS - add support for model found on Dell XT2"
        arm: dts: am335x sk: add touchscreen support
        Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding
        Input: cyttsp4 - replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
        Input: mma8450 - add missing i2c_set_clientdata() in mma8450_probe()
        Input: mpu3050 - add missing i2c_set_clientdata() in mpu3050_probe()
        Input: tnetv107x-keypad - make irqs signed for error handling
        Input: add driver for Neonode zForce based touchscreens
        Input: sh_keysc - enable the driver on all ARM platforms
        Input: remove a redundant max() call
        Input: mousedev - allow disabling even without CONFIG_EXPERT
        Input: allow deselecting serio drivers even without CONFIG_EXPERT
        Input: i8042 - add PNP modaliases
        Input: evdev - fall back to vmalloc for client event buffer
        Input: cypress_ps2 - do not consider data bad if palm is detected
        Input: cypress_ps2 - remove useless cast
        Input: fix PWM-related undefined reference errors
        Input: ALPS - change secondary device's name
        Input: wacom - not all multi-interface devices support touch
        Input: nspire-keypad - add missing clk_disable_unprepare() on error path
        ...
      4937e2a6
    • Linus Torvalds's avatar
      Merge tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next · db0b2d01
      Linus Torvalds authored
      Pull MFD updates from Samuel Ortiz:
       "For the 3.13 merge window we have a couple of new drivers for the AMS
        AS3722 PMIC and for STMicroelectronics STw481x PMIC.
      
        Although this is a smaller update than usual, we also have:
      
         - Device tree support for the max77693 driver
      
         - linux/of.h inclusion for all DT compatible MFD drivers, to avoid
           build breakage in the future
      
         - Support for Intel Wildcat Point-LP PCH through the lpc_ich driver
      
         - A small arizona update for new wm5110 DSP registers and a few fixes
      
         - A small palmas update as well, including an of_device table
           addition and a few minor fixes
      
         - Two small mfd-core changes, one including a memory leak fix for
           when mfd_add_device() fails
      
         - Our usual round of minor cleanups and janitorial fixes"
      
      * tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (63 commits)
        Documentation: mfd: Update s2mps11.txt
        mfd: pm8921: Potential NULL dereference in pm8921_remove()
        mfd: Fix memory leak in mfd_add_devices()
        mfd: Stop setting refcounting pointers in original mfd_cell arrays
        mfd: wm5110: Enable micd clamp functionality
        mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH
        mfd: max77693: Fix up bug of wrong interrupt number
        mfd: as3722: Don't export the regmap config
        mfd: twl6040: Remove obsolete cleanup for i2c clientdata
        mfd: tps65910: Remove warning during dt node parsing
        mfd: lpc_sch: Ignore resource conflicts when adding mfd cells
        mfd: ti_am335x_tscadc: Avoid possible deadlock of reg_lock
        mfd: syscon: Return -ENOSYS if CONFIG_MFD_SYSCON is not enabled
        mfd: Add support for ams AS3722 PMIC
        mfd: max77693: Include linux/of.h header
        mfd: tc3589x: Detect the precise version
        mfd: omap-usb: prepare/unprepare clock while enable/disable
        mfd: max77686: Include linux/of.h header
        mfd: max8907: Include linux/of.h header
        mfd: max8997: Include linux/of.h header
        ...
      db0b2d01
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 16cd9d1c
      Linus Torvalds authored
      Pull hwmon fixes and updates from Jean Delvare:
       "All lm90 driver fixes and improvements"
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        Documentation: dt: hwmon: Add OF document for LM90
        hwmon: (lm90) Add power control
        hwmon: (lm90) Add support for TI TMP451
        hwmon: (lm90) Use enums for the indexes of temp8 and temp11
        hwmon: (lm90) Add support to handle IRQ
        hwmon: (lm90) Define status bits
        hwmon: (lm90) Fix max6696 alarm handling
      16cd9d1c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · f412f2c6
      Linus Torvalds authored
      Pull second round of block driver updates from Jens Axboe:
       "As mentioned in the original pull request, the bcache bits were pulled
        because of their dependency on the immutable bio vecs.  Kent re-did
        this part and resubmitted it, so here's the 2nd round of (mostly)
        driver updates for 3.13.  It contains:
      
       - The bcache work from Kent.
      
       - Conversion of virtio-blk to blk-mq.  This removes the bio and request
         path, and substitutes with the blk-mq path instead.  The end result
         almost 200 deleted lines.  Patch is acked by Asias and Christoph, who
         both did a bunch of testing.
      
       - A removal of bootmem.h include from Grygorii Strashko, part of a
         larger series of his killing the dependency on that header file.
      
       - Removal of __cpuinit from blk-mq from Paul Gortmaker"
      
      * 'for-linus' of git://git.kernel.dk/linux-block: (56 commits)
        virtio_blk: blk-mq support
        blk-mq: remove newly added instances of __cpuinit
        bcache: defensively handle format strings
        bcache: Bypass torture test
        bcache: Delete some slower inline asm
        bcache: Use ida for bcache block dev minor
        bcache: Fix sysfs splat on shutdown with flash only devs
        bcache: Better full stripe scanning
        bcache: Have btree_split() insert into parent directly
        bcache: Move spinlock into struct time_stats
        bcache: Kill sequential_merge option
        bcache: Kill bch_next_recurse_key()
        bcache: Avoid deadlocking in garbage collection
        bcache: Incremental gc
        bcache: Add make_btree_freeing_key()
        bcache: Add btree_node_write_sync()
        bcache: PRECEDING_KEY()
        bcache: bch_(btree|extent)_ptr_invalid()
        bcache: Don't bother with bucket refcount for btree node allocations
        bcache: Debug code improvements
        ...
      f412f2c6
  2. 15 Nov, 2013 34 commits
    • Jiri Kosina's avatar
      Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek',... · 7f9cc24a
      Jiri Kosina authored
      Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hid', 'for-3.13/logitech', 'for-3.13/multitouch', 'for-3.13/roccat', 'for-3.13/upstream' and 'for-3.13/wiimote' into for-linus
      7f9cc24a
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · cd1177f2
      Linus Torvalds authored
      Pull drm regression fix from Dave Airlie:
       "Forgot this one liner was necessary to fix module reload issues
        introduced earlier in the drm pull"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux:
        drm: check for !kdev in drm_unplug_minor()
      cd1177f2
    • Linus Torvalds's avatar
      Merge tag 'blackfin-for-linus' of... · 6c0514dd
      Linus Torvalds authored
      Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
      
      Pull blackfin updates from Steven Miao:
       "Blackfin gpio changes, add adi pinctrl driver, and bug fixes"
      
      * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
        blackfin: fix build warning for unused variable
        smp: bf561: and smb_wmb()/smp_rmb() at ipi send/receive
        pm: use GFP_ATOMIC when pm core call this function
        blackfin: serial: Add serial port_fer and port_mux early platform resources.
        blackfin: pinctrl-adi2: code cleanup after using pinctrl-adi2
        blackfin: adi gpio driver and pinctrl driver support
        bf609: update default config for spi
        Blackfin: bfin_gpio: Use proper mask for comparing pfunc
      6c0514dd
    • Linus Torvalds's avatar
      Merge tag 'for-3.13' of git://git.openrisc.net/~jonas/linux · 98d38dd2
      Linus Torvalds authored
      Pull OpenRISC updates from Jonas Bonn:
       - small cleanups to make allmodconfig pass
       - defconfig refresh
       - a handful of code sanitization patches
      
      * tag 'for-3.13' of git://git.openrisc.net/~jonas/linux:
        openrisc: Refactor or32_early_setup()
        openrisc: Remove unused declaration of __initramfs_start
        openrisc: Use the declarations provided by <asm/sections.h>
        openrisc: Refresh or1ksim_defconfig for v3.12
        openrisc: Refactor 16-bit constant relocation
        openrisc: include: asm: Kbuild: add default "vga.h"
        openrisc: Makefile: append "-D__linux__" to KBUILD_CFLAGS
      98d38dd2
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · e4528d69
      Linus Torvalds authored
      Pull misc kbuild changes from Michal Marek:
       - make tags fixes again
       - scripts/show_delta fix for newer python
       - scripts/kernel-doc does not fail on unknown function prototype
       - one less coccinelle check this time
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/tags.sh: remove obsolete __devinit[const|data]
        scripts/kernel-doc: make unknown function prototype a Warning instead of an Error
        show_delta: Update script to support python versions 2.5 through 3.3
        scripts/coccinelle/api: remove devm_request_and_ioremap.cocci
        scripts/tags.sh: Increase identifier list
      e4528d69
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · d72681d7
      Linus Torvalds authored
      Pull kconfig changes from Michal Marek:
       - xconfig stores its setting in a meaningful path
         (~/.config/kernel.org/qconf.conf)
       - kconfig symbol search fix
       - documentation fixes
       - cleanup & comment update
       - fix warning when a kconfig symbol is defined with two different types
       - Yann is now officially listed as maintainer of kconfig, but he
         prefers me to send pull requests for now
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        MAINTAINERS: New kconfig maintainer
        xconfig: Fix the filename for GUI settings
        kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
        kconfig: remove unused definition from scanner
        kconfig: adjust warning message for conflicting types
        kconfig: fix trivial typos and update mconf documentation
        kconfig: add short explanation to SYMBOL_WRITE
        Documentation/kbuild/kconfig.txt: 'make listnewconfig' replaces: yes "" | make oldconfig
      d72681d7
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 762fb1dd
      Linus Torvalds authored
      Pull kbuild changes from Michal Marek:
       - LTO fixes, but the kallsyms part had to be reverted
       - Pass -Werror=implicit-int and -Werror=strict-prototypes to the
         compiler by default
       - snprintf fix in modpost
       - remove GREP_OPTIONS from the environment to be immune against exotic
         grep option settings
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kallsyms: Revert back to 128 max symbol length
        Kbuild: Ignore GREP_OPTIONS env variable
        scripts: kallsyms: Use %zu to print 'size_t'
        scripts/bloat-o-meter: use .startswith rather than fragile slicing
        scripts/bloat-o-meter: ignore changes in the size of linux_banner
        kbuild: replace unbounded sprintf call in modpost
        kbuild, bloat-o-meter: fix static detection
        Kbuild: Handle longer symbols in kallsyms.c
        kbuild: Increase kallsyms max symbol length
        Makefile: enable -Werror=implicit-int and -Werror=strict-prototypes by default
      762fb1dd
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming · f13399f0
      Linus Torvalds authored
      Pull Kconfig cleanups from Mark Salter:
       "Remove some unused config options from C6X and clean up PC_PARPORT
        dependencies.  The latter was discussed here:
      
          https://lkml.org/lkml/2013/10/8/12"
      
      * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
        c6x: remove unused COMMON_CLKDEV Kconfig parameter
        Kconfig cleanup (PARPORT_PC dependencies)
        x86: select ARCH_MIGHT_HAVE_PC_PARPORT
        unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT
        sparc: select ARCH_MIGHT_HAVE_PC_PARPORT
        sh: select ARCH_MIGHT_HAVE_PC_PARPORT
        powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT
        parisc: select ARCH_MIGHT_HAVE_PC_PARPORT
        mips: select ARCH_MIGHT_HAVE_PC_PARPORT
        microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT
        m68k: select ARCH_MIGHT_HAVE_PC_PARPORT
        ia64: select ARCH_MIGHT_HAVE_PC_PARPORT
        arm: select ARCH_MIGHT_HAVE_PC_PARPORT
        alpha: select ARCH_MIGHT_HAVE_PC_PARPORT
        c6x: remove unused parameter in Kconfig
      f13399f0
    • David Herrmann's avatar
      drm: check for !kdev in drm_unplug_minor() · a3483353
      David Herrmann authored
      We moved minor deallocation to drm_dev_free() in:
        commit 8f6599da
        Author: David Herrmann <dh.herrmann@gmail.com>
        Date:   Sun Oct 20 18:55:45 2013 +0200
      
            drm: delay minor destruction to drm_dev_free()
      
      However, this causes a call to drm_unplug_minor(), which should just do
      nothing as drm_dev_unregister() already called this.
      
      But a separate patch caused kdev lifetime changes:
        commit 5bdebb18
        Author: Dave Airlie <airlied@redhat.com>
        Date:   Fri Oct 11 14:07:25 2013 +1000
      
            drm/sysfs: sort out minor and connector device object lifetimes.
      
      Thus making our dev_is_registered() call useles (and even segfault if it
      is NULL). Replace it with a simple !kdev test and we're fine.
      Reported-by: default avatarHuax Lu <huax.lu@intel.com>
      Reported-by: default avatarDaniel Vetter <daniel@ffwll.ch>
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71208Tested-by: default avatarlu hua <huax.lu@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
      a3483353
    • Steven Miao's avatar
      36855dcf
    • Steven Miao's avatar
      smp: bf561: and smb_wmb()/smp_rmb() at ipi send/receive · 177a48fd
      Steven Miao authored
      add smb_wmb()/smp_rmb() to keep cache coherent
      Signed-off-by: default avatarSteven Miao <realmz6@gmail.com>
      177a48fd
    • Scott Jiang's avatar
      pm: use GFP_ATOMIC when pm core call this function · aefefe92
      Scott Jiang authored
      We shouldn't sleep in atomic sections.
      Signed-off-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
      aefefe92
    • Sonic Zhang's avatar
      blackfin: serial: Add serial port_fer and port_mux early platform resources. · eb06c064
      Sonic Zhang authored
      The serial driver sets up port function manually in early platform probe stage
      if the ADI GPIO2 driver is used. Remove the bfin_sport_uart early platform
      devices.
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      eb06c064
    • Steven Miao's avatar
    • Geert Uytterhoeven's avatar
      openrisc: Refactor or32_early_setup() · 621c2cd8
      Geert Uytterhoeven authored
        - Change fdt pointer (passed from head.S) from unsigned int to void *,
          which allows to kill a cast, and makes it compatible with __dtb_start.
        - Use pr_info(),
        - Extract common part.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Cc: linux@lists.openrisc.net
      Signed-off-by: default avatarJonas Bonn <jonas@southpole.se>
      621c2cd8
    • Wei Ni's avatar
      Documentation: dt: hwmon: Add OF document for LM90 · aae7bce4
      Wei Ni authored
      Add OF document for LM90 in Documentation/devicetree/.
      
      [JD: Add this new file to the LM90 MAINTAINERS entry.]
      Signed-off-by: default avatarWei Ni <wni@nvidia.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      aae7bce4
    • Wei Ni's avatar
      hwmon: (lm90) Add power control · 3e0f964f
      Wei Ni authored
      The device lm90 can be controlled by the vcc rail.
      Adding the regulator support to power on/off the vcc rail.
      Enable the "vcc" regulator before accessing the device.
      
      [JD: Rename variables to avoid confusion with registers.]
      Signed-off-by: default avatarWei Ni <wni@nvidia.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      3e0f964f
    • Wei Ni's avatar
      hwmon: (lm90) Add support for TI TMP451 · 1daaceb2
      Wei Ni authored
      TI TMP451 is mostly compatible with ADT7461, except for
      local temperature low byte and max conversion rate.
      Add support to the LM90 driver.
      Signed-off-by: default avatarWei Ni <wni@nvidia.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      1daaceb2
    • Wei Ni's avatar
      hwmon: (lm90) Use enums for the indexes of temp8 and temp11 · 40465d94
      Wei Ni authored
      Using enums for the indexes and nrs of temp8 and temp11.
      This make the code much more readable.
      Signed-off-by: default avatarWei Ni <wni@nvidia.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      40465d94
    • Wei Ni's avatar
      hwmon: (lm90) Add support to handle IRQ · 109b1283
      Wei Ni authored
      When the temperature exceed the limit range value,
      the driver can handle the interrupt.
      Signed-off-by: default avatarWei Ni <wni@nvidia.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      109b1283
    • Wei Ni's avatar
      hwmon: (lm90) Define status bits · 072de496
      Wei Ni authored
      Add bit defines for the status register. And add a function
      lm90_is_tripped() which will read status register and return
      tripped or not, then lm90_alert can call it directly, and in the
      future the IRQ thread also can use it.
      
      [JD: Adjusted to include all the new MAX6696 status flags.]
      Signed-off-by: default avatarWei Ni <wni@nvidia.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      072de496
    • Guenter Roeck's avatar
      hwmon: (lm90) Fix max6696 alarm handling · e41fae2b
      Guenter Roeck authored
      Bit 2 of status register 2 on MAX6696 (external diode 2 open)
      sets ALERT; the bit thus has to be listed in alert_alarms.
      Also display a message in the alert handler if the condition
      is encountered.
      
      Even though not all overtemperature conditions cause ALERT
      to be set, we should not ignore them in the alert handler.
      Display messages for all out-of-range conditions.
      Reported-by: default avatarJean Delvare <khali@linux-fr.org>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      e41fae2b
    • Geert Uytterhoeven's avatar
    • Geert Uytterhoeven's avatar
      openrisc: Use the declarations provided by <asm/sections.h> · be5940c9
      Geert Uytterhoeven authored
      Openrisc's private vmlinux.h duplicates a few definitions that are already
      provided by asm-generic/sections.h. The former is used by setup.c only,
      while the latter is already used everywhere else.
      
      Convert setup.c to use the generic version:
        - Include <asm/sections.h>,
        - Remove the (slightly different) extern declarations,
        - Remove the no longer needed address-of ('&') operators.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarJonas Bonn <jonas@southpole.se>
      be5940c9
    • Geert Uytterhoeven's avatar
    • Sonic Zhang's avatar
      blackfin: adi gpio driver and pinctrl driver support · 54e4ff4d
      Sonic Zhang authored
      Remove gpio driver for new gpio controller on BF54x and BF60x.
      Build the bfin_gpio driver only when other BF5xx processors are selected.
      Replace the prefix of some gpio and peripheral functions with adi.
      add portmux platform data in machine portmux.h
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      Signed-off-by: default avatarSteven Miao <realmz6@gmail.com>
      54e4ff4d
    • Scott Jiang's avatar
      036c5df1
    • Sonic Zhang's avatar
      Blackfin: bfin_gpio: Use proper mask for comparing pfunc · f70de486
      Sonic Zhang authored
      For BF537_FAMILY, when offset != 1, the mask is 1.
      Thus add proper mask for comparing pfunc with function.
      
      Also has small refactor for better readability.
      In portmux_setup(), it looks odd having "pmux &= ~(3 << 1);"
      while in current code we do pmux |= (function << offset);.
      Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      f70de486
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 049ffa8a
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is a combo of -next and some -fixes that came in in the
        intervening time.
      
        Highlights:
      
        New drivers:
          ARM Armada driver for Marvell Armada 510 SOCs
      
        Intel:
          Broadwell initial support under a default off switch,
          Stereo/3D HDMI mode support
          Valleyview improvements
          Displayport improvements
          Haswell fixes
          initial mipi dsi panel support
          CRC support for debugging
          build with CONFIG_FB=n
      
        Radeon:
          enable DPM on a number of GPUs by default
          secondary GPU powerdown support
          enable HDMI audio by default
          Hawaii support
      
        Nouveau:
          dynamic pm code infrastructure reworked, does nothing major yet
          GK208 modesetting support
          MSI fixes, on by default again
          PMPEG improvements
          pageflipping fixes
      
        GMA500:
          minnowboard SDVO support
      
        VMware:
          misc fixes
      
        MSM:
          prime, plane and rendernodes support
      
        Tegra:
          rearchitected to put the drm driver into the drm subsystem.
          HDMI and gr2d support for tegra 114 SoC
      
        QXL:
          oops fix, and multi-head fixes
      
        DRM core:
          sysfs lifetime fixes
          client capability ioctl
          further cleanups to device midlayer
          more vblank timestamp fixes"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (789 commits)
        drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
        drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
        drm/nouveau/pwr: fix missing mutex unlock in a failure path
        drm/nv40/therm: fix slowing down fan when pstate undefined
        drm/nv11-: synchronise flips to vblank, unless async flip requested
        drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
        drm/nv10-: we no longer need to create nvsw object on user channels
        drm/nouveau: always queue flips relative to kernel channel activity
        drm/nouveau: there is no need to reserve/fence the new fb when flipping
        drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
        drm/nouveau: allow nouveau_fence_ref() to be a noop
        drm/nvc8/mc: msi rearm is via the nvc0 method
        drm/ttm: Fix vma page_prot bit manipulation
        drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
        drm/vmwgfx: Resource evict fixes
        drm/edid: compare actual vrefresh for all modes for quirks
        drm: shmob_drm: Convert to clk_prepare/unprepare
        drm/nouveau: fix 32-bit build
        drm/i915/opregion: fix build error on CONFIG_ACPI=n
        Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
        ...
      049ffa8a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · c681427e
      Linus Torvalds authored
      Pull IDE updates from David Miller:
       "Just some minor cleanups and simplifications"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: pmac: remove unnecessary pci_set_drvdata()
        ide: cs5536: use module_pci_driver()
        ide: pmac: Remove casting the return value which is a void pointer
      c681427e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · 1b272275
      Linus Torvalds authored
      Pull sparc update from David Miller:
      
       1) Implement support for up to 47-bit physical addresses on sparc64.
      
       2) Support HAVE_CONTEXT_TRACKING on sparc64, from Kirill Tkhai.
      
       3) Fix Simba bridge window calculations, from Kjetil Oftedal.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
        sparc64: Implement HAVE_CONTEXT_TRACKING
        sparc64: Add self-IPI support for smp_send_reschedule()
        sparc: PCI: Fix incorrect address calculation of PCI Bridge windows on Simba-bridges
        sparc64: Encode huge PMDs using PTE encoding.
        sparc64: Move to 64-bit PGDs and PMDs.
        sparc64: Move from 4MB to 8MB huge pages.
        sparc64: Make PAGE_OFFSET variable.
        sparc64: Fix inconsistent max-physical-address defines.
        sparc64: Document the shift counts used to validate linear kernel addresses.
        sparc64: Define PAGE_OFFSET in terms of physical address bits.
        sparc64: Use PAGE_OFFSET instead of a magic constant.
        sparc64: Clean up 64-bit mmap exclusion defines.
      1b272275
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 91838e2d
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "This time the updates contain:
      
         - Tracepoints for certain IOMMU-API functions to make their use
           easier to debug
         - A tracepoint for IOMMU page faults to make it easier to get them in
           user space
         - Updates and fixes for the new ARM SMMU driver after the first
           hardware showed up
         - Various other fixes and cleanups in other IOMMU drivers"
      
      * tag 'iommu-updates-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (26 commits)
        iommu/shmobile: Enable the driver on all ARM platforms
        iommu/tegra-smmu: Staticize tegra_smmu_pm_ops
        iommu/tegra-gart: Staticize tegra_gart_pm_ops
        iommu/vt-d: Use list_for_each_entry_safe() for dmar_domain->devices traversal
        iommu/vt-d: Use for_each_drhd_unit() instead of list_for_each_entry()
        iommu/vt-d: Fixed interaction of VFIO_IOMMU_MAP_DMA with IOMMU address limits
        iommu/arm-smmu: Clear global and context bank fault status registers
        iommu/arm-smmu: Print context fault information
        iommu/arm-smmu: Check for num_context_irqs > 0 to avoid divide by zero exception
        iommu/arm-smmu: Refine check for proper size of mapped region
        iommu/arm-smmu: Switch to subsys_initcall for driver registration
        iommu/arm-smmu: use relaxed accessors where possible
        iommu/arm-smmu: replace devm_request_and_ioremap by devm_ioremap_resource
        iommu: Remove stack trace from broken irq remapping warning
        iommu: Change iommu driver to call io_page_fault trace event
        iommu: Add iommu_error class event to iommu trace
        iommu/tegra: gart: cleanup devm_* functions usage
        iommu/tegra: Print phys_addr_t using %pa
        iommu: No need to pass '0x' when '%pa' is used
        iommu: Change iommu driver to call unmap trace event
        ...
      91838e2d
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · f0804804
      Linus Torvalds authored
      Pull KVM changes from Paolo Bonzini:
       "Here are the 3.13 KVM changes.  There was a lot of work on the PPC
        side: the HV and emulation flavors can now coexist in a single kernel
        is probably the most interesting change from a user point of view.
      
        On the x86 side there are nested virtualization improvements and a few
        bugfixes.
      
        ARM got transparent huge page support, improved overcommit, and
        support for big endian guests.
      
        Finally, there is a new interface to connect KVM with VFIO.  This
        helps with devices that use NoSnoop PCI transactions, letting the
        driver in the guest execute WBINVD instructions.  This includes some
        nVidia cards on Windows, that fail to start without these patches and
        the corresponding userspace changes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (146 commits)
        kvm, vmx: Fix lazy FPU on nested guest
        arm/arm64: KVM: PSCI: propagate caller endianness to the incoming vcpu
        arm/arm64: KVM: MMIO support for BE guest
        kvm, cpuid: Fix sparse warning
        kvm: Delete prototype for non-existent function kvm_check_iopl
        kvm: Delete prototype for non-existent function complete_pio
        hung_task: add method to reset detector
        pvclock: detect watchdog reset at pvclock read
        kvm: optimize out smp_mb after srcu_read_unlock
        srcu: API for barrier after srcu read unlock
        KVM: remove vm mmap method
        KVM: IOMMU: hva align mapping page size
        KVM: x86: trace cpuid emulation when called from emulator
        KVM: emulator: cleanup decode_register_operand() a bit
        KVM: emulator: check rex prefix inside decode_register()
        KVM: x86: fix emulation of "movzbl %bpl, %eax"
        kvm_host: typo fix
        KVM: x86: emulate SAHF instruction
        MAINTAINERS: add tree for kvm.git
        Documentation/kvm: add a 00-INDEX file
        ...
      f0804804
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.13-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · eda670c6
      Linus Torvalds authored
      Pull Xen updates from Konrad Rzeszutek Wilk:
       "This has tons of fixes and two major features which are concentrated
        around the Xen SWIOTLB library.
      
        The short <blurb> is that the tracing facility (just one function) has
        been added to SWIOTLB to make it easier to track I/O progress.
        Additionally under Xen and ARM (32 & 64) the Xen-SWIOTLB driver
        "is used to translate physical to machine and machine to physical
        addresses of foreign[guest] pages for DMA operations" (Stefano) when
        booting under hardware without proper IOMMU.
      
        There are also bug-fixes, cleanups, compile warning fixes, etc.
      
        The commit times for some of the commits is a bit fresh - that is b/c
        we wanted to make sure we have the Ack's from the ARM folks - which
        with the string of back-to-back conferences took a bit of time.  Rest
        assured - the code has been stewing in #linux-next for some time.
      
        Features:
         - SWIOTLB has tracing added when doing bounce buffer.
         - Xen ARM/ARM64 can use Xen-SWIOTLB.  This work allows Linux to
           safely program real devices for DMA operations when running as a
           guest on Xen on ARM, without IOMMU support. [*1]
         - xen_raw_printk works with PVHVM guests if needed.
      
        Bug-fixes:
         - Make memory ballooning work under HVM with large MMIO region.
         - Inform hypervisor of MCFG regions found in ACPI DSDT.
         - Remove deprecated IRQF_DISABLED.
         - Remove deprecated __cpuinit.
      
        [*1]:
        "On arm and arm64 all Xen guests, including dom0, run with second
         stage translation enabled.  As a consequence when dom0 programs a
         device for a DMA operation is going to use (pseudo) physical
         addresses instead machine addresses.  This work introduces two trees
         to track physical to machine and machine to physical mappings of
         foreign pages.  Local pages are assumed mapped 1:1 (physical address
         == machine address).  It enables the SWIOTLB-Xen driver on ARM and
         ARM64, so that Linux can translate physical addresses to machine
         addresses for dma operations when necessary.  " (Stefano)"
      
      * tag 'stable/for-linus-3.13-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (32 commits)
        xen/arm: pfn_to_mfn and mfn_to_pfn return the argument if nothing is in the p2m
        arm,arm64/include/asm/io.h: define struct bio_vec
        swiotlb-xen: missing include dma-direction.h
        pci-swiotlb-xen: call pci_request_acs only ifdef CONFIG_PCI
        arm: make SWIOTLB available
        xen: delete new instances of added __cpuinit
        xen/balloon: Set balloon's initial state to number of existing RAM pages
        xen/mcfg: Call PHYSDEVOP_pci_mmcfg_reserved for MCFG areas.
        xen: remove deprecated IRQF_DISABLED
        x86/xen: remove deprecated IRQF_DISABLED
        swiotlb-xen: fix error code returned by xen_swiotlb_map_sg_attrs
        swiotlb-xen: static inline xen_phys_to_bus, xen_bus_to_phys, xen_virt_to_bus and range_straddles_page_boundary
        grant-table: call set_phys_to_machine after mapping grant refs
        arm,arm64: do not always merge biovec if we are running on Xen
        swiotlb: print a warning when the swiotlb is full
        swiotlb-xen: use xen_dma_map/unmap_page, xen_dma_sync_single_for_cpu/device
        xen: introduce xen_dma_map/unmap_page and xen_dma_sync_single_for_cpu/device
        tracing/events: Fix swiotlb tracepoint creation
        swiotlb-xen: use xen_alloc/free_coherent_pages
        xen: introduce xen_alloc/free_coherent_pages
        ...
      eda670c6