30 Oct, 2013

1 commit


20 Oct, 2013

1 commit


15 Oct, 2013

1 commit


03 Oct, 2013

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "We have a fairly large batch of fixes this time around, mostly just
    due to various platforms all having a fix or two more than usual.

    Worth pointing out are:

    - A fix for EDMA on Davinci/OMAP where channel allocation broke with
    the DT conversion. Due to some miscommunication we didn't
    understand the impact of the breakage, so we were pushing back on
    it for 3.12, but it sounds like it's actually breaking quite a few
    people out there.

    - A bunch of fixes for Marvell platforms, some straggling fixes for
    merge window fallout and some fixes for a couple of the platforms
    (Netgear RN102 in particular).

    - A fix for a race between multi-cluster power management and cpu
    hotplug on Versatile Express.

    And a bunch of other smaller fixes that all add up.

    We'll be switching over into stricter regressions-only mode from here
    on out"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
    ARM: multi_v7_defconfig: add SDHCI for i.MX
    bus: mvebu-mbus: Fix optional pcie-mem/io-aperture properties
    ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102
    ARM: at91: sam9g45: shutdown ddr1 too when rebooting
    MAINTAINERS: ARM: SIRF: use kernel.org mail box
    MAINTAINERS: ARM: SIRF: add missed drivers into maintain list
    ARM: edma: Fix clearing of unused list for DT DMA resources
    ARM: vexpress: tc2: fix hotplug/idle/kexec race on cluster power down
    ARM: dts: sirf: fix interrupt and dma prop of VIP for prima2 and atlas6
    ARM: dts: sirf: fix the ranges of peri-iobrg of prima2
    ARM: dts: makefile: build atlas6-evb.dtb for ARCH_ATLAS6
    ARM: dts: sirf: fix fifosize, clks, dma channels for UART
    ARM: mvebu: Add DT entry for ReadyNAS 102 to use gpio-poweroff driver
    ARM: mvebu: fix ReadyNAS 102 Power button GPIO to make it active high
    ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
    ARM: shmobile: Remove #gpio-ranges-cells DT property
    gpio: rcar: Remove #gpio-range-cells DT property usage
    ARM: shmobile: armadillo: fixup ether pinctrl naming
    ARM: shmobile: Lager: add Micrel KSZ8041 PHY fixup
    ARM: shmobile: update SDHI DT compatibility string to the - format
    ...

    Linus Torvalds
     

02 Oct, 2013

1 commit

  • Pull networking changes from David Miller:

    1) Multiply in netfilter IPVS can overflow when calculating destination
    weight. From Simon Kirby.

    2) Use after free fixes in IPVS from Julian Anastasov.

    3) SFC driver bug fixes from Daniel Pieczko.

    4) Memory leak in pcan_usb_core failure paths, from Alexey Khoroshilov.

    5) Locking and encapsulation fixes to serial line CAN driver, from
    Andrew Naujoks.

    6) Duplex and VF handling fixes to bnx2x driver from Yaniv Rosner,
    Eilon Greenstein, and Ariel Elior.

    7) In lapb, if no other packets are outstanding, T1 timeouts actually
    stall things and no packet gets sent. Fix from Josselin Costanzi.

    8) ICMP redirects should not make it to the socket error queues, from
    Duan Jiong.

    9) Fix bugs in skge DMA mapping error handling, from Nikulas Patocka.

    10) Fix setting of VLAN priority field on via-rhine driver, from Roget
    Luethi.

    11) Fix TX stalls and VLAN promisc programming in be2net driver from
    Ajit Khaparde.

    12) Packet padding doesn't get handled correctly in new usbnet SG
    support code, from Ming Lei.

    13) Fix races in netdevice teardown wrt. network namespace closing.
    From Eric W. Biederman.

    14) Fix potential missed initialization of net_secret if not TCP
    connections are openned. From Eric Dumazet.

    15) Cinterion PLXX product ID in qmi_wwan driver is wrong, from
    Aleksander Morgado.

    16) skb_cow_head() can change skb->data and thus packet header pointers,
    don't use stale ip_hdr reference in ip_tunnel code.

    17) Backend state transition handling fixes in xen-netback, from Paul
    Durrant.

    18) Packet offset for AH protocol is handled wrong in flow dissector,
    from Eric Dumazet.

    19) Taking down an fq packet scheduler instance can leave stale packets
    in the queues, fix from Eric Dumazet.

    20) Fix performance regressions introduced by TCP Small Queues. From
    Eric Dumazet.

    21) IPV6 GRE tunneling code calculates max_headroom incorrectly, from
    Hannes Frederic Sowa.

    22) Multicast timer handlers in ipv4 and ipv6 can be the last and final
    reference to the ipv4/ipv6 specific network device state, so use the
    reference put that will check and release the object if the
    reference hits zero. From Salam Noureddine.

    23) Fix memory corruption in ip_tunnel driver, and use skb_push()
    instead of __skb_push() so that similar bugs are less hard to find.
    From Steffen Klassert.

    24) Add forgotten hookup of rtnl_ops in SIT and ip6tnl drivers, from
    Nicolas Dichtel.

    25) fq scheduler doesn't accurately rate limit in certain circumstances,
    from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (103 commits)
    pkt_sched: fq: rate limiting improvements
    ip6tnl: allow to use rtnl ops on fb tunnel
    sit: allow to use rtnl ops on fb tunnel
    ip_tunnel: Remove double unregister of the fallback device
    ip_tunnel_core: Change __skb_push back to skb_push
    ip_tunnel: Add fallback tunnels to the hash lists
    ip_tunnel: Fix a memory corruption in ip_tunnel_xmit
    qlcnic: Fix SR-IOV configuration
    ll_temac: Reset dma descriptors indexes on ndo_open
    skbuff: size of hole is wrong in a comment
    ipv6 mcast: use in6_dev_put in timer handlers instead of __in6_dev_put
    ipv4 igmp: use in_dev_put in timer handlers instead of __in_dev_put
    ethernet: moxa: fix incorrect placement of __initdata tag
    ipv6: gre: correct calculation of max_headroom
    powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file
    Revert "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file"
    bonding: Fix broken promiscuity reference counting issue
    tcp: TSQ can use a dynamic limit
    dm9601: fix IFF_ALLMULTI handling
    pkt_sched: fq: qdisc dismantle fixes
    ...

    Linus Torvalds
     

01 Oct, 2013

3 commits

  • Currently IEEE 1588 timer reference clock source is determined through
    hard-coded value in gianfar_ptp driver. This patch allows to select ptp
    clock source by means of device tree file node.

    For instance:

    fsl,cksel = ;

    for using external (TSEC_TMR_CLK input) high precision timer
    reference clock.

    Other acceptable values:

    : eTSEC system clock
    : eTSEC1 transmit clock
    : RTC clock input

    When this attribute isn't used, eTSEC system clock will serve as
    IEEE 1588 timer reference clock.

    Signed-off-by: Aida Mynzhasova
    Acked-by: Kumar Gala
    Signed-off-by: David S. Miller

    Aida Mynzhasova
     
  • This reverts commit 894116bd0e9b7749a0c4b6c62dec13c2a0ccef68.

    I applied the wrong version of this patch, correct
    version coming up.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Currently IEEE 1588 timer reference clock source is determined through
    hard-coded value in gianfar_ptp driver. This patch allows to select ptp
    clock source by means of device tree file node.

    For instance:

    fsl,cksel = ;

    for using external (TSEC_TMR_CLK input) high precision timer
    reference clock.

    Other acceptable values:

    : eTSEC system clock
    : eTSEC1 transmit clock
    : RTC clock input

    When this attribute isn't used, eTSEC system clock will serve as
    IEEE 1588 timer reference clock.

    Signed-off-by: Aida Mynzhasova
    Acked-by: Richard Cochran
    Signed-off-by: David S. Miller

    Aida Mynzhasova
     

30 Sep, 2013

1 commit

  • Pull tty/serial fixes from Greg KH:
    "Here are some serial at tty driver fixes for 3.12-rc3

    The serial driver fixes some kref leaks, documentation is moved to the
    proper places, and the tty and n_tty fixes resolve some reported
    regressions. There is still one outstanding tty regression fix that
    isn't in here yet, as I want to test it out some more, it will be sent
    for 3.12-rc4 if it checks out"

    * tag 'tty-3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
    tty: ar933x_uart: move devicetree binding documentation
    tty: Fix SIGTTOU not sent with tcflush()
    n_tty: Fix EOF push index when termios changes
    serial: pch_uart: remove unnecessary tty_port_tty_get
    serial: pch_uart: fix tty-kref leak in dma-rx path
    serial: pch_uart: fix tty-kref leak in rx-error path
    serial: tegra: fix tty-kref leak

    Linus Torvalds
     

27 Sep, 2013

1 commit

  • Commit 'tty: ar933x_uart: add device tree support
    and binding documentation' introduced a new doc in
    bindins/tty/serial.

    According to a recent thread [1] on the linux-serial
    list, the binding documentation of serial drivers
    should be added into bindings/serial.

    Move the documentation of qca,ar9330-uart to the
    correct place.

    1. http://marc.info/?l=linux-serial&m=137771295411517

    Cc: devicetree@vger.kernel.org
    Signed-off-by: Gabor Juhos
    Signed-off-by: Greg Kroah-Hartman

    Gabor Juhos
     

25 Sep, 2013

1 commit

  • s/Synopsis/Synopsys
    s/synopsis/synopsys

    Signed-off-by: Dinh Nguyen
    Cc: Pavel Machek
    CC: Arnd Bergmann
    CC: Olof Johansson
    Cc: Rob Herring
    Cc: Pawel Moll
    Cc: Mark Rutland
    Cc: Stephen Warren
    Cc: Ian Campbell
    Cc: Chris Ball
    Cc: Jaehoon Chung
    Cc: Seungwon Jeon
    Cc: Tomasz Figa
    Cc: devicetree@vger.kernel.org
    Cc: linux-mmc@vger.kernel.org
    CC: linux-arm-kernel@lists.infradead.org
    Acked-by: Olof Johansson
    Signed-off-by: Rob Herring

    Dinh Nguyen
     

22 Sep, 2013

1 commit

  • Currently DT compatibility strings of both types can be found in the kernel
    sources: - and -, whereas a unique format should be
    followed and the former one is preferred. This patch converts the SDHI
    MMC driver and its users to the common standard. This is safe for now, since
    ATM no real products are using this driver with DT.

    Signed-off-by: Guennadi Liakhovetski
    Acked-by: Chris Ball
    [Removed r8a7740.dtsi portion as it is not applicable]
    Signed-off-by: Simon Horman

    Guennadi Liakhovetski
     

17 Sep, 2013

1 commit

  • Pull timer code update from Thomas Gleixner:
    - armada SoC clocksource overhaul with a trivial merge conflict
    - Minor improvements to various SoC clocksource drivers

    * 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding
    clocksource: armada-370-xp: Get reference fixed-clock by name
    clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
    clocksource: armada-370-xp: Fix device-tree binding
    clocksource: armada-370-xp: Introduce new compatibles
    clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
    clocksource: armada-370-xp: Simplify TIMER_CTRL register access
    clocksource: armada-370-xp: Use BIT()
    ARM: timer-sp: Set dynamic irq affinity
    ARM: nomadik: add dynamic irq flag to the timer
    clocksource: sh_cmt: 32-bit control register support
    clocksource: em_sti: Convert to devm_* managed helpers

    Linus Torvalds
     

13 Sep, 2013

2 commits

  • Pull MIPS updates from Ralf Baechle:
    "This has been sitting in -next for a while with no objections and all
    MIPS defconfigs except one are building fine; that one platform got
    broken by another patch in your tree and I'm going to submit a patch
    separately.

    - a handful of fixes that didn't make 3.11
    - a few bits of Octeon 3 support with more to come for a later
    release
    - platform enhancements for Octeon, ath79, Lantiq, Netlogic and
    Ralink SOCs
    - a GPIO driver for the Octeon
    - some dusting off of the DECstation code
    - the usual dose of cleanups"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (65 commits)
    MIPS: DMA: Fix BUG due to smp_processor_id() in preemptible code
    MIPS: kexec: Fix random crashes while loading crashkernel
    MIPS: kdump: Skip walking indirection page for crashkernels
    MIPS: DECstation HRT calibration bug fixes
    MIPS: Export copy_from_user_page() (needed by lustre)
    MIPS: Add driver for the built-in PCI controller of the RT3883 SoC
    MIPS: DMA: For BMIPS5000 cores flush region just like non-coherent R10000
    MIPS: ralink: Add support for reset-controller API
    MIPS: ralink: mt7620: Add cpu-feature-override header
    MIPS: ralink: mt7620: Add spi clock definition
    MIPS: ralink: mt7620: Add wdt clock definition
    MIPS: ralink: mt7620: Improve clock frequency detection
    MIPS: ralink: mt7620: This SoC has EHCI and OHCI hosts
    MIPS: ralink: mt7620: Add verbose ram info
    MIPS: ralink: Probe clocksources from OF
    MIPS: ralink: Add support for systick timer found on newer ralink SoC
    MIPS: ralink: Add support for periodic timer irq
    MIPS: Netlogic: Built-in DTB for XLP2xx SoC boards
    MIPS: Netlogic: Add support for USB on XLP2xx
    MIPS: Netlogic: XLP2xx update for I2C controller
    ...

    Linus Torvalds
     
  • Pull led updates from Bryan Wu:
    "Sorry for the late pull request, since I'm just back from vacation.

    LED subsystem updates for 3.12:
    - pca9633 driver DT supporting and pca9634 chip supporting
    - restore legacy device attributes for lp5521
    - other fixing and updates"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (28 commits)
    leds: wm831x-status: Request a REG resource
    leds: trigger: ledtrig-backlight: Fix invalid memory access in fb_event notification callback
    leds-pca963x: Fix device tree parsing
    leds-pca9633: Rename to leds-pca963x
    leds-pca9633: Add mutex to the ledout register
    leds-pca9633: Unique naming of the LEDs
    leds-pca9633: Add support for PCA9634
    leds: lp5562: use LP55xx common macros for device attributes
    Documentation: leds-lp5521,lp5523: update device attribute information
    leds: lp5523: remove unnecessary writing commands
    leds: lp5523: restore legacy device attributes
    leds: lp5523: LED MUX configuration on initializing
    leds: lp5523: make separate API for loading engine
    leds: lp5521: remove unnecessary writing commands
    leds: lp5521: restore legacy device attributes
    leds: lp55xx: add common macros for device attributes
    leds: lp55xx: add common data structure for program
    Documentation: leds: Fix a typo
    leds: ss4200: Fix incorrect placement of __initdata
    leds: clevo-mail: Fix incorrect placement of __initdata
    ...

    Linus Torvalds
     

12 Sep, 2013

5 commits

  • Pull sound fixes from Takashi Iwai:
    "A few last-minute fixes for 3.12-rc1. All patches are driver
    specific.

    - HD-audio fixes: MacBook 6,1/6,2 speaker fix, ASUS TX300 dock
    speaker fix, Toshiba Satellite irq fix, Haswell HDMI audio
    cleanups)

    - ASoC fixes: atmel irq fix, fsl DT fix, mc13783 spi fix, kirkwood
    compatible string change, etc"

    * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ASoC: mc13783: add spi errata fix
    ASoC: rsnd: fixup flag name of rsnd_scu_platform_info
    ALSA: hda - Add CS4208 codec support for MacBook 6,1 and 6,2
    ALSA: hda - Add Toshiba Satellite C870 to MSI blacklist
    ASoC: fsl_spdif: Select regmap-mmio
    ALSA: hda - unmute pin amplifier in infoframe setup for Haswell
    ALSA: hda - define is_haswell() to check if a display audio codec is Haswell
    ALSA: hda - Add dock speaker support for ASUS TX300
    ASoC: kirkwood: change the compatible string of the kirkwood-i2s driver
    ASoC: atmel: disable error interrupt
    ASoC: fsl: imx-audmux: Do not call imx_audmux_parse_dt_defaults() on non-dt kernel

    Linus Torvalds
     
  • Pull thermal management updates from Zhang Rui:
    "We have a lot of SOC changes and a few thermal core fixes this time.

    The biggest change is about exynos thermal driver restructure. The
    patch set adds TMU (Thermal management Unit) driver support for
    exynos5440 platform. There are 3 instances of the TMU controllers so
    necessary cleanup/re-structure is done to handle multiple thermal
    zone.

    The next biggest change is the introduction of the imx thermal driver.
    It adds the imx thermal support using Temperature Monitor (TEMPMON)
    block found on some Freescale i.MX SoCs. The driver uses syscon
    regmap interface to access TEMPMON control registers and calibration
    data, and supports cpufreq as the cooling device.

    Highlights:

    - restructure exynos thermal driver.

    - introduce new imx thermal driver.

    - fix a bug in thermal core, which powers on the fans unexpectedly
    after resume from suspend"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (46 commits)
    drivers: thermal: add check when unregistering cpu cooling
    thermal: thermal_core: allow binding with limits on bind_params
    drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional
    drivers: thermal: parent virtual hwmon with thermal zone
    thermal: hwmon: move hwmon support to single file
    thermal: exynos: Clean up non-DT remnants
    thermal: exynos: Fix potential NULL pointer dereference
    thermal: exynos: Fix typos in Kconfig
    thermal: ti-soc-thermal: Ensure to compute thermal trend
    thermal: ti-soc-thermal: Set the bandgap mask counter delay value
    thermal: ti-soc-thermal: Initialize counter_delay field for TI DRA752 sensors
    thermal: step_wise: return instance->target by default
    thermal: step_wise: cdev only needs update on a new target state
    Thermal/cpu_cooling: Return directly for the cpu out of allowed_cpus in the cpufreq_thermal_notifier()
    thermal: exynos_tmu: fix wrong error check for mapped memory
    thermal: imx: implement thermal alarm interrupt handling
    thermal: imx: dynamic passive and SoC specific critical trip points
    Documentation: thermal: Explain the exynos thermal driver model
    ARM: dts: thermal: exynos: Add documentation for Exynos SoC thermal bindings
    thermal: exynos: Support for TMU regulator defined at device tree
    ...

    Linus Torvalds
     
  • Palmas series device like TPS65913, TPS80036 supports the backup battery
    for powering the RTC when no other energy source is available.

    The backup battery is optional, connected to the VBACKUP pin, and can be
    nonrechargeable or rechargeable. The rechargeable battery can be charged
    from the system supply using the backup battery charger.

    Add support for enabling charging of this backup battery. Also add the DT
    binding document and the new properties to have this support.

    Signed-off-by: Laxman Dewangan
    Reviewed-by: Felipe Balbi
    Acked-by: Kumar Gala
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Laxman Dewangan
     
  • On some platforms (like AM33xx), a special register (RTC_IRQWAKEEN) is
    available to enable Alarm Wakeup feature. This register needs to be
    properly handled for the rtcwake to work properly.

    Platforms using such IP should set "ti,am3352-rtc" in rtc device dt
    compatibility node.

    Signed-off-by: Hebbar Gururaja
    Acked-by: Kevin Hilman
    Acked-by: Sekhar Nori
    Cc: Grant Likely
    Cc: Rob Herring
    Cc: Rob Landley
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hebbar Gururaja
     
  • Add RTC driver for MOXA ART SoCs.

    Signed-off-by: Jonas Jensen
    Reviewed-by: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jonas Jensen
     

11 Sep, 2013

4 commits

  • Pull battery/power supply driver updates from Anton Vorontsov:
    "New drivers:

    - APM X-Gene system reboot driver by Feng Kan and Loc Ho (APM).

    - Qualcomm MSM reboot/poweroff driver by Abhimanyu Kapur (Codeaurora).

    - Texas Instruments BQ24190 charger driver by Mark A. Greer (Animal
    Creek Technologies).

    - Texas Instruments TWL4030 MADC battery driver by Lukas Märdian and
    Marek Belisko (Golden Delicious Computers). The driver is used on
    Freerunner GTA04 phones.

    Highlighted fixes and improvements:

    - Suspend/wakeup logic improvements: power supply objects will block
    system suspend until all power supply events are processed. Thanks
    to Zoran Markovic (Linaro), Arve Hjonnevag and Todd Poynor (Google)"

    * tag 'for-v3.12' of git://git.infradead.org/battery-2.6:
    rx51_battery: Fix channel number when reading adc value
    power: Add twl4030_madc battery driver.
    bq24190_charger: Workaround SS definition problem on i386 builds
    power_supply: Prevent suspend until power supply events are processed
    vexpress-poweroff: Should depend on the required infrastructure
    twl4030-charger: Fix compiler warning with regulator_enable()
    rx51_battery: Replace hardcoded channels values.
    bq24190_charger: Add support for TI BQ24190 Battery Charger
    ab8500-charger: We print an unintended error message
    max8925_power: Fix missing of_node_put
    power_supply: Replace strict_strtol() with kstrtol()
    power: Add APM X-Gene system reboot driver
    power_supply: tosa_battery: Get rid of irq_to_gpio usage
    power supply: collie_battery: Convert to use dev_pm_ops
    power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST
    power: reset: Add msm restart support
    MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers

    Linus Torvalds
     
  • Pull device tree core updates from Grant Likely:
    "Generally minor changes. A bunch of bug fixes, particularly for
    initialization and some refactoring. Most notable change if feeding
    the entire flattened tree into the random pool at boot. May not be
    significant, but shouldn't hurt either"

    Tim Bird questions whether the boot time cost of the random feeding may
    be noticeable. And "add_device_randomness()" is definitely not some
    speed deamon of a function.

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
    of/platform: add error reporting to of_amba_device_create()
    irq/of: Fix comment typo for irq_of_parse_and_map
    of: Feed entire flattened device tree into the random pool
    of/fdt: Clean up casting in unflattening path
    of/fdt: Remove duplicate memory clearing on FDT unflattening
    gpio: implement gpio-ranges binding document fix
    of: call __of_parse_phandle_with_args from of_parse_phandle
    of: introduce of_parse_phandle_with_fixed_args
    of: move of_parse_phandle()
    of: move documentation of of_parse_phandle_with_args
    of: Fix missing memory initialization on FDT unflattening
    of: consolidate definition of early_init_dt_alloc_memory_arch()
    of: Make of_get_phy_mode() return int i.s.o. const int
    include: dt-binding: input: create a DT header defining key codes.
    of/platform: Staticize of_platform_device_create_pdata()
    of: Specify initrd location using 64-bit
    dt: Typo fix
    OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled

    Linus Torvalds
     
  • Pull slave-dmaengine updates from Vinod Koul:
    "This pull brings:
    - Andy's DW driver updates
    - Guennadi's sh driver updates
    - Pl08x driver fixes from Tomasz & Alban
    - Improvements to mmp_pdma by Daniel
    - TI EDMA fixes by Joel
    - New drivers:
    - Hisilicon k3dma driver
    - Renesas rcar dma driver
    - New API for publishing slave driver capablities
    - Various fixes across the subsystem by Andy, Jingoo, Sachin etc..."

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (94 commits)
    dma: edma: Remove limits on number of slots
    dma: edma: Leave linked to Null slot instead of DUMMY slot
    dma: edma: Find missed events and issue them
    ARM: edma: Add function to manually trigger an EDMA channel
    dma: edma: Write out and handle MAX_NR_SG at a given time
    dma: edma: Setup parameters to DMA MAX_NR_SG at a time
    dmaengine: pl330: use dma_set_max_seg_size to set the sg limit
    dmaengine: dma_slave_caps: remove sg entries
    dma: replace devm_request_and_ioremap by devm_ioremap_resource
    dma: ste_dma40: Fix potential null pointer dereference
    dma: ste_dma40: Remove duplicate const
    dma: imx-dma: Remove redundant NULL check
    dma: dmagengine: fix function names in comments
    dma: add driver for R-Car HPB-DMAC
    dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
    dma: imx-sdma: Staticize sdma_driver_data structures
    pch_dma: Add MODULE_DEVICE_TABLE
    dmaengine: PL08x: Add cyclic transfer support
    dmaengine: PL08x: Fix reading the byte count in cctl
    dmaengine: PL08x: Add support for different maximum transfer size
    ...

    Linus Torvalds
     
  • Pull MMC updates from Chris Ball:
    "MMC highlights for 3.12:

    Core:
    - Support Allocation Units 8MB-64MB in SD3.0, previous max was 4MB.
    - The slot-gpio helper can now handle GPIO debouncing card-detect.
    - Read supported voltages from DT "voltage-ranges" property.

    Drivers:
    - dw_mmc: Add support for ARC architecture, and support exynos5420.
    - mmc_spi: Support CD/RO GPIOs.
    - sh_mobile_sdhi: Add compatibility for more Renesas SoCs.
    - sh_mmcif: Add DT support for DMA channels"

    * tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (50 commits)
    Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"
    mmc: dw_mmc: Add support for ARC
    mmc: sdhci-s3c: initialize host->quirks2 for using quirks2
    mmc: sdhci-s3c: fix the wrong register value, when clock is disabled
    mmc: esdhc: add support to get voltage from device-tree
    mmc: sdhci: get voltage from sdhc host
    mmc: core: parse voltage from device-tree
    mmc: omap_hsmmc: use the generic config for omap2plus devices
    mmc: omap_hsmmc: clear status flags before starting a new command
    mmc: dw_mmc: exynos: Add a new compatible string for exynos5420
    mmc: sh_mmcif: revision-specific CLK_CTRL2 handling
    mmc: sh_mmcif: revision-specific Command Completion Signal handling
    mmc: sh_mmcif: add support for Device Tree DMA bindings
    mmc: sh_mmcif: move header include from header into .c
    mmc: SDHI: add DT compatibility strings for further SoCs
    mmc: dw_mmc-pci: enable bus-mastering mode
    mmc: dw_mmc-pci: get resources from a proper BAR
    mmc: tmio-mmc: Remove .set_pwr() callback from platform data
    mmc: tmio-mmc: Remove .get_cd() callback from platform data
    mmc: sh_mobile_sdhi: Remove .set_pwr() callback from platform data
    ...

    Linus Torvalds
     

10 Sep, 2013

4 commits

  • Pull clock framework changes from Michael Turquette:
    "The common clk framework changes for 3.12 are dominated by clock
    driver patches, both new drivers and fixes to existing. A high
    percentage of these are for Samsung platforms like Exynos. Core
    framework fixes and some new features like automagical clock
    re-parenting round out the patches"

    * tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux: (102 commits)
    clk: only call get_parent if there is one
    clk: samsung: exynos5250: Simplify registration of PLL rate tables
    clk: samsung: exynos4: Register PLL rate tables for Exynos4x12
    clk: samsung: exynos4: Register PLL rate tables for Exynos4210
    clk: samsung: exynos4: Reorder registration of mout_vpllsrc
    clk: samsung: pll: Add support for rate configuration of PLL46xx
    clk: samsung: pll: Use new registration method for PLL46xx
    clk: samsung: pll: Add support for rate configuration of PLL45xx
    clk: samsung: pll: Use new registration method for PLL45xx
    clk: samsung: exynos4: Rename exynos4_plls to exynos4x12_plls
    clk: samsung: exynos4: Remove checks for DT node
    clk: samsung: exynos4: Remove unused static clkdev aliases
    clk: samsung: Modify _get_rate() helper to use __clk_lookup()
    clk: samsung: exynos4: Use separate aliases for cpufreq related clocks
    clocksource: samsung_pwm_timer: Get clock from device tree
    ARM: dts: exynos4: Specify PWM clocks in PWM node
    pwm: samsung: Update DT bindings documentation to cover clocks
    clk: Move symbol export to proper location
    clk: fix new_parent dereference before null check
    clk: wm831x: Initialise wm831x pointer on init
    ...

    Linus Torvalds
     
  • Pull mtd updates from David Woodhouse:
    - factor out common code from MTD tests
    - nand-gpio cleanup and portability to non-ARM
    - m25p80 support for 4-byte addressing chips, other new chips
    - pxa3xx cleanup and support for new platforms
    - remove obsolete alauda, octagon-5066 drivers
    - erase/write support for bcm47xxsflash
    - improve detection of ECC requirements for NAND, controller setup
    - NFC acceleration support for atmel-nand, read/write via SRAM
    - etc

    * tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd: (184 commits)
    mtd: chips: Add support for PMC SPI Flash chips in m25p80.c
    mtd: ofpart: use for_each_child_of_node() macro
    mtd: mtdswap: replace strict_strtoul() with kstrtoul()
    mtd cs553x_nand: use kzalloc() instead of memset
    mtd: atmel_nand: fix error return code in atmel_nand_probe()
    mtd: bcm47xxsflash: writing support
    mtd: bcm47xxsflash: implement erasing support
    mtd: bcm47xxsflash: convert to module_platform_driver instead of init/exit
    mtd: bcm47xxsflash: convert kzalloc to avoid invalid access
    mtd: remove alauda driver
    mtd: nand: mxc_nand: mark 'const' properly
    mtd: maps: cfi_flagadm: add missing __iomem annotation
    mtd: spear_smi: add missing __iomem annotation
    mtd: r852: Staticize local symbols
    mtd: nandsim: Staticize local symbols
    mtd: impa7: add missing __iomem annotation
    mtd: sm_ftl: Staticize local symbols
    mtd: m25p80: add support for mr25h10
    mtd: m25p80: make CONFIG_M25PXX_USE_FAST_READ safe to enable
    mtd: m25p80: Pass flags through CAT25_INFO macro
    ...

    Linus Torvalds
     
  • Pull DMA mapping update from Marek Szyprowski:
    "This contains an addition of Device Tree support for reserved memory
    regions (Contiguous Memory Allocator is one of the drivers for it) and
    changes required by the KVM extensions for PowerPC architectue"

    * 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
    ARM: init: add support for reserved memory defined by device tree
    drivers: of: add initialization code for dma reserved memory
    drivers: of: add function to scan fdt nodes given by path
    drivers: dma-contiguous: clean source code and prepare for device tree

    Linus Torvalds
     
  • Pull metag architecture changes from James Hogan:
    - Device tree updates for TZ1090 GPIO drivers merged via GPIO tree.
    - Add driver for ImgTec PDC irqchip as found in TZ1090 SoC.
    - Add linux-metag mailing list to MAINTAINERS file.

    * tag 'metag-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
    irq-imgpdc: add ImgTec PDC irqchip driver
    MAINTAINERS: add linux-metag mailing list
    metag: tz1090: instantiate gpio-tz1090-pdc
    metag: tz1090: select and instantiate gpio-tz1090
    metag: tz1090: select and instantiate irq-imgpdc

    Linus Torvalds
     

08 Sep, 2013

3 commits

  • Pull MFD (multi-function device) updates from Samuel Ortiz:
    "For the 3.12 merge window we have one new driver for the DA9063 PMIC
    from Dialog Semiconductor.

    Besides that driver we also have:

    - Device tree support for the s2mps11 driver

    - More devm_* conversion for the pm8921, max89xx, menelaus, tps65010,
    wl1273 and pcf50633-adc drivers.

    - A conversion to threaded IRQ and IRQ domain for the twl6030 driver.

    - A fairly big update for the rtsx driver: Better power saving
    support, better vendor settings handling, and a few fixes.

    - Support for a couple more boards (COMe-bHL6 and COMe-cTH6) for the
    Kontron driver.

    - A conversion to the dev_get_platdata() API for all MFD drivers.

    - A removal of non-DT (legacy) support for the twl6040 driver.

    - A few fixes and additions (Mic detect level) to the wm5110 register
    tables.

    - Regmap support for the davinci_voicecodec driver.

    - The usual bunch of minor cleanups and janitorial fixes"

    * tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (81 commits)
    mfd: ucb1x00-core: Rewrite ucb1x00_add_dev()
    mfd: ab8500-debugfs: Apply a check for -ENOMEM after allocating memory for event name
    mfd: ab8500-debugfs: Apply a check for -ENOMEM after allocating memory for sysfs
    mfd: timberdale: Use module_pci_driver
    mfd: timberdale: Remove redundant break
    mfd: timberdale: Staticize local variables
    mfd: ab8500-debugfs: Staticize local variables
    mfd: db8500-prcmu: Staticize clk_mgt
    mfd: db8500-prcmu: Use ANSI function declaration
    mfd: omap-usb-host: Staticize usbhs_driver_name
    mfd: 88pm805: Fix potential NULL pdata dereference
    mfd: 88pm800: Fix potential NULL pdata dereference
    mfd: twl6040: Use regmap for register cache
    mfd: davinci_voicecodec: Provide a regmap for register I/O
    mfd: davinci_voicecodec: Remove unused read and write functions
    mmc: memstick: rtsx: Modify copyright comments
    mmc: rtsx: Clear SD_CLK toggle enable bit if switching voltage fail
    mfd: mmc: rtsx: Change default tx phase
    mfd: pcf50633-adc: Use devm_*() functions
    mfd: rtsx: Copyright modifications
    ...

    Linus Torvalds
     
  • 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

7 commits

  • Merge first round of changes for 3.12 merge window.

    Dmitry Torokhov
     
  • PWM driver consumes at least one and up to three clocks, which need to be
    specified in device tree when used. This patch updates bindings
    documentation to add information about clocks.

    Signed-off-by: Tomasz Figa
    Signed-off-by: Kyungmin Park
    Acked-by: Stephen Warren
    Reviewed-by: Sylwester Nawrocki
    Signed-off-by: Mike Turquette

    Tomasz Figa
     
  • 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 ARM SoC DT updates from Olof Johansson:
    "Device tree and bindings updates for 3.12.

    General additions of various on-chip and on-board peripherals on
    various platforms as support gets added. Some of the bigger changes
    are:

    - Addition of (new) PCI-e support on Tegra.
    - More Tegra4 support, including PMC configuration for Dalmore.
    - Addition of a new board for Exynos4 (trats2) and more bindings for
    4x12 IP.
    - Addition of Allwinner A20 and A31 SoC and board files.
    - Move of the ST Ericsson device tree files to now use ste-* prefix.
    - More move of hardware description of shmobile platforms to DT.
    - Two new board dts files for Freescale MXs"

    * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (177 commits)
    dts: Rename DW APB timer compatible strings
    dts: Deprecate ALTR as a vendor prefix
    of: add vendor prefix for Altera Corp.
    ARM: at91/dt: sam9x5ek: add sound configuration
    ARM: at91/dt: sam9x5ek: enable SSC
    ARM: at91/dt: sam9x5ek: add WM8731 codec
    ARM: at91/dt: sam9x5: add SSC DMA parameters
    ARM: at91/dt: add at91rm9200 PQFP package version
    ARM: at91: at91rm9200: set default mmc0 pinctrl-names
    ARM: at91: at91sam9n12: correct pin number of gpio-key
    ARM: at91: at91sam9n12: add qt1070 support
    ARM: at91: at91sam9n12: add pinctrl of TWI
    ARM: at91: Add PMU support for sama5d3
    ARM: at91: at91sam9260: add missing pinctrl-names on mmc
    ARM: tegra: configure power off for Dalmore
    ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
    ARM: dts: add sdio blocks to bcm28155-ap board
    ARM: dts: align sdio numbers to HW definition
    ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
    ARM: sun7i: Add Allwinner A20 DTSI
    ...

    Linus Torvalds
     
  • Pull powerpc updates from Ben Herrenschmidt:
    "Here's the powerpc batch for this merge window. Some of the
    highlights are:

    - A bunch of endian fixes ! We don't have full LE support yet in that
    release but this contains a lot of fixes all over arch/powerpc to
    use the proper accessors, call the firmware with the right endian
    mode, etc...

    - A few updates to our "powernv" platform (non-virtualized, the one
    to run KVM on), among other, support for bridging the P8 LPC bus
    for UARTs, support and some EEH fixes.

    - Some mpc51xx clock API cleanups in preparation for a clock API
    overhaul

    - A pile of cleanups of our old math emulation code, including better
    support for using it to emulate optional FP instructions on
    embedded chips that otherwise have a HW FPU.

    - Some infrastructure in selftest, for powerpc now, but could be
    generalized, initially used by some tests for our perf instruction
    counting code.

    - A pile of fixes for hotplug on pseries (that was seriously
    bitrotting)

    - The usual slew of freescale embedded updates, new boards, 64-bit
    hiberation support, e6500 core PMU support, etc..."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
    powerpc: Correct FSCR bit definitions
    powerpc/xmon: Fix printing of set of CPUs in xmon
    powerpc/pseries: Move lparcfg.c to platforms/pseries
    powerpc/powernv: Return secondary CPUs to firmware on kexec
    powerpc/btext: Fix CONFIG_PPC_EARLY_DEBUG_BOOTX on ppc32
    powerpc: Cleanup handling of the DSCR bit in the FSCR register
    powerpc/pseries: Child nodes are not detached by dlpar_detach_node
    powerpc/pseries: Add mising of_node_put in delete_dt_node
    powerpc/pseries: Make dlpar_configure_connector parent node aware
    powerpc/pseries: Do all node initialization in dlpar_parse_cc_node
    powerpc/pseries: Fix parsing of initial node path in update_dt_node
    powerpc/pseries: Pack update_props_workarea to map correctly to rtas buffer header
    powerpc/pseries: Fix over writing of rtas return code in update_dt_node
    powerpc/pseries: Fix creation of loop in device node property list
    powerpc: Skip emulating & leave interrupts off for kernel program checks
    powerpc: Add more exception trampolines for hypervisor exceptions
    powerpc: Fix location and rename exception trampolines
    powerpc: Add more trap names to xmon
    powerpc/pseries: Add a warning in the case of cross-cpu VPA registration
    powerpc: Update the 00-Index in Documentation/powerpc
    ...

    Linus Torvalds
     
  • Pull trivial tree from Jiri Kosina:
    "The usual trivial updates all over the tree -- mostly typo fixes and
    documentation updates"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
    doc: Documentation/cputopology.txt fix typo
    treewide: Convert retrun typos to return
    Fix comment typo for init_cma_reserved_pageblock
    Documentation/trace: Correcting and extending tracepoint documentation
    mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
    power: Documentation: Update s2ram link
    doc: fix a typo in Documentation/00-INDEX
    Documentation/printk-formats.txt: No casts needed for u64/s64
    doc: Fix typo "is is" in Documentations
    treewide: Fix printks with 0x%#
    zram: doc fixes
    Documentation/kmemcheck: update kmemcheck documentation
    doc: documentation/hwspinlock.txt fix typo
    PM / Hibernate: add section for resume options
    doc: filesystems : Fix typo in Documentations/filesystems
    scsi/megaraid fixed several typos in comments
    ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
    treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
    page_isolation: Fix a comment typo in test_pages_isolated()
    doc: fix a typo about irq affinity
    ...

    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

2 commits

  • …3.12/logitech', 'for-3.12/multitouch-win8', 'for-3.12/trasnport-driver-cleanup', 'for-3.12/uhid', 'for-3.12/upstream' and 'for-3.12/wiimote' into for-linus

    Jiri Kosina
     
  • The compatible string of the kirkwood-i2s driver was chosen as
    "marvell,mvebu-audio". Using such a compatible string is not a good
    idea, since "mvebu" is the name of a large family of SOCs, in which
    new, unknown SOCs will be coming in the future. It is therefore
    impossible to know what will be evolutions of this hardware block in
    the next generations of the SOCs. For this reason, the recommandation
    for compatible strings of on-SOCs devices has always been to use the
    name of the oldest SOC that has the hardware block. New SOCs that have
    an exactly compatible hardware block can reference it using the same
    compatible string. See [1], [2] and [3] for various cases were this
    suggestion was made, including from Rob Herring, a Device Tree binding
    maintainer.

    As an example, there are already small differences between current
    generations:

    * On Kirkwood, only one interrupt is used for audio.
    * On Dove, two interrupts are used, one for audio data and one for
    error reporting.

    In the near future, I'll be adding audio support to Armada 370, which
    allows has the same hardware block (but maybe with minor variants).

    Therefore, this patch changes the driver to accept
    "marvell,kirkwood-audio" and "marvell,dove-audio" as compatible
    strings instead of the too-generic "marvell,mvebu-audio". The reason
    for the two different compatible strings is the difference in the
    number of interrupts used by the two SOCs for audio.

    This Device Tree binding has never been part of a Linux kernel stable
    release so far, so it can be changed now without breaking backward
    compatibility.

    [1] http://lists.infradead.org/pipermail/linux-mtd/2012-March/040417.html
    [2] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-April/161065.html
    [3] http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/087702.html

    Signed-off-by: Thomas Petazzoni
    Signed-off-by: Mark Brown

    Thomas Petazzoni