08 Sep, 2013

2 commits

  • Pull GPIO updates from Linus Walleij:
    "This is the bulk of GPIO changes for the v3.12 series:

    - A new driver for the TZ1090 PDC which is used on the metag
    architecture.

    - A new driver for the Kontron ETX or COMexpress GPIO block. This is
    found on some ETX x86 devices.

    - A new driver for the Fintek Super-I/O chips, used on some x86
    boards.

    - Added device tree probing on a few select GPIO blocks.

    - Drop the Exynos support from the Samsung GPIO driver.

    The Samsung maintainers have moved over to use the modernized pin
    control driver to provide GPIO for the modern platforms instead.

    - The usual bunch of non-critical fixes and cleanups"

    * tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (36 commits)
    gpio: return -ENOTSUPP if debounce cannot be set
    gpio: improve error path in gpiolib
    gpio: add GPIO support for F71882FG and F71889F
    of: add vendor prefix for Microchip Technology Inc
    gpio: mcp23s08: rename the device tree property
    gpio: samsung: Drop support for Exynos SoCs
    gpio: pcf857x: Remove pdata argument to pcf857x_irq_domain_init()
    gpio: pcf857x: Sort headers alphabetically
    gpio: max7301: Reverting "Do not force SPI speed when using OF Platform"
    gpio: Fix bit masking in Kontron PLD GPIO driver
    gpio: pca953x: fix gpio input on gpio offsets >= 8
    drivers/gpio: simplify use of devm_ioremap_resource
    drivers/gpio/gpio-omap.c: convert comma to semicolon
    gpio-lynxpoint: Fix warning about unbalanced pm_runtime_enable
    gpio: Fix platform driver name in Kontron PLD GPIO driver
    gpio: adnp: Fix segfault if request_threaded_irq fails
    gpio: msm: Staticize local variable 'msm_gpio'
    gpio: gpiolib-of.c: make error message more meaningful by adding the node name and index
    gpio: use dev_get_platdata()
    gpio/mxc: add chained_irq_enter/exit() to mx2_gpio_irq_handler
    ...

    Linus Torvalds
     
  • Pull input updates from Dmitry Torokhov:
    "A new driver for slidebar on Ideapad laptops and a bunch of assorted
    driver fixes"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
    Input: add SYN_MAX and SYN_CNT constants
    Input: max11801_ts - convert to devm
    Input: egalax-ts - fix typo and improve text
    Input: MAINTAINERS - change maintainer for cyttsp driver
    Input: cyttsp4 - kill 'defined but not used' compiler warnings
    Input: add driver for slidebar on Lenovo IdeaPad laptops
    Input: omap-keypad - set up irq type from DT
    Input: omap-keypad - enable wakeup capability for keypad.
    Input: omap-keypad - clear interrupts on open
    Input: omap-keypad - convert to threaded IRQ
    Input: omap-keypad - use bitfiled instead of hardcoded values
    Input: cyttsp4 - remove useless NULL test from cyttsp4_watchdog_timer()
    Input: wacom - fix error return code in wacom_probe()
    Input: as5011 - fix error return code in as5011_probe()
    Input: keyboard, serio - simplify use of devm_ioremap_resource
    Input: tegra-kbc - simplify use of devm_ioremap_resource
    Input: htcpen - fix incorrect placement of __initdata
    Input: qt1070 - add power management ops
    Input: wistron_btns - add MODULE_DEVICE_TABLE
    Input: wistron_btns - mark the Medion MD96500 keymap as tested
    ...

    Linus Torvalds
     

07 Sep, 2013

3 commits

  • Pull ARM SoC platform changes from Olof Johansson:
    "This branch contains mostly additions and changes to platform
    enablement and SoC-level drivers. Since there's sometimes a
    dependency on device-tree changes, there's also a fair amount of
    those in this branch.

    Pieces worth mentioning are:

    - Mbus driver for Marvell platforms, allowing kernel configuration
    and resource allocation of on-chip peripherals.
    - Enablement of the mbus infrastructure from Marvell PCI-e drivers.
    - Preparation of MSI support for Marvell platforms.
    - Addition of new PCI-e host controller driver for Tegra platforms
    - Some churn caused by sharing of macro names between i.MX 6Q and 6DL
    platforms in the device tree sources and header files.
    - Various suspend/PM updates for Tegra, including LP1 support.
    - Versatile Express support for MCPM, part of big little support.
    - Allwinner platform support for A20 and A31 SoCs (dual and quad
    Cortex-A7)
    - OMAP2+ support for DRA7, a new Cortex-A15-based SoC.

    The code that touches other architectures are patches moving MSI
    arch-specific functions over to weak symbols and removal of
    ARCH_SUPPORTS_MSI, acked by PCI maintainers"

    * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits)
    tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE
    PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource
    ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list
    ARM: dts: vf610-twr: enable i2c0 device
    ARM: dts: i.MX51: Add one more I2C2 pinmux entry
    ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
    ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
    ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
    ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
    ARM: dts: i.MX27: Disable AUDMUX in the template
    ARM: dts: wandboard: Add support for SDIO bcm4329
    ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
    ARM: dts: imx53-qsb: Make USBH1 functional
    ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
    ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
    ARM: dts: imx6qdl-sabresd: Add touchscreen support
    ARM: imx: add ocram clock for imx53
    ARM: dts: imx: ocram size is different between imx6q and imx6dl
    ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
    ARM: dts: i.MX27: Remove clock name from CPU node
    ...

    Linus Torvalds
     
  • Pull Tile arch updates from Chris Metcalf:
    "These changes bring in a bunch of new functionality that has been
    maintained internally at Tilera over the last year, plus other stray
    bits of work that I've taken into the tile tree from other folks.

    The changes include some PCI root complex work, interrupt-driven
    console support, support for performing fast-path unaligned data
    fixups by kernel-based JIT code generation, CONFIG_PREEMPT support,
    vDSO support for gettimeofday(), a serial driver for the tilegx
    on-chip UART, KGDB support, more optimized string routines, support
    for ftrace and kprobes, improved ASLR, and many bug fixes.

    We also remove support for the old TILE64 chip, which is no longer
    buildable"

    * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (85 commits)
    tile: refresh tile defconfig files
    tile: rework
    tile PCI RC: make default consistent DMA mask 32-bit
    tile: add null check for kzalloc in tile/kernel/setup.c
    tile: make __write_once a synonym for __read_mostly
    tile: remove support for TILE64
    tile: use asm-generic/bitops/builtin-*.h
    tile: eliminate no-op "noatomichash" boot argument
    tile: use standard tile_bundle_bits type in traps.c
    tile: simplify code referencing hypervisor API addresses
    tile: change to in comments
    tile: mark pcibios_init() as __init
    tile: check for correct compiler earlier in asm-offsets.c
    tile: use standard 'generic-y' model for
    tile: use asm-generic version of
    tile PCI RC: add comment about "PCI hole" problem
    tile: remove DEBUG_EXTRA_FLAGS kernel config option
    tile: add virt_to_kpte() API and clean up and document behavior
    tile: support FRAME_POINTER
    tile: support reporting Tilera hypervisor statistics
    ...

    Linus Torvalds
     
  • Pull HID updates from Jiri Kosina:
    "Highlights:

    - conversion of HID subsystem to use devm-based resource management,
    from Benjamin Tissoires

    - i2c-hid support for DT bindings, from Benjamin Tissoires

    - much improved support for Win8-multitouch devices, from Benjamin
    Tissoires

    - cleanup of core code using common hidinput_input_event(), from
    David Herrmann

    - fix for bug in implement() access to the bit stream (causing oops)
    that has been present in the code for ages, but devices that are
    able to trigger it have started to appear only now, from Jiri
    Kosina

    - fixes for CVE-2013-2899, CVE-2013-2898, CVE-2013-2896,
    CVE-2013-2892, CVE-2013-2888 (all triggerable only by specially
    crafted malicious HW devices plugged into the system), from Kees
    Cook

    - hidraw oops fix, from Manoj Chourasia

    - various smaller fixes here and there, support for a bunch of new
    devices by various contributors"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (53 commits)
    HID: MAINTAINERS: add roccat drivers
    HID: hid-sensor-hub: change kmalloc + memcpy by kmemdup
    HID: hid-sensor-hub: move to devm_kzalloc
    HID: hid-sensor-hub: fix indentation accross the code
    HID: move HID_REPORT_TYPES closer to the report-definitions
    HID: check for NULL field when setting values
    HID: picolcd_core: validate output report details
    HID: sensor-hub: validate feature report details
    HID: ntrig: validate feature report details
    HID: pantherlord: validate output report details
    HID: hid-wiimote: print small buffers via %*phC
    HID: uhid: improve uhid example client
    HID: Correct the USB IDs for the new Macbook Air 6
    HID: wiimote: add support for Guitar-Hero guitars
    HID: wiimote: add support for Guitar-Hero drums
    Input: introduce BTN/ABS bits for drums and guitars
    HID: battery: don't do DMA from stack
    HID: roccat: add support for KonePureOptical v2
    HID: picolcd: Prevent NULL pointer dereference on _remove()
    HID: usbhid: quirk for N-Trig DuoSense Touch Screen
    ...

    Linus Torvalds
     

06 Sep, 2013

5 commits

  • Pull networking changes from David Miller:
    "Noteworthy changes this time around:

    1) Multicast rejoin support for team driver, from Jiri Pirko.

    2) Centralize and simplify TCP RTT measurement handling in order to
    reduce the impact of bad RTO seeding from SYN/ACKs. Also, when
    both timestamps and local RTT measurements are available prefer
    the later because there are broken middleware devices which
    scramble the timestamp.

    From Yuchung Cheng.

    3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
    memory consumed to queue up unsend user data. From Eric Dumazet.

    4) Add a "physical port ID" abstraction for network devices, from
    Jiri Pirko.

    5) Add a "suppress" operation to influence fib_rules lookups, from
    Stefan Tomanek.

    6) Add a networking development FAQ, from Paul Gortmaker.

    7) Extend the information provided by tcp_probe and add ipv6 support,
    from Daniel Borkmann.

    8) Use RCU locking more extensively in openvswitch data paths, from
    Pravin B Shelar.

    9) Add SCTP support to openvswitch, from Joe Stringer.

    10) Add EF10 chip support to SFC driver, from Ben Hutchings.

    11) Add new SYNPROXY netfilter target, from Patrick McHardy.

    12) Compute a rate approximation for sending in TCP sockets, and use
    this to more intelligently coalesce TSO frames. Furthermore, add
    a new packet scheduler which takes advantage of this estimate when
    available. From Eric Dumazet.

    13) Allow AF_PACKET fanouts with random selection, from Daniel
    Borkmann.

    14) Add ipv6 support to vxlan driver, from Cong Wang"

    Resolved conflicts as per discussion.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
    openvswitch: Fix alignment of struct sw_flow_key.
    netfilter: Fix build errors with xt_socket.c
    tcp: Add missing braces to do_tcp_setsockopt
    caif: Add missing braces to multiline if in cfctrl_linkup_request
    bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
    vxlan: Fix kernel panic on device delete.
    net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
    net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
    icplus: Use netif_running to determine device state
    ethernet/arc/arc_emac: Fix huge delays in large file copies
    tuntap: orphan frags before trying to set tx timestamp
    tuntap: purge socket error queue on detach
    qlcnic: use standard NAPI weights
    ipv6:introduce function to find route for redirect
    bnx2x: VF RSS support - VF side
    bnx2x: VF RSS support - PF side
    vxlan: Notify drivers for listening UDP port changes
    net: usbnet: update addr_assign_type if appropriate
    driver/net: enic: update enic maintainers and driver
    driver/net: enic: Exposing symbols for Cisco's low latency driver
    ...

    Linus Torvalds
     
  • Pull x86 fixes from Ingo Molnar:
    "Fix for the annoying paravirt.o build warning under allmodconfig, and
    a MAINTAINERS file update"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, doc: Add an entry in MAINTAINERS for arch/x86/kernel/cpu/vmware.c
    x86, paravirt: Remove duplicate definition for DEF_NATIVE

    Linus Torvalds
     
  • Conflicts:
    drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
    net/bridge/br_multicast.c
    net/ipv6/sit.c

    The conflicts were minor:

    1) sit.c changes overlap with change to ip_tunnel_xmit() signature.

    2) br_multicast.c had an overlap between computing max_delay using
    msecs_to_jiffies and turning MLDV2_MRC() into an inline function
    with a name using lowercase instead of uppercase letters.

    3) stmmac had two overlapping changes, one which conditionally allocated
    and hooked up a dma_cfg based upon the presence of the pbl OF property,
    and another one handling store-and-forward DMA made. The latter of
    which should not go into the new of_find_property() basic block.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Pull media updates from Mauro Carvalho Chehab:
    "This series contains:
    - Exynos s5p-mfc driver got support for VP8 encoder
    - Some SoC drivers gained support for asynchronous registration
    (needed for DT)
    - The RC subsystem gained support for RC activity LED;
    - New drivers added: a video decoder(adv7842), a video encoder
    (adv7511), a new GSPCA driver (stk1135) and support for Renesas
    R-Car (vsp1)
    - the first SDR kernel driver: mirics msi3101. Due to some troubles
    with the driver, and because the API is still under discussion, it
    will be merged at staging for 3.12. Need to rework on it
    - usual new boards additions, fixes, cleanups and driver
    improvements"

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (242 commits)
    [media] cx88: Fix regression: CX88_AUDIO_WM8775 can't be 0
    [media] exynos4-is: Fix entity unregistration on error path
    [media] exynos-gsc: Register v4l2 device
    [media] exynos4-is: Fix fimc-lite bayer formats
    [media] em28xx: fix assignment of the eeprom data
    [media] hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
    [media] usbtv: Throw corrupted frames away
    [media] usbtv: Fix deinterlacing
    [media] v4l2: added missing mutex.h include to v4l2-ctrls.h
    [media] DocBook: upgrade media_api DocBook version to 4.2
    [media] ml86v7667: fix compile warning: 'ret' set but not used
    [media] s5p-g2d: Fix registration failure
    [media] media: coda: Fix DT driver data pointer for i.MX27
    [media] s5p-mfc: Fix input/output format reporting
    [media] v4l: vsp1: Fix mutex double lock at streamon time
    [media] v4l: vsp1: Add support for RT clock
    [media] v4l: vsp1: Initialize media device bus_info field
    [media] davinci: vpif_capture: fix error return code in vpif_probe()
    [media] davinci: vpif_display: fix error return code in vpif_probe()
    [media] MAINTAINERS: add entries for adv7511 and adv7842
    ...

    Linus Torvalds
     
  • Signed-off-by: Govindarajulu Varadarajan
    Signed-off-by: Sujith Sankar
    Signed-off-by: Nishank Trivedi
    Signed-off-by: Christian Benvenuti
    Signed-off-by: David S. Miller

    govindarajulu.v
     

05 Sep, 2013

5 commits

  • Adding maintainer for Roccat hid drivers

    Signed-off-by: Stefan Achatz
    Signed-off-by: Jiri Kosina

    Stefan Achatz
     
  • Add an entry in MAINTAINERS file to reflect the maintainers of this
    file.

    Signed-off-by: Alok Kataria
    Link: http://lkml.kernel.org/r/1378284821.9739.7404.camel@akataria-dtop.eng.vmware.com
    Signed-off-by: H. Peter Anvin
    [ hpa: fixed tabs vs spaces ]

    Alok Kataria
     
  • Pull Xen updates from Konrad Rzeszutek Wilk:
    "A couple of features and a ton of bug-fixes. There is also some
    maintership changes. Jeremy is enjoying the full-time work at the
    startup and as much as he would love to help - he can't find the time.
    I have a bunch of other things that I promised to work on - paravirt
    diet, get SWIOTLB working everywhere, etc, but haven't been able to
    find the time.

    As such both David Vrabel and Boris Ostrovsky have graciously
    volunteered to help with the maintership role. They will keep the lid
    on regressions, bug-fixes, etc. I will be in the background to help -
    but eventually there will be less of me doing the Xen GIT pulls and
    more of them. Stefano is still doing the ARM/ARM64 and will continue
    on doing so.

    Features:
    - Xen Trusted Platform Module (TPM) frontend driver - with the
    backend in MiniOS.
    - Scalability improvements in event channel.
    - Two extra Xen co-maintainers (David, Boris) and one going away (Jeremy)

    Bug-fixes:
    - Make the 1:1 mapping work during early bootup on selective regions.
    - Add scratch page to balloon driver to deal with unexpected code
    still holding on stale pages.
    - Allow NMIs on PV guests (64-bit only)
    - Remove unnecessary TLB flush in M2P code.
    - Fixes duplicate callbacks in Xen granttable code.
    - Fixes in PRIVCMD_MMAPBATCH ioctls to allow retries
    - Fix for events being lost due to rescheduling on different VCPUs.
    - More documentation"

    * tag 'stable/for-linus-3.12-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (23 commits)
    hvc_xen: Remove unnecessary __GFP_ZERO from kzalloc
    drivers/xen-tpmfront: Fix compile issue with missing option.
    xen/balloon: don't set P2M entry for auto translated guest
    xen/evtchn: double free on error
    Xen: Fix retry calls into PRIVCMD_MMAPBATCH*.
    xen/pvhvm: Initialize xen panic handler for PVHVM guests
    xen/m2p: use GNTTABOP_unmap_and_replace to reinstate the original mapping
    xen: fix ARM build after 6efa20e4
    MAINTAINERS: Remove Jeremy from the Xen subsystem.
    xen/events: document behaviour when scanning the start word for events
    x86/xen: during early setup, only 1:1 map the ISA region
    x86/xen: disable premption when enabling local irqs
    swiotlb-xen: replace dma_length with sg_dma_len() macro
    swiotlb: replace dma_length with sg_dma_len() macro
    xen/balloon: set a mapping for ballooned out pages
    xen/evtchn: improve scalability by using per-user locks
    xen/p2m: avoid unneccesary TLB flush in m2p_remove_override()
    MAINTAINERS: Add in two extra co-maintainers of the Xen tree.
    MAINTAINERS: Update the Xen subsystem's with proper mailing list.
    xen: replace strict_strtoul() with kstrtoul()
    ...

    Linus Torvalds
     
  • Pull sound updates from Takashi Iwai:
    "Changes are seen in a wide range of codes, mainly due to ASoC DAPM
    requirements; HD-audio shows a high peak in diffstat, it's just a
    removal of bunch of old static quirks.

    Some highlights:

    - HDPM: Updates for AIO/RayDAT support, TCO/sync support

    - RME96: Add PCM sync support

    - HD-audio:

    * A few HDMI/DP audio updates (CA assignment fix, stream switching
    fix, Intel DP device list support)
    * Device specific fixes (ASUS/CXT HP mic support, Thinkpad mic
    improvements, Chromebook fixes, STAC9228 Dell fixes)
    * Replace the all static quirks for AD codecs with the generic
    parser
    * WAKEEN support for handling irqs in the power saving mode

    - USB-audio: Clean up implicit fb handling and related codes

    - DAPM is now mandatory for ASoC CODEC drivers; all existing drivers
    have had some level of DAPM support added. In addition, a lot of
    cleanups and improvements in DAPM.

    - Support for ASoC cross-platform compile test

    - New drivers and support for Analog Devices ADAU1702 and
    ADAU1401(a), Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and
    WM8904 based machines, Freescale S/PDIF and SSI AC'97, Renesas
    R-Car SoCs, Samsung Exynos5420 SoCs, Texas Instruments PCM1681 and
    PCM1792A and Wolfson Microelectronics WM8997

    - DT bindings for kirkwood and i.MX S/PDIF

    - Clean up and bug fixes: ssm2602, rt5640 and sgtl5000.

    - Core helpers for bitbanged AC'97 reset"

    * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (375 commits)
    ALSA: hda - Re-setup HDMI pin and audio infoframe on stream switches
    ALSA: hda - hdmi: Fallback to ALSA allocation when selecting CA
    ASoC: mxs-sgtl5000: Configure the dai_links as unidirectional
    ASoC: soc-pcm: Allow to specify unidirectional dai_link
    ASoC: fsl_spdif: Staticse non-exported symbols
    ASoC: ssm2602: Fix cache sync
    ASoC: Remove unused sysfs_registered field from snd_soc_codec struct
    ASoC: Remove unused debugfs_dapm field from snd_soc_{platform,codec} struct
    ASoC: Remove unused control_type field from snd_soc_codec struct
    ASoC: fsl: Add one blank space after ':=' in Makefile
    ASoC: fsl: Add wrapping for dev_dbg() in fsl_spdif.c
    ASoC: rt5640: change widget sequence for depop
    ASoC: dapm: Fix auto-disable for inverted controls
    ASoC: fsl: Drop SND_SOC_FSL_UTILS from SND_SOC_IMX_SPDIF
    ASoC: Samsung: Do not queue cyclic buffers multiple times
    ASoC: ep93xx-i2s: Remove unnecessary dev_set_drvdata()
    ASoC: designware_i2s: Remove unnecessary dev_set_drvdata()
    ASoC: fsl_spdif: remove redundant dev_err call in fsl_spdif_probe()
    ASoC: fsl: Add S/PDIF machine driver
    ASoc: kirkwood: Use the Kirkwood audio driver in Dove boards
    ...

    Linus Torvalds
     
  • Pull pin control changes from Linus Walleij:
    "Here is the bulk of pin control changes for the v3.12 series. Most of
    the relevant information is in the tag.

    I merged in v3.11-rc7 last week to get rid of a largeish conflict
    within the sunxi (AllWinner) driver in linux-next and fix up the
    non-trivial merge the right way. That driver had a rather large fix
    adding locking late in the release cycle.

    Overall the bulk changes this time is cleanups and refactorings and
    not much new features, which is nice.

    - Refactorings for generic pin config handling in the core.

    - Factor out a set of device tree utilities for use in all drivers,
    to parse and allocate maps from the device tree.

    - Some fixes to the core such as more nitpicky locking.

    - Pushed down config array iteration into the drivers.

    This patch is necessary for drivers that want to iterate over
    configs and pile up a stack of alterations to the same register(s),
    or if the driver wants to take a local spinlock when committing the
    configuration.

    - A new driver for the Texas Instruments Palmas PMIC by Laxman
    Dewangan. This is used on the Tegra systems.

    - A major cleanup and modernization of the PFC (Super Hitachi and ARM
    SHmobile) pin controller and subdrivers.

    - Support for the A20 and A31 sunxi (AllWinner) SoCs.

    - A huge pile of fixes and cleanups: Axel Lin, Jingoo Han Dan
    Carpenter, Julia Lawall and Sachin Kamat did an excellent job here"

    * tag 'pinctrl-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (124 commits)
    pinctrl: sunxi: Fix off-by-one for valid offset range checking
    pinctrl: sunxi: drop lock on error path
    pinctrl: pinconf-generic: Remove ti prefix in dev_err messages
    pinctrl: rockchip: Implement .request() and .free() callbacks
    pinctrl: at91: fix get_pullup/down function return
    pinctrl: sh-pfc: remove unnecessary platform_set_drvdata()
    pinctrl: Add s5pv210 support to pinctrl-exynos
    pinctrl: utils: include export.h to avoid warnings
    pinctrl: s3c24xx: off by one in s3c24xx_eint_init()
    pinctrl: mvebu: testing the wrong variable
    pinctrl: abx500: fix bitwise AND test
    pinctrl: mvebu: Convert to use devm_ioremap_resource
    pinctrl: Pass all configs to driver on pin_config_set()
    pinctrl: tz1090-pdc: Convert to devm_ioremap_resource
    pinctrl: tz1090: Convert to devm_ioremap_resource
    pinctrl: tegra: Convert to devm_ioremap_resource
    pinctrl: rockchip: Simplify pin_to_bank equation
    pinctrl: spear: Convert to devm_ioremap_resource
    pinctrl: rockchip: Remove of_match_ptr macro for DT only driver
    pinctrl: palmas: PINCTRL_PALMAS needs to select PINMUX
    ...

    Linus Torvalds
     

04 Sep, 2013

5 commits

  • Pull timer changes from Ingo Molnar:
    "Various clocksource driver updates: extend the core with memory mapped
    hardware (mmio) support and add new (ARM) Moxart SoC and sun4i
    hardware support"

    * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
    clocksource: arch_timer: Add support for memory mapped timers
    clocksource: arch_timer: Push the read/write wrappers deeper
    Documentation: Add memory mapped ARM architected timer binding
    clocksource: arch_timer: Pass clock event to set_mode callback
    clocksource: arch_timer: Make register accessors less error-prone
    ARM: clocksource: moxart: documentation: Update device tree bindings document
    ARM: clocksource: moxart: Add bitops.h include
    ARM: clocksource: moxart: documentation: Fix device tree bindings document
    ARM: clocksource: Add support for MOXA ART SoCs
    clocksource: cadence_ttc: Reuse clocksource as sched_clock
    clocksource: cadence_ttc: Remove unused header
    clocksource: sun4i: Fix bug when switching from periodic to oneshot modes
    clocksource: sun4i: Cleanup parent clock setup
    clocksource: sun4i: Remove TIMER_SCAL variable
    clocksource: sun4i: Factor out some timer code
    clocksource: sun4i: Fix the next event code
    clocksource: sun4i: Don't forget to enable the clock we use
    clocksource: sun4i: Add clocksource and sched clock drivers
    clocksource: sun4i: rename AUTORELOAD define to RELOAD
    clocksource: sun4i: Wrap macros arguments in parenthesis
    ...

    Linus Torvalds
     
  • Pull first round of SCSI updates from James Bottomley:
    "This patch set is a set of driver updates (ufs, zfcp, lpfc, mpt2/3sas,
    qla4xxx, qla2xxx [adding support for ISP8044 + other things]).

    We also have a new driver: esas2r which has a number of static checker
    problems, but which I expect to resolve over the -rc course of 3.12
    under the new driver exception.

    We also have the error return that were discussed at LSF"

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (118 commits)
    [SCSI] sg: push file descriptor list locking down to per-device locking
    [SCSI] sg: checking sdp->detached isn't protected when open
    [SCSI] sg: no need sg_open_exclusive_lock
    [SCSI] sg: use rwsem to solve race during exclusive open
    [SCSI] scsi_debug: fix logical block provisioning support when unmap_alignment != 0
    [SCSI] scsi_debug: fix endianness bug in sdebug_build_parts()
    [SCSI] qla2xxx: Update the driver version to 8.06.00.08-k.
    [SCSI] qla2xxx: print MAC via %pMR.
    [SCSI] qla2xxx: Correction to message ids.
    [SCSI] qla2xxx: Correctly print out/in mailbox registers.
    [SCSI] qla2xxx: Add a new interface to update versions.
    [SCSI] qla2xxx: Move queue depth ramp down message to i/o debug level.
    [SCSI] qla2xxx: Select link initialization option bits from current operating mode.
    [SCSI] qla2xxx: Add loopback IDC-TIME-EXTEND aen handling support.
    [SCSI] qla2xxx: Set default critical temperature value in cases when ISPFX00 firmware doesn't provide it
    [SCSI] qla2xxx: QLAFX00 make over temperature AEN handling informational, add log for normal temperature AEN
    [SCSI] qla2xxx: Correct Interrupt Register offset for ISPFX00
    [SCSI] qla2xxx: Remove handling of Shutdown Requested AEN from qlafx00_process_aen().
    [SCSI] qla2xxx: Send all AENs for ISPFx00 to above layers.
    [SCSI] qla2xxx: Add changes in initialization for ISPFX00 cards with BIOS
    ...

    Linus Torvalds
     
  • Signed-off-by: Chris Metcalf
    Acked-by: Greg Kroah-Hartman

    Chris Metcalf
     
  • Pull staging tree merge from Greg KH:
    "Here's the bit staging tree pull request for 3.12-rc1.

    Lots of staging driver updates, and fixes. Lustre is finally enabled
    in the build, and lots of cleanup started happening in it. There's a
    new wireless driver in here, and 2 new TTY drivers, which cause the
    overall lines added/removed to be quite large on the "added" side.

    The IIO driver updates are also coming through here, as they are tied
    to the staging iio drivers"

    * tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (942 commits)
    staging: dwc2: make dwc2_core_params documentation more complete
    staging: dwc2: validate the value for phy_utmi_width
    staging: dwc2: interpret all hwcfg and related register at init time
    staging: dwc2: properly mask the GRXFSIZ register
    staging: dwc2: remove redundant register reads
    staging: dwc2: re-use hptxfsiz variable
    staging: dwc2: simplify debug output in dwc_hc_init
    staging: dwc2: add missing shift
    staging: dwc2: simplify register shift expressions
    staging: dwc2: only read the snpsid register once
    staging: dwc2: unshift non-bool register value constants
    staging: dwc2: fix off-by-one in check for max_packet_count parameter
    staging: dwc2: remove specific fifo size constants
    Staging:BCM:DDRInit.c:Renaming __FUNCTION__
    staging: bcm: remove Version.h file.
    staging: rtl8188eu: off by one in rtw_set_802_11_add_wep()
    staging: r8188eu: copying one byte too much
    staging: rtl8188eu: || vs && typo
    staging: r8188eu: off by one bugs
    staging: crystalhd: Resolve sparse 'different base types' warnings.
    ...

    Linus Torvalds
     
  • Pull USB patches from Greg KH:
    "Here's the big USB driver pull request for 3.12-rc1

    Lots of USB driver fixes and updates. Nothing major, just the normal
    xhci, gadget, and other driver changes. Full details in the shortlog"

    * tag 'usb-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (352 commits)
    usbcore: fix incorrect type in assignment in descriptors_changed()
    usbcore: compare and release one bos descriptor in usb_reset_and_verify_device()
    ehci: remove debugging statement with ehci statistics in ehci_stop()
    ehci: remove duplicate debug_async_open() prototype in ehci-dbg.c
    ehci: enable debugging code when CONFIG_DYNAMIC_DEBUG is set
    ehci: remove ehci_vdbg() verbose debugging statements
    Documentation sysfs-bus-usb: Document which files are used by libusb
    Documentation sysfs-bus-usb: Document the speed file used by libusb
    Documentation sysfs-bus-usb: Move files with known users to stable
    USB: fix build error when CONFIG_PM_SLEEP isn't enabled
    usb: r8a66597-hcd: use platform_{get,set}_drvdata()
    usb: phy-tegra-usb: use platform_{get,set}_drvdata()
    usb: acm gadget: Null termintate strings table
    dma: cppi41: off by one in desc_to_chan()
    xhci: Fix warning introduced by disabling runtime PM.
    dev-core: fix build break when DEBUG is enabled
    USB: OHCI: Allow runtime PM without system sleep
    usb: ohci-at91: remove unnecessary dev_set_drvdata()
    usb: renesas_usbhs: use platform_{get,set}_drvdata()
    usb: fotg210-udc: use platform_{get,set}_drvdata()
    ...

    Linus Torvalds
     

03 Sep, 2013

1 commit


31 Aug, 2013

1 commit

  • Filtering capabilities on my work email are pretty much non-existent and this
    has turned out to be something of a firehose...

    Cc: Stephen Warren
    Cc: Rob Herring
    Cc: Olof Johansson
    Cc: Linus Walleij
    Signed-off-by: Ian Campbell
    Acked-by: Pawel Moll
    Acked-by: Mark Rutland
    Signed-off-by: Linus Torvalds

    Ian Campbell
     

30 Aug, 2013

2 commits


29 Aug, 2013

2 commits

  • I haven't had time to work on this driver for a long time and
    Ferruh has been doing a great job making it more generic,
    adding support for new hardware and providing bug fixes.

    So, let's make MAINTAINERS reflect reality and add him as the
    cyttsp maintainer instead of me.

    Also, since Ferruh works for Cypress, we may change the driver
    status from Maintained to Supported.

    Signed-off-by: Javier Martinez Canillas
    Acked-by: Ferruh Yigit
    Signed-off-by: Dmitry Torokhov

    Javier Martinez Canillas
     
  • Merged in this to avoid conflicts with the big locking fixes
    from upstream.

    Signed-off-by: Linus Walleij

    Conflicts:
    drivers/pinctrl/pinctrl-sunxi.c

    Linus Walleij
     

27 Aug, 2013

3 commits


26 Aug, 2013

1 commit


24 Aug, 2013

2 commits


23 Aug, 2013

2 commits

  • ASoC: Updates for v3.12

    - DAPM is now mandatory for CODEC drivers in order to avoid the repeated
    regressions in the special cases for non-DAPM CODECs and make it
    easier to integrate with other components on boards. All existing
    drivers have had some level of DAPM support added.
    - A lot of cleanups in DAPM plus support for maintaining controls in a
    specific state while a DAPM widget all contributed by Lars-Peter Clausen.
    - Core helpers for bitbanged AC'97 reset from Markus Pargmann.
    - New drivers and support for Analog Devices ADAU1702 and ADAU1401(a),
    Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and WM8904 based
    machines, Freescale S/PDIF and SSI AC'97, Renesas R-Car SoCs, Samsung
    Exynos5420 SoCs, Texas Instruments PCM1681 and PCM1792A and Wolfson
    Microelectronics WM8997.
    - Support for building drivers that can support it cross-platform for
    compile test.

    Takashi Iwai
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A handful of fixes for 3.11 are still trickling in. These are:
    - A couple of fixes for older OMAP platforms
    - Another few fixes for at91 (lateish due to European summer
    vacations)
    - A late-found problem with USB on Tegra, fix is to keep VBUS
    regulator on at all times
    - One fix for Exynos 5440 dealing with CPU detection
    - One MAINTAINERS update"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: tegra: always enable USB VBUS regulators
    ARM: davinci: nand: specify ecc strength
    ARM: OMAP: rx51: change musb mode to OTG
    ARM: OMAP2: fix musb usage for n8x0
    MAINTAINERS: Update email address for Benoit Cousson
    ARM: at91/DT: fix at91sam9n12ek memory node
    ARM: at91: add missing uart clocks DT entries
    ARM: SAMSUNG: fix to support for missing cpu specific map_io
    ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C

    Linus Torvalds
     

22 Aug, 2013

4 commits

  • Add a maintainers entry for the Aptina PLL library, and rename the
    Aptina sensors entries to make it clear they refer to Aptina camera
    sensors.

    Signed-off-by: Laurent Pinchart
    Signed-off-by: Mauro Carvalho Chehab

    Laurent Pinchart
     
  • Mark Brown
     
  • Mark Brown
     
  • …swarren/linux-tegra into next/soc

    From: Stephen Warren:
    ARM: tegra: core SoC enhancements for 3.12

    This branch includes a number of enhancements to core SoC support for
    Tegra devices. The major new features are:

    * Adds a new CPU-power-gated cpuidle state for Tegra114.
    * Adds initial system suspend support for Tegra114, initially supporting
    just CPU-power-gating during suspend.
    * Adds "LP1" suspend mode support for all of Tegra20/30/114. This mode
    both gates CPU power, and places the DRAM into self-refresh mode.
    * A new DT-driven PCIe driver to Tegra20/30. The driver is also moved
    from arch/arm/mach-tegra/ to drivers/pci/host/.

    The PCIe driver work depends on the following tag from Thomas Petazzoni:
    git://git.infradead.org/linux-mvebu.git mis-3.12.2
    ... which is merged into the middle of this pull request.

    * tag 'tegra-for-3.12-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (33 commits)
    ARM: tegra: disable LP2 cpuidle state if PCIe is enabled
    MAINTAINERS: Add myself as Tegra PCIe maintainer
    PCI: tegra: set up PADS_REFCLK_CFG1
    PCI: tegra: Add Tegra 30 PCIe support
    PCI: tegra: Move PCIe driver to drivers/pci/host
    PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms
    ARM: tegra: add LP1 suspend support for Tegra114
    ARM: tegra: add LP1 suspend support for Tegra20
    ARM: tegra: add LP1 suspend support for Tegra30
    ARM: tegra: add common LP1 suspend support
    clk: tegra114: add LP1 suspend/resume support
    ARM: tegra: config the polarity of the request of sys clock
    ARM: tegra: add common resume handling code for LP1 resuming
    ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci
    of: pci: add registry of MSI chips
    PCI: Introduce new MSI chip infrastructure
    PCI: remove ARCH_SUPPORTS_MSI kconfig option
    PCI: use weak functions for MSI arch-specific functions
    ARM: tegra: unify Tegra's Kconfig a bit more
    ARM: tegra: remove the limitation that Tegra114 can't support suspend
    ...

    Signed-off-by: Kevin Hilman <khilman@linaro.org>

    Kevin Hilman
     

21 Aug, 2013

2 commits