01 Sep, 2014

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "Here's the weekly batch of fixes from arm-soc.

    The delta is a largeish negative delta, due to revert of SMP support
    for Broadcom's STB SoC -- it was accidentally merged before some
    issues had been addressed, so they will make a new attempt for 3.18.
    I didn't see a need for a full revert of the whole platform due to
    this, we're keeping the rest enabled.

    The rest is mostly:

    - a handful of DT fixes for i.MX (Hummingboard/Cubox-i in particular)
    - some MTD/NAND fixes for OMAP
    - minor DT fixes for shmobile
    - warning fix for UP builds on vexpress/spc

    There's also a couple of patches that wires up hwmod on TI's DRA7 SoC
    so it can boot. Drivers and the rest had landed for 3.17, and it's
    small and isolated so it made sense to pick up now even if it's not a
    bugfix"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
    vexpress/spc: fix a build warning on array bounds
    ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
    ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants
    MAINTAINERS: catch special Rockchip code locations
    ARM: dts: microsom-ar8035: MDIO pad must be set open drain
    ARM: dts: omap54xx-clocks: Fix the l3 and l4 clock rates
    ARM: brcmstb: revert SMP support
    ARM: OMAP2+: hwmod: Rearm wake-up interrupts for DT when MUSB is idled
    ARM: dts: Enable UART wake-up events for beagleboard
    ARM: dts: Remove twl6030 clk32g "regulator"
    ARM: OMAP2+: omap_device: remove warning that clk alias already exists
    ARM: OMAP: fix %d confusingly prefixed with 0x in format string
    ARM: dts: DRA7: fix interrupt-cells for GPIO
    mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc()
    ARM: dts: omap3430-sdp: Revert to using software ECC for NAND
    ARM: OMAP2+: GPMC: Support Software ECC scheme via DT
    mtd: nand: omap: Revert to using software ECC by default
    ARM: dts: hummingboard/cubox-i: change SPDIF output to be more descriptive
    ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration
    ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR
    ...

    Linus Torvalds
     

29 Aug, 2014

2 commits

  • Pull mfd fixes from Lee Jones:
    "Couple of simple fixes due for the 3.17 rcs

    (and a sneaky document addition that slipped from the previous
    pull-request)"

    * tag 'mfd-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
    mfd: twl4030-power: Fix PM idle pin configuration to not conflict with regulators
    mfd: tc3589x: Add device tree bindings
    mfd: ab8500-core: Use 'ifdef' for config options
    mfd: htc-i2cpld: Fix %d confusingly prefixed with 0x in format string
    mfd: omap-usb-host: Fix %d confusingly prefixed with 0x in format string

    Linus Torvalds
     
  • Pull pin-control fixes from Linus Walleij:
    "My first (a bit delayed) pack of pin control fixes for the v3.17
    series, only driver fixes:

    - SH-PFC (Renesas) r8a7791 CAN bus pin group problem
    - Rockchip (GPIO0 configuration)
    - Tegra-xusb (interrupt handling)
    - Exynos (GPIO interrupt locking)
    - Qualcomm (fix misleading example interrupts)
    - minor non-critical fixes for abx500 and AT91 also sneaked in,
    because I initially intended this pull for post RC-1, hope it's
    still OK"

    * tag 'pinctrl-v3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
    pinctrl: qcom: apq8064: Correct interrupts in example
    pinctrl: exynos: Lock GPIOs as interrupts when used as EINTs
    pinctrl: pinctrl-at91.c: fix decimal printf format specifiers prefixed with 0x
    pinctrl: abx500: remove useless check
    pinctrl: tegra-xusb: testing wrong variable in probe()
    pinctrl: tegra-xusb: fix an off by one test
    pinctrl: rockchip: fix rk3288 gpio0 configuration
    sh-pfc: r8a7791: fix CAN pin groups

    Linus Torvalds
     

28 Aug, 2014

1 commit

  • This defines the device tree bindings for the Toshiba TC3589x
    series of multi-purpose expanders. Only the stuff I can test
    is defined: GPIO and keypad. Others may implement more
    subdevices further down the road.

    This is to complement
    commit a435ae1d51e2f18414f2a87219fdbe068231e692
    "mfd: Enable the tc3589x for Device Tree" which left off
    the definition of the device tree bindings.

    Signed-off-by: Linus Walleij
    Signed-off-by: Lee Jones

    Linus Walleij
     

26 Aug, 2014

1 commit

  • For v3.14 and prior, 1-bit Hamming code ECC via software was the
    default choice for some boards e.g. 3430sdp.
    Commit ac65caf514ec in v3.15 changed the behaviour
    to use 1-bit Hamming code via Hardware using a different ECC layout
    i.e. (ROM code layout) than what is used by software ECC.

    This ECC layout change causes NAND filesystems created in v3.14
    and prior to be unusable in v3.15 and later. So don't mark "sw" scheme
    as deperecated and support it.

    Signed-off-by: Roger Quadros
    Signed-off-by: Tony Lindgren

    Roger Quadros
     

21 Aug, 2014

1 commit


19 Aug, 2014

1 commit

  • Pull PCI changes from Bjorn Helgaas:
    "Marvell MVEBU
    - Remove ARCH_KIRKWOOD dependency (Andrew Lunn)

    NVIDIA Tegra
    - Add debugfs support (Thierry Reding)

    Synopsys DesignWare
    - Look for configuration space in 'reg', not 'ranges' (Kishon Vijay Abraham I)
    - Program ATU with untranslated address (Kishon Vijay Abraham I)
    - Add config access-related pcie_host_ops for v3.65 hardware (Murali Karicheri)
    - Add MSI-related pcie_host_ops for v3.65 hardware (Murali Karicheri)

    TI DRA7xx
    - Add TI DR7xx PCIe driver (Kishon Vijay Abraham I)"

    * tag 'pci-v3.17-changes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    PCI: designware: Add MSI-related pcie_host_ops for v3.65 hardware
    PCI: designware: Add config access-related pcie_host_ops for v3.65 hardware
    PCI: dra7xx: Add TI DRA7xx PCIe driver
    PCI: designware: Program ATU with untranslated address
    PCI: designware: Look for configuration space in 'reg', not 'ranges'
    PCI: tegra: Add debugfs support
    PCI: mvebu: Remove ARCH_KIRKWOOD dependency

    Linus Torvalds
     

16 Aug, 2014

1 commit

  • In case the Device Tree blob passed by the boot agent supplies both an
    'interrupts-extended' and an 'interrupts' property in order to allow for
    older kernels to be usable, prefer the new-style 'interrupts-extended'
    property which conveys a lot more information.

    This allows us to have bootloaders willingly maintaining backwards
    compatibility with older kernels without entirely deprecating the
    'interrupts' property.

    Update the bindings documentation to describe a situation where both the
    'interrupts-extended' and the 'interrupts' property are present, and
    which one takes precedence over the other.

    Cc: stable@vger.kernel.org # 3.13+
    Acked-by: Rob Herring
    Signed-off-by: Brian Norris
    Signed-off-by: Florian Fainelli
    Signed-off-by: Grant Likely

    Florian Fainelli
     

14 Aug, 2014

3 commits

  • Pull device tree updates from Grant Likely:
    "The branch contains the following device tree changes the v3.17 merge
    window:

    Group changes to the device tree. In preparation for adding device
    tree overlay support, OF_DYNAMIC is reworked so that a set of device
    tree changes can be prepared and applied to the tree all at once.
    OF_RECONFIG notifiers see the most significant change here so that
    users always get a consistent view of the tree. Notifiers generation
    is moved from before a change to after it, and notifiers for a group
    of changes are emitted after the entire block of changes have been
    applied

    Automatic console selection from DT. Console drivers can now use
    of_console_check() to see if the device node is specified as a console
    device. If so then it gets added as a preferred console. UART
    devices get this support automatically when uart_add_one_port() is
    called.

    DT unit tests no longer depend on pre-loaded data in the device tree.
    Data is loaded dynamically at the start of unit tests, and then
    unloaded again when the tests have completed.

    Also contains a few bugfixes for reserved regions and early memory
    setup"

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: (21 commits)
    of: Fixing OF Selftest build error
    drivers: of: add automated assignment of reserved regions to client devices
    of: Use proper types for checking memory overflow
    of: typo fix in __of_prop_dup()
    Adding selftest testdata dynamically into live tree
    of: Add todo tasklist for Devicetree
    of: Transactional DT support.
    of: Reorder device tree changes and notifiers
    of: Move dynamic node fixups out of powerpc and into common code
    of: Make sure attached nodes don't carry along extra children
    of: Make devicetree sysfs update functions consistent.
    of: Create unlocked versions of node and property add/remove functions
    OF: Utility helper functions for dynamic nodes
    of: Move CONFIG_OF_DYNAMIC code into a separate file
    of: rename of_aliases_mutex to just of_mutex
    of/platform: Fix of_platform_device_destroy iteration of devices
    of: Migrate of_find_node_by_name() users to for_each_node_by_name()
    tty: Update hypervisor tty drivers to use core stdout parsing code.
    arm/versatile: Add the uart as the stdout device.
    of: Enable console on serial ports specified by /chosen/stdout-path
    ...

    Linus Torvalds
     
  • Pull MMC updates from Ulf Hansson:
    "Me and Chris Ball decided to try out using my MMC tree as the primary
    one, to simplify handling of patches.

    This pull does thus contains all the MMC patches for 3.17 rc1, no pull
    from Chris this time.

    Details:

    MMC core:
    - forward compatibility for eMMC
    - fix some blacklisted cards with broken secure discard

    MMC host:
    - mmci: Add support for Qualcomm variant
    - mmci: Fix regression for arm_variant
    - sdhci: Various fixes and cleanups
    - sdhci: Improve external VDD regulator support
    - sdhci: Support for DDR50 1.8V mode for BayTrail
    - sdhci-st: Add driver for ST SDHCI controller
    - sh-mmcif: DMA fixes
    - omap_hsmmc: Add support for SDIO interrupts
    - sdhci-pci: Add support for Intel Quark X1000
    - dw_mmc: Update the reset sequence
    - s3cmci: port DMA code to dmaengine API"

    * tag 'mmc-v3.17-1' of git://git.linaro.org/people/ulf.hansson/mmc: (67 commits)
    mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed
    mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
    mmc: mmci: Reverse IRQ handling for the arm_variant
    mmc: mmci: Move all CMD irq handling to mmci_cmd_irq()
    mmc: mmci: Remove redundant check of status for DATA irq
    mmc: dw_mmc: change to use recommended reset procedure
    mmc: sdhci-pxav3: Use devm_* managed helpers
    mmc: tmio: Configure DMA slave bus width
    mmc: sh_mmcif: Configure DMA slave bus width
    mmc: sh_mmcif: Fix DMA slave address configuration
    mmc: sh_mmcif: Document DT bindings
    mmc: sdhci-pci: remove PCI PM functions in suspend/resume callback
    mmc: Do not advertise secure discard if it is blacklisted
    mmc: sdhci-msm: Get COMPILE_TEST support
    mmc: sdhci-msm: Remove unnecessary header file inclusion
    mmc: sdhci-msm: Fix the binding example
    mmc: sdhci: add DDR50 1.8V mode support for BayTrail eMMC Controller
    mmc: sdhci: Preset value not supported in Baytrail eMMC
    mmc: MMC_USDHI6ROL0 should depend on HAS_DMA
    mmc: MMC_SH_MMCIF should depend on HAS_DMA
    ...

    Linus Torvalds
     
  • Pull networking fixes from David Miller:
    "Several networking final fixes and tidies for the merge window:

    1) Changes during the merge window unintentionally took away the
    ability to build bluetooth modular, fix from Geert Uytterhoeven.

    2) Several phy_node reference count bug fixes from Uwe Kleine-König.

    3) Fix ucc_geth build failures, also from Uwe Kleine-König.

    4) Fix klog false positivies when netlink messages go to network
    taps, by properly resetting the network header. Fix from Daniel
    Borkmann.

    5) Sizing estimate of VF netlink messages is too small, from Jiri
    Benc.

    6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian.

    7) VLAN untagging is erroneously dependent upon whether the VLAN
    module is loaded or not, but there are generic dependencies that
    matter wrt what can be expected as the SKB enters the stack.
    Make the basic untagging generic code, and do it unconditionally.
    From Vlad Yasevich.

    8) xen-netfront only has so many slots in it's transmit queue so
    linearize packets that have too many frags. From Zoltan Kiss.

    9) Fix suspend/resume PHY handling in bcmgenet driver, from Florian
    Fainelli"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (55 commits)
    net: bcmgenet: correctly resume adapter from Wake-on-LAN
    net: bcmgenet: update UMAC_CMD only when link is detected
    net: bcmgenet: correctly suspend and resume PHY device
    net: bcmgenet: request and enable main clock earlier
    net: ethernet: myricom: myri10ge: myri10ge.c: Cleaning up missing null-terminate after strncpy call
    xen-netfront: Fix handling packets on compound pages with skb_linearize
    net: fec: Support phys probed from devicetree and fixed-link
    smsc: replace WARN_ON() with WARN_ON_SMP()
    xen-netback: Don't deschedule NAPI when carrier off
    net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile
    wan: wanxl: Remove typedefs from struct names
    m68k/atari: EtherNEC - ethernet support (ne)
    net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy call
    hdlc: Remove typedefs from struct names
    airo_cs: Remove typedef local_info_t
    atmel: Remove typedef atmel_priv_ioctl
    com20020_cs: Remove typedef com20020_dev_t
    ethernet: amd: Remove typedef local_info_t
    net: Always untag vlan-tagged traffic on input.
    drivers: net: Add APM X-Gene SoC ethernet driver support.
    ...

    Linus Torvalds
     

12 Aug, 2014

2 commits


11 Aug, 2014

4 commits

  • Pull slave-dma updates from Vinod Koul:
    "Some notable changes are:
    - new driver for AMBA AXI NBPF by Guennadi
    - new driver for sun6i controller by Maxime
    - pl330 drivers fixes from Lar's
    - sh-dma updates and fixes from Laurent, Geert and Kuninori
    - Documentation updates from Geert
    - drivers fixes and updates spread over dw, edma, freescale, mpc512x
    etc.."

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (72 commits)
    dmaengine: sun6i: depends on RESET_CONTROLLER
    dma: at_hdmac: fix invalid remaining bytes detection
    dmaengine: nbpfaxi: don't build this driver where it cannot be used
    dmaengine: nbpf_error_get_channel() can be static
    dma: pl08x: Use correct specifier for size_t values
    dmaengine: Remove the context argument to the prep_dma_cyclic operation
    dmaengine: nbpfaxi: convert to tasklet
    dmaengine: nbpfaxi: fix a theoretical race
    dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores
    dmaengine: add device tree binding documentation for the nbpfaxi driver
    dmaengine: edma: Do not register second device when booted with DT
    dmaengine: edma: Do not change the error code returned from edma_alloc_slot
    dmaengine: rcar-dmac: Add device tree bindings documentation
    dmaengine: shdma: Allocate cyclic sg list dynamically
    dmaengine: shdma: Make channel filter ignore unrelated devices
    dmaengine: sh: Rework Kconfig and Makefile
    dmaengine: sun6i: Fix memory leaks
    dmaengine: sun6i: Free the interrupt before killing the tasklet
    dmaengine: sun6i: Remove switch statement from buswidth convertion routine
    dmaengine: of: kconfig: select DMA_ENGINE when DMA_OF is selected
    ...

    Linus Torvalds
     
  • Pull thermal updates from Zhang Rui:
    "Specifics:

    - adds full support for 2 types of Thermal Controllers produced by
    STMicroelectronics. One is a more traditional memory mapped
    variant, the other is controlled solely by system configuration
    registers. From Lee Jones.

    - add TMU (Thermal Management Unit) support for Exynos3250 Soc.
    From Chanwoo Choi.

    - add critical and passive trip point support for int3403 thermal
    driver. From Srinivas Pandruvada.

    - a couple of small fixes/cleanups from Javi Merino, and Geert
    Uytterhoeven"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
    thermal: document struct thermal_zone_device and thermal_governor
    thermal: cpu_cooling: fix typo highjack -> hijack
    thermal: rcar: Document SoC-specific bindings
    thermal: samsung: Add TMU support for Exynos3250 SoC
    thermal: exynos: fix ordering in exynos_tmu_remove()
    thermal: allow building dove_thermal with mvebu
    thermal: sti: Add support for ST's Memory Mapped based Thermal controller
    thermal: sti: Add support for ST's System Config Register based Thermal controller
    thermal: sti: Introduce ST Thermal core code
    thermal: sti: Supply Device Tree documentation
    Thermal: int3403: Add CRT and PSV trip

    Linus Torvalds
     
  • Conflicts:
    drivers/of/testcase-data/testcases.dts

    Grant Likely
     
  • Almost all SoCs use one slot per host controller.
    (Even if controller can support the multiple slot, Recommend to use one slot per host controller.)
    Don't use the slot-node and deprecate the "supports-highspeed" property.
    Instead, use the cap-mmc/sd-highspeed.

    Signed-off-by: Jaehoon Chung
    Reviewed-by: Tushar Behera
    Reviewed-by: Ulf Hansson
    Tested-by: Sachin Kamat
    Acked-by: Seungwon Jeon
    Reviewed-by: Doug Anderson
    Signed-off-by: Ulf Hansson

    Jaehoon Chung
     

10 Aug, 2014

1 commit

  • Pull i2c updates from Wolfram Sang:
    "Highlights:

    - class based instantiation finally dropped for most embedded drivers
    bringing boot up performance gains
    - removed two drivers (one outdated, one a duplicate)
    - ACPI has now operation region support (thanks to Lan Tianyu)
    - the i2c-stub driver got overhauled and gained new features to
    become more useful when writing i2c client drivers (thanks to
    Guenter Roeck and Jean Delvare)

    The rest is driver bugfixes, added bindings/ids, cleanups..."

    * 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (43 commits)
    i2c: mpc: delete unneeded test before of_node_put
    i2c: rk3x: fix interrupt handling issue
    i2c: imx: Fix format warning for dev_dbg
    i2c: qup: disable clks and return instead of just returning error
    i2c: exynos5: always enable HSI2C
    i2c: designware: add new bindings
    i2c: gpio: Drop dead code in i2c_gpio_remove
    i2c: pca954x: put the mux to disconnected state after resume
    i2c: st: Update i2c timings
    drivers/i2c/busses: use correct type for dma_map/unmap
    i2c: i2c-st: Use %pa to print 'resource_size_t' type
    i2c: s3c2410: resume the I2C controller earlier
    i2c: stub: Avoid an array overrun on I2C block transfers
    i2c: i801: Add device ID for Intel Wildcat Point PCH
    i2c: i801: Fix the alignment of the device table
    i2c: stub: Add support for banked register ranges
    i2c: stub: Remember the number of emulated chips
    i2c: stub: Add support for SMBus block commands
    i2c: efm32: correct namespacing of location property
    i2c: exynos5: remove extra line and fix an assignment
    ...

    Linus Torvalds
     

09 Aug, 2014

11 commits

  • Pull MTD updates from Brian Norris:
    "AMD-compatible CFI driver:
    - Support OTP programming for Micron M29EW family
    - Increase buffer write timeout, according to detected flash
    parameter info

    NAND
    - Add helpers for retrieving ONFI timing modes
    - GPMI: provide option to disable bad block marker swapping (required
    for Ka-On electronics platforms)

    SPI NOR
    - EON EN25QH128 support
    - Support new Flag Status Register (FSR) on a few Micron flash

    Common
    - New sysfs entries for bad block and ECC stats

    And a few miscellaneous refactorings, cleanups, and driver
    improvements"

    * tag 'for-linus-20140808' of git://git.infradead.org/linux-mtd: (31 commits)
    mtd: gpmi: make blockmark swapping optional
    mtd: gpmi: remove line breaks from error messages and improve wording
    mtd: gpmi: remove useless (void *) type casts and spaces between type casts and variables
    mtd: atmel_nand: NFC: support multiple interrupt handling
    mtd: atmel_nand: implement the nfc_device_ready() by checking the R/B bit
    mtd: atmel_nand: add NFC status error check
    mtd: atmel_nand: make ecc parameters same as definition
    mtd: nand: add ONFI timing mode to nand_timings converter
    mtd: nand: define struct nand_timings
    mtd: cfi_cmdset_0002: fix do_write_buffer() timeout error
    mtd: denali: use 8 bytes for READID command
    mtd/ftl: fix the double free of the buffers allocated in build_maps()
    mtd: phram: Fix whitespace issues
    mtd: spi-nor: add support for EON EN25QH128
    mtd: cfi_cmdset_0002: Add support for locking OTP memory
    mtd: cfi_cmdset_0002: Add support for writing OTP memory
    mtd: cfi_cmdset_0002: Invalidate cache after entering/exiting OTP memory
    mtd: cfi_cmdset_0002: Add support for reading OTP
    mtd: spi-nor: add support for flag status register on Micron chips
    mtd: Account for BBT blocks when a partition is being allocated
    ...

    Linus Torvalds
     
  • Pull fbdev updates from Tomi Valkeinen:
    - much better HDMI infoframe support for OMAP
    - Cirrus Logic CLPS711X framebuffer driver
    - DT support for PL11x CLCD driver
    - various small fixes

    * tag 'fbdev-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (35 commits)
    OMAPDSS: DSI: fix depopulating dsi peripherals
    video: hyperv: hyperv_fb: refresh the VM screen by force on VM panic
    video: ARM CLCD: Fix DT-related build problems
    drivers: video: fbdev: atmel_lcdfb.c: Add ability to inverted backlight PWM.
    video: ARM CLCD: Add DT support
    drm/omap: Add infoframe & dvi/hdmi mode support
    OMAPDSS: HDMI: remove the unused code
    OMAPDSS: HDMI5: add support to set infoframe & HDMI mode
    OMAPDSS: HDMI4: add support to set infoframe & HDMI mode
    OMAPDSS: HDMI: add infoframe and hdmi_dvi_mode fields
    OMAPDSS: add hdmi ops to hdmi-connector and tpd12s015
    OMAPDSS: add hdmi ops to hdmi_ops and omap_dss_driver
    OMAPDSS: HDMI: remove custom avi infoframe
    OMAPDSS: HDMI5: use common AVI infoframe support
    OMAPDSS: HDMI4: use common AVI infoframe support
    OMAPDSS: Kconfig: select HDMI
    OMAPDSS: HDMI: fix name conflict
    OMAPDSS: DISPC: clean up dispc_mgr_timings_ok
    OMAPDSS: DISPC: reject interlace for lcd out
    OMAPDSS: DISPC: fix debugfs reg dump
    ...

    Linus Torvalds
     
  • …ierry.reding/linux-pwm

    Pull pwm changes from Thierry Reding:
    "The set of changes for this merge window contains two new drivers: one
    for Rockchip SoCs and another for STMicroelectronics STiH4xx SoCs.

    The remainder of the changes are the usual small cleanups such as
    removing redundant OOM messages, signalling that a PWM chip's
    operations can sleep and removing an unneeded dependency"

    * tag 'pwm/for-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
    pwm: rockchip: Added to support for RK3288 SoC
    pwm: rockchip: document RK3288 SoC compatible
    pwm: sti: Remove PWM period table
    pwm: sti: Sync between enable/disable calls
    pwm: sti: Ensure same period values for all channels
    pwm: sti: Fix PWM prescaler handling
    pwm: sti: Supply Device Tree binding documentation for ST's PWM IP
    pwm: sti: Add new driver for ST's PWM IP
    pwm: imx: set can_sleep flag for imx_pwm
    pwm: lpss: remove dependency on clk framework
    pwm: pwm-tipwmss: remove unnecessary OOM messages
    pwm: rockchip: document device tree bindings
    pwm: add Rockchip SoC PWM support

    Linus Torvalds
     
  • Pull GPIO update from Linus Walleij:
    "This is the bulk of GPIO changes for the v3.17 development cycle, and
    this time we got a lot of action going on and it will continue:

    - The core GPIO library implementation has been split up in three
    different files:
    - gpiolib.c for the latest and greatest and shiny GPIO library code
    using GPIO descriptors only
    - gpiolib-legacy.c for the old integer number space API that we are
    phasing out gradually
    - gpiolib-sysfs.c for the sysfs interface that we are not entirely
    happy with, but has to live on for ABI compatibility

    - Add a flags argument to *gpiod_get* functions, with some
    backward-compatibility macros to ease transitions. We should have
    had the flags there from the beginning it seems, now we need to
    clean up the mess. There is a plan on how to move forward here
    devised by Alexandre Courbot and Mark Brown

    - Split off a special header for the board
    gpio table registration, as per example from the regulator
    subsystem

    - Start to kill off the return value from gpiochip_remove() by
    removing the __must_check attribute and removing all checks inside
    the drivers/gpio directory. The rationale is: well what were we
    supposed to do if there is an error code? Not much: print an error
    message. And gpiolib already does that. So make this function
    return void eventually

    - Some cleanups of hairy gpiolib code, make some functions not to be
    used outside the library private and make sure they are not
    exported, remove gpiod_lock/unlock_as_irq() as the existing
    function is for driver-internal use and fine as it is, delete
    gpio_ensure_requested() as it is not meaningful anymore

    - Support the GPIOF_ACTIVE_LOW flag from gpio_request_one() function
    calls, which is logical since this is already supported when
    referencing GPIOs from e.g. device trees

    - Switch STMPE, intel-mid, lynxpoint and ACPI (!) to use the gpiolib
    irqchip helpers cutting down on GPIO irqchip boilerplate a bit more

    - New driver for the Zynq GPIO block

    - The usual incremental improvements around a bunch of drivers

    - Janitorial syntactic and semantic cleanups by Jingoo Han, and
    Rickard Strandqvist especially"

    * tag 'gpio-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (37 commits)
    MAINTAINERS: update GPIO include files
    gpio: add missing includes in machine.h
    gpio: add flags argument to gpiod_get*() functions
    MAINTAINERS: Update Samsung pin control entry
    gpio / ACPI: Move event handling registration to gpiolib irqchip helpers
    gpio: lynxpoint: Convert to use gpiolib irqchip
    gpio: split gpiod board registration into machine header
    gpio: remove gpio_ensure_requested()
    gpio: remove useless check in gpiolib_sysfs_init()
    gpiolib: Export gpiochip_request_own_desc and gpiochip_free_own_desc
    gpio: move gpio_ensure_requested() into legacy C file
    gpio: remove gpiod_lock/unlock_as_irq()
    gpio: make gpiochip_get_desc() gpiolib-private
    gpio: simplify gpiochip_export()
    gpio: remove export of private of_get_named_gpio_flags()
    gpio: Add support for GPIOF_ACTIVE_LOW to gpio_request_one functions
    gpio: zynq: Clear pending interrupt when enabling a IRQ
    gpio: drop retval check enforcing from gpiochip_remove()
    gpio: remove all usage of gpio_remove retval in driver/gpio
    devicetree: Add Zynq GPIO devicetree bindings documentation
    ...

    Linus Torvalds
     
  • Pull input updates from Dmitry Torokhov:
    - big update to Wacom driver by Benjamin Tissoires, converting it to
    HID infrastructure and unifying USB and Bluetooth models
    - large update to ALPS driver by Hans de Goede, which adds support for
    newer touchpad models as well as cleans up and restructures the code
    - more changes to Atmel MXT driver, including device tree support
    - new driver for iPaq x3xxx touchscreen
    - driver for serial Wacom tablets
    - driver for Microchip's CAP1106
    - assorted cleanups and improvements to existing drover and input core

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (93 commits)
    Input: wacom - update the ABI doc according to latest changes
    Input: wacom - only register once the MODULE_* macros
    Input: HID - remove hid-wacom Bluetooth driver
    Input: wacom - add copyright note and bump version to 2.0
    Input: wacom - remove passing id for wacom_set_report
    Input: wacom - check for bluetooth protocol while setting OLEDs
    Input: wacom - handle Intuos 4 BT in wacom.ko
    Input: wacom - handle Graphire BT tablets in wacom.ko
    Input: wacom - prepare the driver to include BT devices
    Input: hyperv-keyboard - register as a wakeup source
    Input: imx_keypad - remove ifdef round PM methods
    Input: jornada720_ts - get rid of space indentation and use tab
    Input: jornada720_ts - switch to using managed resources
    Input: alps - Rushmore and v7 resolution support
    Input: mcs5000_ts - remove ifdef around power management methods
    Input: mcs5000_ts - protect PM functions with CONFIG_PM_SLEEP
    Input: ads7846 - release resources on failure for clean exit
    Input: wacom - add support for 0x12C ISDv4 sensor
    Input: atmel_mxt_ts - use deep sleep mode when stopped
    ARM: dts: am437x-gp-evm: Update binding for touchscreen size
    ...

    Linus Torvalds
     
  • Merge more incoming from Andrew Morton:
    "Two new syscalls:

    memfd_create in "shm: add memfd_create() syscall"
    kexec_file_load in "kexec: implementation of new syscall kexec_file_load"

    And:

    - Most (all?) of the rest of MM

    - Lots of the usual misc bits

    - fs/autofs4

    - drivers/rtc

    - fs/nilfs

    - procfs

    - fork.c, exec.c

    - more in lib/

    - rapidio

    - Janitorial work in filesystems: fs/ufs, fs/reiserfs, fs/adfs,
    fs/cramfs, fs/romfs, fs/qnx6.

    - initrd/initramfs work

    - "file sealing" and the memfd_create() syscall, in tmpfs

    - add pci_zalloc_consistent, use it in lots of places

    - MAINTAINERS maintenance

    - kexec feature work"

    * emailed patches from Andrew Morton <akpm@linux-foundation.org: (193 commits)
    MAINTAINERS: update nomadik patterns
    MAINTAINERS: update usb/gadget patterns
    MAINTAINERS: update DMA BUFFER SHARING patterns
    kexec: verify the signature of signed PE bzImage
    kexec: support kexec/kdump on EFI systems
    kexec: support for kexec on panic using new system call
    kexec-bzImage64: support for loading bzImage using 64bit entry
    kexec: load and relocate purgatory at kernel load time
    purgatory: core purgatory functionality
    purgatory/sha256: provide implementation of sha256 in purgaotory context
    kexec: implementation of new syscall kexec_file_load
    kexec: new syscall kexec_file_load() declaration
    kexec: make kexec_segment user buffer pointer a union
    resource: provide new functions to walk through resources
    kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc()
    kexec: move segment verification code in a separate function
    kexec: rename unusebale_pages to unusable_pages
    kernel: build bin2c based on config option CONFIG_BUILD_BIN2C
    bin2c: move bin2c in scripts/basic
    shm: wait for pins to be released when sealing
    ...

    Linus Torvalds
     
  • Add support for the pcf85063 rtc chip.

    [akpm@linux-foundation.org: fix comment typo, tweak conding style]
    Signed-off-by: Soeren Andersen
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Søren Andersen
     
  • Pull ARM SoC driver changes from Olof Johansson:
    "A handful of driver-related changes. We've had a bunch of them going
    in through other branches as well, so it's only a part of what we
    really have this release.

    Larger pieces are:

    - Removal of a now unused PWM driver for atmel
    [ This includes AVR32 changes that have been appropriately acked ]
    - Performance counter support for the arm CCN interconnect
    - OMAP mailbox driver cleanups and consolidation
    - PCI and SATA PHY drivers for SPEAr 13xx platforms
    - Redefinition (with backwards compatibility!) of PCI DT bindings for
    Tegra to better model regulators/power"

    Note: this merge also fixes up the semantic conflict with the new
    calling convention for devm_phy_create(), see commit f0ed817638b5 ("phy:
    core: Let node ptr of PHY point to PHY and not of PHY provider") that
    came in through Greg's USB tree.

    Semantic merge patch by Stephen Rothwell through
    the next tree.

    * tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
    bus: arm-ccn: Fix error handling at event allocation
    mailbox/omap: add a parent structure for every IP instance
    mailbox/omap: remove the private mailbox structure
    mailbox/omap: consolidate OMAP mailbox driver
    mailbox/omap: simplify the fifo assignment by using macros
    mailbox/omap: remove omap_mbox_type_t from mailbox ops
    mailbox/omap: remove OMAP1 mailbox driver
    mailbox/omap: use devm_* interfaces
    bus: ARM CCN: add PERF_EVENTS dependency
    bus: ARM CCN PMU driver
    PCI: spear: Remove spear13xx_pcie_remove()
    PCI: spear: Fix Section mismatch compilation warning for probe()
    ARM: tegra: Remove legacy PCIe power supply properties
    PCI: tegra: Remove deprecated power supply properties
    PCI: tegra: Implement accurate power supply scheme
    ARM: SPEAr13xx: Update defconfigs
    ARM: SPEAr13xx: Add pcie and miphy DT nodes
    ARM: SPEAr13xx: Add bindings and dt node for misc block
    ARM: SPEAr13xx: Fix static mapping table
    phy: Add drivers for PCIe and SATA phy on SPEAr13xx
    ...

    Linus Torvalds
     
  • Pull ARM SoC device-tree changes from Olof Johansson:
    "Unlike the board branch, this keeps having large sets of changes for
    every release, but that's quite expected and is so far working well.

    Most of this is plumbing for various device bindings and new
    platforms, but there's also a bit of cleanup and code removal for
    things that are moved from platform code to DT contents (some OMAP
    clock code in particular).

    There's also a pinctrl driver for tegra here (appropriately acked),
    that's introduced this way to make it more bisectable.

    I'm happy to say that there were no conflicts at all with this branch
    this release, which means that changes are flowing through our tree as
    expected instead of merged through driver maintainers (or at least not
    done with conflicts).

    There are several new boards added, and a couple of SoCs. In no
    particular order:

    - Rockchip RK3288 SoC support, including DTS for a dev board that
    they have seeded with some community developers.
    - Better support for Hardkernel Exynos4-based ODROID boards.
    - CCF conversions (and dtsi contents) for several Renesas platforms.
    - Gumstix Pepper (TI AM335x) board support
    - TI eval board support for AM437x
    - Allwinner A23 SoC, very similar to existing ones which mostly has
    resulted in DT changes for support. Also includes support for an
    Ippo tablet with the chipset.
    - Allwinner A31 Hummingbird board support, not to be confused with
    the SolidRun i.MX-based Hummingboard.
    - Tegra30 Apalis board support"

    * tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (334 commits)
    ARM: dts: Enable USB host0 (EHCI) on rk3288-evb
    ARM: dts: add rk3288 ehci usb devices
    ARM: dts: Turn on USB host vbus on rk3288-evb
    ARM: tegra: apalis t30: fix device tree compatible node
    ARM: tegra: paz00: Fix some indentation inconsistencies
    ARM: zynq: DT: Clarify Xilinx Zynq platform
    ARM: dts: rockchip: add watchdog node
    ARM: dts: rockchip: remove pinctrl setting from radxarock uart2
    ARM: dts: Add missing pinctrl for uart0/1 for exynos3250
    ARM: dts: Remove duplicate 'interrput-parent' property for exynos3250
    ARM: dts: Add TMU dt node to monitor the temperature for exynos3250
    ARM: dts: Specify MAX77686 pmic interrupt for exynos5250-smdk5250
    ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only
    ARM: dts: max77686 is exynos5250-snow only
    ARM: zynq: DT: Remove DMA from board DTs
    ARM: zynq: DT: Add CAN node
    ARM: EXYNOS: Add exynos5260 PMU compatible string to DT match table
    ARM: dts: Add PMU DT node for exynos5260 SoC
    ARM: EXYNOS: Add support for Exynos5410 PMU
    ARM: dts: Add PMU to exynos5410
    ...

    Linus Torvalds
     
  • Pull ARM SoC platform changes from Olof Johansson:
    "This is the bulk of new SoC enablement and other platform changes for
    3.17:

    - Samsung S5PV210 has been converted to DT and multiplatform
    - Clock drivers and bindings for some of the lower-end i.MX 1/2
    platforms
    - Kirkwood, one of the popular Marvell platforms, is folded into the
    mvebu platform code, removing mach-kirkwood
    - Hwmod data for TI AM43xx and DRA7 platforms
    - More additions of Renesas shmobile platform support
    - Removal of plat-samsung contents that can be removed with S5PV210
    being multiplatform/DT-enabled and the other two old platforms
    being removed

    New platforms (most with only basic support right now):

    - Hisilicon X5HD2 settop box chipset is introduced
    - Mediatek MT6589 (mobile chipset) is introduced
    - Broadcom BCM7xxx settop box chipset is introduced

    + as usual a lot other pieces all over the platform code"

    * tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (240 commits)
    ARM: hisi: remove smp from machine descriptor
    power: reset: move hisilicon reboot code
    ARM: dts: Add hix5hd2-dkb dts file.
    ARM: debug: Rename Hi3716 to HIX5HD2
    ARM: hisi: enable hix5hd2 SoC
    ARM: hisi: add ARCH_HISI
    MAINTAINERS: add entry for Broadcom ARM STB architecture
    ARM: brcmstb: select GISB arbiter and interrupt drivers
    ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
    ARM: configs: enable SMP in bcm_defconfig
    ARM: add SMP support for Broadcom mobile SoCs
    Documentation: arm: misc updates to Marvell EBU SoC status
    Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
    ARM: mvebu: fix build without platforms selected
    ARM: mvebu: add cpuidle support for Armada 38x
    ARM: mvebu: add cpuidle support for Armada 370
    cpuidle: mvebu: add Armada 38x support
    cpuidle: mvebu: add Armada 370 support
    cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
    ARM: mvebu: export the SCU address
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups from Olof Johansson:
    "This merge window brings a good size of cleanups on various platforms.
    Among the bigger ones:

    - Removal of Samsung s5pc100 and s5p64xx platforms. Both of these
    have lacked active support for quite a while, and after asking
    around nobody showed interest in keeping them around. If needed,
    they could be resurrected in the future but it's more likely that
    we would prefer reintroduction of them as DT and
    multiplatform-enabled platforms instead.

    - OMAP4 controller code register define diet. They defined a lot of
    registers that were never actually used, etc.

    - Move of some of the Tegra platform code (PMC, APBIO, fuse,
    powergate) to drivers/soc so it can be shared with 64-bit code.
    This also converts them over to traditional driver models where
    possible.

    - Removal of legacy gpio-samsung driver, since the last users have
    been removed (moved to pinctrl)

    Plus a bunch of smaller changes for various platforms that sort of
    dissapear in the diffstat for the above. clps711x cleanups, shmobile
    header file refactoring/moves for multiplatform friendliness, some
    misc cleanups, etc"

    * tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (117 commits)
    drivers: CCI: Correct use of ! and &
    video: clcd-versatile: Depend on ARM
    video: fix up versatile CLCD helper move
    MAINTAINERS: Add sdhci-st file to ARCH/STI architecture
    ARM: EXYNOS: Fix build breakge with PM_SLEEP=n
    MAINTAINERS: Remove Kirkwood
    ARM: tegra: Convert PMC to a driver
    soc/tegra: fuse: Set up in early initcall
    ARM: tegra: Always lock the CPU reset vector
    ARM: tegra: Setup CPU hotplug in a pure initcall
    soc/tegra: Implement runtime check for Tegra SoCs
    soc/tegra: fuse: fix dummy functions
    soc/tegra: fuse: move APB DMA into Tegra20 fuse driver
    soc/tegra: Add efuse and apbmisc bindings
    soc/tegra: Add efuse driver for Tegra
    ARM: tegra: move fuse exports to soc/tegra/fuse.h
    ARM: tegra: export apb dma readl/writel
    ARM: tegra: Use a function to get the chip ID
    ARM: tegra: Sort includes alphabetically
    ARM: tegra: Move includes to include/soc/tegra
    ...

    Linus Torvalds
     

08 Aug, 2014

6 commits

  • Document new compatible for PWM founding on RK3288 SoC

    Signed-off-by: Caesar Wang
    Signed-off-by: Thierry Reding

    Caesar Wang
     
  • Pull DRM updates from Dave Airlie:
    "Like all good pull reqs this ends with a revert, so it must mean we
    tested it,

    [ Ed. That's _one_ way of looking at it ]

    This pull is missing nouveau, Ben has been stuck trying to track down
    a very longstanding bug that revealed itself due to some other
    changes. I've asked him to send you a direct pull request for nouveau
    once he cleans things up. I'm away until Monday so don't want to
    delay things, you can make a decision on that when he sends it, I have
    my phone so I can ack things just not really merge much.

    It has one trivial conflict with your tree in armada_drv.c, and also
    the pull request contains some component changes that are already in
    your tree, the base tree from Russell went via Greg's tree already,
    but some stuff still shows up in here that doesn't when I merge my
    tree into yours.

    Otherwise all pretty standard graphics fare, one new driver and
    changes all over the place.

    New drivers:
    - sti kms driver for STMicroelectronics chipsets stih416 and stih407.

    core:
    - lots of cleanups to the drm core
    - DP MST helper code merged
    - universal cursor planes.
    - render nodes enabled by default

    panel:
    - better panel interfaces
    - new panel support
    - non-continuous cock advertising ability

    ttm:
    - shrinker fixes

    i915:
    - hopefully ditched UMS support
    - runtime pm fixes
    - psr tracking and locking - now enabled by default
    - userptr fixes
    - backlight brightness fixes
    - MST support merged
    - runtime PM for dpms
    - primary planes locking fixes
    - gen8 hw semaphore support
    - fbc fixes
    - runtime PM on SOix sleep state hw.
    - mmio base page flipping
    - lots of vlv/chv fixes.
    - universal cursor planes

    radeon:
    - Hawaii fixes
    - display scalar support for non-fixed mode displays
    - new firmware format support
    - dpm on more asics by default
    - GPUVM improvements
    - uncached and wc GTT buffers
    - BOs > visible VRAM

    exynos:
    - i80 interface support
    - module auto-loading
    - ipp driver consolidated.

    armada:
    - irq handling in crtc layer only
    - crtc renumbering
    - add component support
    - DT interaction changes.

    tegra:
    - load as module fixes
    - eDP bpp and sync polarity fixed
    - DSI non-continuous clock mode support
    - better support for importing buffers from nouveau

    msm:
    - mdp5/adq8084 v1.3 hw enablement
    - devicetree clk changse
    - ifc6410 board working

    tda998x:
    - component support
    - DT documentation update

    vmwgfx:
    - fix compat shader namespace"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (551 commits)
    Revert "drm: drop redundant drm_file->is_master"
    drm/panel: simple: Use devm_gpiod_get_optional()
    drm/dsi: Replace upcasting macro by function
    drm/panel: ld9040: Replace upcasting macro by function
    drm/exynos: dp: Modify driver to support drm_panel
    drm/exynos: Move DP setup into commit()
    drm/panel: simple: Add AUO B133HTN01 panel support
    drm/panel: simple: Support delays in panel functions
    drm/panel: simple: Add proper definition for prepare and unprepare
    drm/panel: s6e8aa0: Add proper definition for prepare and unprepare
    drm/panel: ld9040: Add proper definition for prepare and unprepare
    drm/tegra: Add support for panel prepare and unprepare routines
    drm/exynos: dsi: Add support for panel prepare and unprepare routines
    drm/exynos: dpi: Add support for panel prepare and unprepare routines
    drm/panel: simple: Add dummy prepare and unprepare routines
    drm/panel: s6e8aa0: Add dummy prepare and unprepare routines
    drm/panel: ld9040: Add dummy prepare and unprepare routines
    drm/panel: Provide convenience wrapper for .get_modes()
    drm/panel: add .prepare() and .unprepare() functions
    drm/panel: simple: Remove simple-panel compatible
    ...

    Linus Torvalds
     
  • Pull LED updates from Bryan Wu:
    "This cycle we got:
    - a fix of attribute-creation race for the whole leds subsystem
    - new drivers (HID:GT683R, leds-ipaq-micro)
    - other fixing and clean up"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (23 commits)
    leds: ipaq-micro: fix sparse non static symbol warning
    leds: add driver for the iPAQ micro
    Documentation: dts: tcs6507: Fix wrong statement about #gpio-cells
    leds: convert blink timer to workqueue
    leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default
    leds:pca963x: Always initialize MODE2 register
    leds:pca963x: Add support for PCA9635 LED driver chip
    HID: gt683r: move mode attribute to led-class devices
    HID: gt683r: fix race condition
    HID: add support for MSI GT683R led panels
    leds: lp55xx-common: fix attribute-creation race
    leds: lp55xx-common: fix sysfs entry leak
    input: lm8323: fix attribute-creation race
    leds: wm831x-status: fix attribute-creation race
    leds: ss4200: fix attribute-creation race
    leds: ns2: fix attribute-creation race
    leds: netxbig: fix attribute-creation race
    leds: max8997: fix attribute-creation race
    leds: lm3642: fix attribute-creation race
    leds: lm355x: fix attribute-creation race
    ...

    Linus Torvalds
     
  • Pull pinctrl updates from Linus Walleij:
    "This is the bulk pin control changes for the v3.17 merge development
    cycle:

    - get rid of the .disable() callback from the driver callback vtable.

    This callback was abused and counterintuitive since a pin or group
    of pins can be said to always be in some setting, and never really
    disabled. We now only enable a certain muxing, and move between
    some certain muxings, we never "disable" a mux setting

    - some janitorial moving the MSM, Samsung and Nomadik and drivers to
    their own subdirectories for a clearer view in the subsystem. This
    will continue

    - kill off the use of the return value from gpiochip_remove(), this
    will be done in parallel in the GPIO subsystem and hopefully not
    trigger too many unchecked return value warnings before we get rid
    of this altogether

    - a huge set of changes and improvements to the Allwinner sunxi
    drivers especially for their latest A23 and A31 SoCs, and some
    ground work for the new sun8i platform family

    - a large set of Rockchip driver improvements adding support for the
    RK3288 SoC

    - advances in migration of older Freescale platforms to pin control,
    especially i.MX1

    - Samsung and Exynos improvements

    - support for the Qualcomm MSM8960 SoC

    - use the gpiolib irqchip helpers for the ST SPEAr and Intel Baytrail
    drivers

    - a bunch of nice janitorial work done with cppcheck"

    * tag 'pinctrl-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (61 commits)
    pinctrl: baytrail: Convert to use gpiolib irqchip
    pinctrl: sunxi: number gpio ranges starting from 0
    pinctrl: sunxi: use gpiolib API to mark a GPIO used as an IRQ
    pinctrl: rockchip: add drive-strength control for rk3288
    pinctrl: rockchip: add separate type for rk3288
    pinctrl: rockchip: set is_generic in pinconf_ops
    pinctrl: msm: drop negativity check on unsigned value
    pinctrl: remove all usage of gpio_remove ret val in driver/pinctl
    pinctrl: qcom: Make muxing of gpio function explicit
    pinctrl: nomadik: move all Nomadik drivers to subdir
    pinctrl: samsung: Group all drivers in a sub-dir
    sh-pfc: sh73a0: Introduce the use of devm_regulator_register
    sh-pfc: Add renesas,pfc-r8a7791 to binding documentation
    pinctrl: msm: move all qualcomm drivers to subdir
    pinctrl: msm: Add msm8960 definitions
    pinctrl: samsung: Allow pin value to be initialized using pinfunc
    pinctrl: samsung: Allow grouping multiple pinmux/pinconf nodes
    pinctrl: exynos: Consolidate irq_chips of GPIO and WKUP EINTs
    pinctrl: samsung: Handle GPIO request and free using pinctrl helpers
    pinctrl: samsung: Decouple direction setting from pinctrl
    ...

    Linus Torvalds
     
  • Pull MFD update from Lee Jones:
    "Changes to existing drivers:
    - checkpatch fixes throughout the subsystem
    - use Regmap to handle IRQs in max77686, extcon-max77693 and
    mc13xxx-core
    - use DMA in rtsx_pcr
    - restrict building on unsupported architectures on timberdale,
    cs5535
    - SPI hardening in cros_ec_spi
    - more robust error handing in asic3, cros_ec, ab8500-debugfs,
    max77686 and pcf50633-core
    - reorder PM runtime and regulator handing during shutdown in arizona
    - enable wakeup in cros_ec_spi
    - unused variable/code clean-up in pm8921-core, cros_ec, htc-i2cpld,
    tps65912-spi, wm5110-tables and ab8500-debugfs
    - add regulator handing into suspend() in sec-core
    - remove pointless wrapper functions in extcon-max77693 and
    i2c-cros-ec-tunnel
    - use cross-architecture friendly data sizes in stmpe-i2c, arizona,
    max77686 and tps65910
    - devicetree documentation updates throughout
    - provide power management support in max77686
    - few OF clean-ups in max77686
    - use manged resources in tps6105x

    New drivers/supported devices:
    - add support for s2mpu02 to sec-core
    - add support for Allwinner A32 to sun6i-prcm
    - add support for Maxim 77802 in max77686
    - add support for DA9063 AD in da9063
    - new driver for Intel PMICs (generic) and specifically Crystal Cove

    (Re-)moved drivers ==
    - move out keyboard functionality cros_ec ==> input/keyboard/cros_ec_keyb"

    * tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (101 commits)
    MAINTAINERS: Update MFD repo location
    mfd: omap-usb-host: Fix improper mask use.
    mfd: arizona: Only free the CTRLIF_ERR IRQ if we requested it
    mfd: arizona: Add missing handling for ISRC3 under/overclocked
    mfd: wm5110: Add new interrupt register definitions
    mfd: arizona: Rename thermal shutdown interrupt
    mfd: wm5110: Add in the output done interrupts
    mfd: wm5110: Remove non-existant interrupts
    mfd: tps65912-spi: Remove unused variable
    mfd: htc-i2cpld: Remove unused code
    mfd: da9063: Add support for AD silicon variant
    mfd: arizona: Map MICVDD from extcon device to the Arizona core
    mfd: arizona: Add MICVDD to mapped regulators for wm8997
    mfd: max77686: Ensure device type IDs are architecture agnostic
    mfd: max77686: Add Maxim 77802 PMIC support
    mfd: tps6105x: Use managed resources when allocating memory
    mfd: wm8997-tables: Suppress 'line over 80 chars' warnings
    mfd: kempld-core: Correct a variety of checkpatch warnings
    mfd: ipaq-micro: Fix coding style errors/warnings reported by checkpatch
    mfd: si476x-cmd: Remedy checkpatch style complains
    ...

    Linus Torvalds
     
  • Pull second round of KVM changes from Paolo Bonzini:
    "Here are the PPC and ARM changes for KVM, which I separated because
    they had small conflicts (respectively within KVM documentation, and
    with 3.16-rc changes). Since they were all within the subsystem, I
    took care of them.

    Stephen Rothwell reported some snags in PPC builds, but they are all
    fixed now; the latest linux-next report was clean.

    New features for ARM include:
    - KVM VGIC v2 emulation on GICv3 hardware
    - Big-Endian support for arm/arm64 (guest and host)
    - Debug Architecture support for arm64 (arm32 is on Christoffer's todo list)

    And for PPC:
    - Book3S: Good number of LE host fixes, enable HV on LE
    - Book3S HV: Add in-guest debug support

    This release drops support for KVM on the PPC440. As a result, the
    PPC merge removes more lines than it adds. :)

    I also included an x86 change, since Davidlohr tied it to an
    independent bug report and the reporter quickly provided a Tested-by;
    there was no reason to wait for -rc2"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (122 commits)
    KVM: Move more code under CONFIG_HAVE_KVM_IRQFD
    KVM: nVMX: fix "acknowledge interrupt on exit" when APICv is in use
    KVM: nVMX: Fix nested vmexit ack intr before load vmcs01
    KVM: PPC: Enable IRQFD support for the XICS interrupt controller
    KVM: Give IRQFD its own separate enabling Kconfig option
    KVM: Move irq notifier implementation into eventfd.c
    KVM: Move all accesses to kvm::irq_routing into irqchip.c
    KVM: irqchip: Provide and use accessors for irq routing table
    KVM: Don't keep reference to irq routing table in irqfd struct
    KVM: PPC: drop duplicate tracepoint
    arm64: KVM: fix 64bit CP15 VM access for 32bit guests
    KVM: arm64: GICv3: mandate page-aligned GICV region
    arm64: KVM: GICv3: move system register access to msr_s/mrs_s
    KVM: PPC: PR: Handle FSCR feature deselects
    KVM: PPC: HV: Remove generic instruction emulation
    KVM: PPC: BOOKEHV: rename e500hv_spr to bookehv_spr
    KVM: PPC: Remove DCR handling
    KVM: PPC: Expose helper functions for data/inst faults
    KVM: PPC: Separate loadstore emulation from priv emulation
    KVM: PPC: Handle magic page in kvmppc_ld/st
    ...

    Linus Torvalds
     

07 Aug, 2014

5 commits

  • Pull powerpc updates from Ben Herrenschmidt:
    "This is the powerpc new goodies for 3.17. The short story:

    The biggest bit is Michael removing all of pre-POWER4 processor
    support from the 64-bit kernel. POWER3 and rs64. This gets rid of a
    ton of old cruft that has been bitrotting in a long while. It was
    broken for quite a few versions already and nobody noticed. Nobody
    uses those machines anymore. While at it, he cleaned up a bunch of
    old dusty cabinets, getting rid of a skeletton or two.

    Then, we have some base VFIO support for KVM, which allows assigning
    of PCI devices to KVM guests, support for large 64-bit BARs on
    "powernv" platforms, support for HMI (Hardware Management Interrupts)
    on those same platforms, some sparse-vmemmap improvements (for memory
    hotplug),

    There is the usual batch of Freescale embedded updates (summary in the
    merge commit) and fixes here or there, I think that's it for the
    highlights"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (102 commits)
    powerpc/eeh: Export eeh_iommu_group_to_pe()
    powerpc/eeh: Add missing #ifdef CONFIG_IOMMU_API
    powerpc: Reduce scariness of interrupt frames in stack traces
    powerpc: start loop at section start of start in vmemmap_populated()
    powerpc: implement vmemmap_free()
    powerpc: implement vmemmap_remove_mapping() for BOOK3S
    powerpc: implement vmemmap_list_free()
    powerpc: Fail remap_4k_pfn() if PFN doesn't fit inside PTE
    powerpc/book3s: Fix endianess issue for HMI handling on napping cpus.
    powerpc/book3s: handle HMIs for cpus in nap mode.
    powerpc/powernv: Invoke opal call to handle hmi.
    powerpc/book3s: Add basic infrastructure to handle HMI in Linux.
    powerpc/iommu: Fix comments with it_page_shift
    powerpc/powernv: Handle compound PE in config accessors
    powerpc/powernv: Handle compound PE for EEH
    powerpc/powernv: Handle compound PE
    powerpc/powernv: Split ioda_eeh_get_state()
    powerpc/powernv: Allow to freeze PE
    powerpc/powernv: Enable M64 aperatus for PHB3
    powerpc/eeh: Aux PE data for error log
    ...

    Linus Torvalds
     
  • Signed-off-by: Ajit Pal Singh
    Signed-off-by: Lee Jones
    Signed-off-by: Thierry Reding

    Lee Jones
     
  • drm/panel: Changes for v3.17-rc1

    Panels can now be more finely controlled via .prepare() and .unprepare()
    callbacks in addition to .enable() and .disable(). New kerneldoc details
    what they are supposed to do and when they should be called.

    The simple panel driver gained support for a couple of new panels and it
    is now possible to specify additional delays during power up and power
    down sequences if panels require it.

    DSI devices can now advertise that they support non-continuous clock
    mode which will allow DSI host controllers to disable the high speed
    clock after transmissions to save power.

    * tag 'drm/panel/for-3.17-rc1' of git://anongit.freedesktop.org/tegra/linux: (30 commits)
    drm/panel: simple: Use devm_gpiod_get_optional()
    drm/dsi: Replace upcasting macro by function
    drm/panel: ld9040: Replace upcasting macro by function
    drm/exynos: dp: Modify driver to support drm_panel
    drm/exynos: Move DP setup into commit()
    drm/panel: simple: Add AUO B133HTN01 panel support
    drm/panel: simple: Support delays in panel functions
    drm/panel: simple: Add proper definition for prepare and unprepare
    drm/panel: s6e8aa0: Add proper definition for prepare and unprepare
    drm/panel: ld9040: Add proper definition for prepare and unprepare
    drm/tegra: Add support for panel prepare and unprepare routines
    drm/exynos: dsi: Add support for panel prepare and unprepare routines
    drm/exynos: dpi: Add support for panel prepare and unprepare routines
    drm/panel: simple: Add dummy prepare and unprepare routines
    drm/panel: s6e8aa0: Add dummy prepare and unprepare routines
    drm/panel: ld9040: Add dummy prepare and unprepare routines
    drm/panel: Provide convenience wrapper for .get_modes()
    drm/panel: add .prepare() and .unprepare() functions
    drm/panel: simple: Remove simple-panel compatible
    drm/panel: simple: Add Innolux N116BGE panel support
    ...

    Dave Airlie
     
  • Pull watchdog updates from Wim Van Sebroeck:
    - remove unnecessary checks after platform_get_resource()
    - fix watchdog api documentation typo's
    - imx2_wdt: adds big endianness support
    - move restart code to the sunxi watchdog driver

    * git://www.linux-watchdog.org/linux-watchdog:
    wdt: sunxi: Move restart code to the watchdog driver
    Documentation: fix two typos in watchdog-api.txt
    watchdog: imx2_wdt: adds big endianness support.
    watchdog: shwdt: Remove the unnecessary check of resource after platform_get_resource()
    watchdog: lantiq_wdt: Remove the un-necessary check of resource after platform_get_resource()
    watchdog: dw_wdt: Remove the un-necessary check after platform_get_resource()

    Linus Torvalds
     
  • Pull sound updates from Takashi Iwai:
    "There've been many updates in ASoC side at this time, especially the
    framework enhancement for multiple CODECs on a single DAI and more
    componentization works.

    The only major change in ALSA core is the addition of timestamp type
    in sw_params field. This should behave in backward compatible way.

    Other than that, there are lots of small changes and new drivers in
    wide range, including a large code cut in HD-audio driver for
    deprecated static quirks. Some highlights are below:

    ALSA Core:
    - Add the new timestamp type field to sw_params to choose
    MONOTONIC_RAW type

    HD-audio:
    - Continued conversion to standard printk macros, generic code
    cleanups
    - Removal of obsoleted static quirk codes for Conexant and C-Media
    codecs
    - Fixups for HP Envy TS, Dell XPS 15, HP and Dell mute/mic LED,
    Gigabyte BXBT-2807 mobo
    - Intel Braswell support

    ASoC:
    - Support for multiple CODECs attached to a single DAI, enabling
    systems with for example multiple DAC/speaker drivers on a single
    link, contributed by Benoit Cousson based on work from Misael Lopez
    Cruz
    - Support for byte controls larger than 256 bytes based on the use of
    TLVs contributed by Omair Mohammed Abdullah
    - More componentisation work from Lars-Peter Clausen
    - The remainder of the conversions of CODEC drivers to params_width()
    by Mark Brown
    - Drivers for Cirrus Logic CS4265, Freescale i.MX ASRC blocks,
    Realtek RT286 and RT5670, Rockchip RK3xxx I2S controllers and Texas
    Instruments TAS2552
    - Lots of updates and fixes, especially to the DaVinci, Intel,
    Freescale, Realtek, and rcar drivers"

    * tag 'sound-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (402 commits)
    ALSA: usb-audio: Whitespace cleanups for sound/usb/midi.*
    ALSA: usb-audio: Respond to suspend and resume callbacks for MIDI input
    sound/oss/pss: Remove typedefs pss_mixerdata and pss_confdata
    sound/oss/opl3: Remove typedef opl_devinfo
    ALSA: fireworks: fix specifiers in format strings for propper output
    ASoC: imx-audmux: Use uintptr_t for port numbers
    ASoC: davinci: Enable menuconfig entry for McASP
    ASoC: fsl_asrc: Don't access members of config before checking it
    ASoC: fsl_sarc_dma: Check pair before using it
    ASoC: adau1977: Fix truncation warning on 64 bit architectures
    ALSA: virtuoso: add Xonar Essence STX II support
    ALSA: riptide: fix %d confusingly prefixed with 0x in format strings
    ALSA: fireworks: fix %d confusingly prefixed with 0x in format strings
    ALSA: hda - add codec ID for Braswell display audio codec
    ALSA: hda - add PCI IDs for Intel Braswell
    ALSA: usb-audio: Adjust Gamecom 780 volume level
    ALSA: usb-audio: improve dmesg source grepability
    ASoC: rt5670: Fix duplicate const warnings
    ASoC: rt5670: Staticise non-exported symbols
    ASoC: Intel: update stream only on stream IPC msgs
    ...

    Linus Torvalds