09 Jan, 2013

2 commits

  • Pull ARM SoC fixes from Olof Johansson:
    "People are back from the holiday breaks, and it shows. Here are a
    bunch of fixes for a number of platforms:
    - A couple of small fixes for Nomadik
    - A larger set of changes for kirkwood/mvebu
    - uart driver selection, dt clocks, gpio-poweroff fixups, a few
    __init annotation fixes and some error handling improvement in
    their xor dma driver.
    - i.MX had a couple of minor fixes (and a critical one for flexcan2
    clock setup)
    - MXS has a small board fix and a framebuffer bugfix
    - A set of fixes for Samsung Exynos, fixing default bootargs and some
    Exynos5440 clock issues
    - A set of OMAP changes including PM fixes and a few sparse warning
    fixups

    All in all a bit more positive code delta than we'd ideally want to
    see here, mostly from the OMAP PM changes, but nothing overly crazy."

    * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
    ARM: clps711x: Fix bad merge of clockevents setup
    ARM: highbank: save and restore L2 cache and GIC on suspend
    ARM: highbank: add a power request clear
    ARM: highbank: fix secondary boot and hotplug
    ARM: highbank: fix typos with hignbank in power request functions
    ARM: dts: fix highbank cpu mpidr values
    ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
    ARM: mx5: Fix MX53 flexcan2 clock
    ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
    pinctrl: mvebu: make pdma clock on dove mandatory
    ARM: Dove: Add pinctrl clock to DT
    dma: mv_xor: fix error handling for clocks
    dma: mv_xor: fix error handling of mv_xor_channel_add()
    arm: mvebu: Add missing ; for cpu node.
    arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
    arm: mvebu: Armada XP MV78230 has two cores, not one
    clk: mvebu: Remove inappropriate __init tagging
    ARM: Kirkwood: Use fixed-regulator instead of board gpio call
    ARM: Kirkwood: Fix missing sdio clock
    ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
    ...

    Linus Torvalds
     
  • From Shawn Guo:

    It includes one critical fix - wrong flexcan2 clock will hang system
    when the port gets brought up. The other two are non-critical fixes,
    which are sent together here, since it's still early -rc stage.

    * tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
    ARM: mx5: Fix MX53 flexcan2 clock
    ARM: dts: imx31-bug: Fix manufacturer compatible string
    clk: imx: Remove 'clock-output-names' from the examples

    Olof Johansson
     

07 Jan, 2013

1 commit


04 Jan, 2013

2 commits

  • 'clock-output-names' is not used in any of the dts/dtsi files for i.mx.

    Remove it from the examples, so that the example and the real usage in the
    dtsi files can match.

    Signed-off-by: Fabio Estevam
    Acked-by: Rob Herring
    Signed-off-by: Shawn Guo

    Fabio Estevam
     
  • Pull pinctrl fixes from Linus Walleij:
    "A first round of pinctrl fixes for v3.8:
    - i.MX5 register configuration
    - Swap a kfree to devm_kfree() to avoid memory corruption in the at91
    driver
    - Add the missing device tree binding doc for the SIRF pin controller
    - Enable the SIRF GPIO pull up/down configuration from the device
    tree, it was previously retired from the hard-coded approach.
    - NULL check for the prcm_base in the Nomadik pin controller.
    - Provide the prcm_base from the device tree in the DT boot path for
    the Nomadik pin controller."

    * tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
    ARM: ux500: add pinctrl address resources
    pinctrl: nomadik: return if prcm_base is NULL
    pinctrl: sirf: enable GPIO pullup/down configuration from dts
    pinctrl: sirf: add missing DT-binding document
    pinctrl: fix comment mistake
    drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree
    pinctrl: imx5: fix GPIO_8 pad CAN1_RXCAN configuration

    Linus Torvalds
     

02 Jan, 2013

1 commit


26 Dec, 2012

2 commits

  • commit 7bec207427c2efb794 remove sirfsoc_gpio_set_pull function,
    this patches takes the feature back by adding sirf,pullups and
    sirf,pulldowns prop in dts, and the driver will set the GPIO
    pull according to the dts.

    Cc: Arnd Bergmann
    Signed-off-by: Barry Song
    Signed-off-by: Linus Walleij

    Barry Song
     
  • While sending email to Linus for reviewing:
    "pinctrl: sirf: add DT-binding pinmux mapping support"
    https://patchwork.kernel.org/patch/1364361/

    i have included the devicetree/bindings/pinctrl/pinctrl-sirf.txt

    But while sending pull request with commit 056876f6c73406c,
    i missed the document.

    this patch takes the document back.

    Signed-off-by: Barry Song
    Signed-off-by: Linus Walleij

    Barry Song
     

22 Dec, 2012

1 commit

  • Pull watchdog updates from Wim Van Sebroeck:
    "This includes some fixes and code improvements (like
    clk_prepare_enable and clk_disable_unprepare), conversion from the
    omap_wdt and twl4030_wdt drivers to the watchdog framework, addition
    of the SB8x0 chipset support and the DA9055 Watchdog driver and some
    OF support for the davinci_wdt driver."

    * git://www.linux-watchdog.org/linux-watchdog: (22 commits)
    watchdog: mei: avoid oops in watchdog unregister code path
    watchdog: Orion: Fix possible null-deference in orion_wdt_probe
    watchdog: sp5100_tco: Add SB8x0 chipset support
    watchdog: davinci_wdt: add OF support
    watchdog: da9052: Fix invalid free of devm_ allocated data
    watchdog: twl4030_wdt: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
    watchdog: remove depends on CONFIG_EXPERIMENTAL
    watchdog: Convert dev_printk(KERN_ to dev_(
    watchdog: DA9055 Watchdog driver
    watchdog: omap_wdt: eliminate goto
    watchdog: omap_wdt: delete redundant platform_set_drvdata() calls
    watchdog: omap_wdt: convert to devm_ functions
    watchdog: omap_wdt: convert to new watchdog core
    watchdog: WatchDog Timer Driver Core: fix comment
    watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare
    watchdog: imx2_wdt: Select the driver via ARCH_MXC
    watchdog: cpu5wdt.c: add missing del_timer call
    watchdog: hpwdt.c: Increase version string
    watchdog: Convert twl4030_wdt to watchdog core
    davinci_wdt: preparation for switch to common clock framework
    ...

    Linus Torvalds
     

20 Dec, 2012

4 commits

  • Linus Torvalds
     
  • This adds OF support for davinci_wdt driver.

    Signed-off-by: Murali Karicheri
    Acked-by: Grant Likely
    Signed-off-by: Wim Van Sebroeck

    Murali Karicheri
     
  • Pull MTD updates from David Woodhouse:
    - Various cleanups especially in NAND tests
    - Add support for NAND flash on BCMA bus
    - DT support for sh_flctl and denali NAND drivers
    - Kill obsolete/superceded drivers (fortunet, nomadik_nand)
    - Fix JFFS2 locking bug in ENOMEM failure path
    - New SPI flash chips, as usual
    - Support writing in 'reliable mode' for DiskOnChip G4
    - Debugfs support in nandsim

    * tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd: (96 commits)
    mtd: nand: typo in nand_id_has_period() comments
    mtd: nand/gpio: use io{read,write}*_rep accessors
    mtd: block2mtd: throttle writes by calling balance_dirty_pages_ratelimited.
    mtd: nand: gpmi: reset BCH earlier, too, to avoid NAND startup problems
    mtd: nand/docg4: fix and improve read of factory bbt
    mtd: nand/docg4: reserve bb marker area in ecclayout
    mtd: nand/docg4: add support for writing in reliable mode
    mtd: mxc_nand: reorder part_probes to let cmdline override other sources
    mtd: mxc_nand: fix unbalanced clk_disable() in error path
    mtd: nandsim: Introduce debugfs infrastructure
    mtd: physmap_of: error checking to prevent a NULL pointer dereference
    mtg: docg3: potential divide by zero in doc_write_oob()
    mtd: bcm47xxnflash: writing support
    mtd: tests/read: initialize buffer for whole next page
    mtd: at91: atmel_nand: return bit flips for the PMECC read_page()
    mtd: fix recovery after failed write-buffer operation in cfi_cmdset_0002.c
    mtd: nand: onfi need to be probed in 8 bits mode
    mtd: nand: add NAND_BUSWIDTH_AUTO to autodetect bus width
    mtd: nand: print flash size during detection
    mted: nand_wait_ready timeout fix
    ...

    Linus Torvalds
     
  • Pull pwm changes from Thierry Reding:
    "A new driver has been added for the SPEAr platform and the
    TWL4030/6030 driver has been replaced by two drivers that control the
    regular PWMs and the PWM driven LEDs provided by the chips.

    The vt8500, tiecap, tiehrpwm, i.MX, LPC32xx and Samsung drivers have
    all been improved and the device tree bindings now support the PWM
    signal polarity."

    Fix up trivial conflicts due to __devinit/exit removal.

    * tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm: (21 commits)
    pwm: samsung: add missing s3c->pwm_id assignment
    pwm: lpc32xx: Set the chip base for dynamic allocation
    pwm: lpc32xx: Properly disable the clock on device removal
    pwm: lpc32xx: Fix the PWM polarity
    pwm: i.MX: eliminate build warning
    pwm: Export of_pwm_xlate_with_flags()
    pwm: Remove pwm-twl6030 driver
    pwm: New driver to support PWM driven LEDs on TWL4030/6030 series of PMICs
    pwm: New driver to support PWMs on TWL4030/6030 series of PMICs
    pwm: pwm-tiehrpwm: pinctrl support
    pwm: tiehrpwm: Add device-tree binding
    pwm: pwm-tiehrpwm: Adding TBCLK gating support.
    pwm: pwm-tiecap: pinctrl support
    pwm: tiecap: Add device-tree binding
    pwm: Add TI PWM subsystem driver
    pwm: Device tree support for PWM polarity
    pwm: vt8500: Ensure PWM clock is enabled during pwm_config
    pwm: vt8500: Fix build error
    pwm: spear: Staticize spear_pwm_config()
    pwm: Add SPEAr PWM chip driver support
    ...

    Linus Torvalds
     

19 Dec, 2012

4 commits

  • Fix name of slink binding and address of sflash example to make it
    self consistent.

    Signed-off-by: Allen Martin
    Signed-off-by: Grant Likely

    Allen Martin
     
  • Pull i2c-embedded changes from Wolfram Sang:
    - CBUS driver (an I2C variant)
    - continued rework of the omap driver
    - s3c2410 gets lots of fixes and gains pinctrl support
    - at91 gains DMA support
    - the GPIO muxer gains devicetree probing
    - typical fixes and additions all over

    * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (45 commits)
    i2c: omap: Remove the OMAP_I2C_FLAG_RESET_REGS_POSTIDLE flag
    i2c: at91: add dma support
    i2c: at91: change struct members indentation
    i2c: at91: fix compilation warning
    i2c: mxs: Do not disable the I2C SMBus quick mode
    i2c: mxs: Handle i2c DMA failure properly
    i2c: s3c2410: Remove recently introduced performance overheads
    i2c: ocores: Move grlib set/get functions into #ifdef CONFIG_OF block
    i2c: s3c2410: Add fix for i2c suspend/resume
    i2c: s3c2410: Fix code to free gpios
    i2c: i2c-cbus-gpio: introduce driver
    i2c: ocores: Add support for the GRLIB port of the controller and use function pointers for getreg and setreg functions
    i2c: ocores: Add irq support for sparc
    i2c: omap: Move the remove constraint
    ARM: dts: cfa10049: Add the i2c muxer buses to the CFA-10049
    i2c: s3c2410: do not special case HDMIPHY stuck bus detection
    i2c: s3c2410: use exponential back off while polling for bus idle
    i2c: s3c2410: do not generate STOP for QUIRK_HDMIPHY
    i2c: s3c2410: grab adapter lock while changing i2c clock
    i2c: s3c2410: Add support for pinctrl
    ...

    Linus Torvalds
     
  • Pull second round of input updates from Dmitry Torokhov:
    "As usual, there are a couple of new drivers, input core now supports
    managed input devices (devres), a slew of drivers now have device tree
    support and a bunch of fixes and cleanups."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (71 commits)
    Input: walkera0701 - fix crash on startup
    Input: matrix-keymap - provide a proper module license
    Input: gpio_keys_polled - switch to using gpio_request_one()
    Input: gpio_keys - switch to using gpio_request_one()
    Input: wacom - fix touch support for Bamboo Fun CTH-461
    Input: xpad - add a few new VID/PID combinations
    Input: xpad - minor formatting fixes
    Input: gpio-keys-polled - honor 'autorepeat' setting in platform data
    Input: tca8418-keypad - switch to using managed resources
    Input: tca8418_keypad - increase severity of failures in probe()
    Input: tca8418_keypad - move device ID tables closer to where they are used
    Input: tca8418_keypad - use dev_get_platdata() to retrieve platform data
    Input: tca8418_keypad - use a temporary variable for parent device
    Input: tca8418_keypad - add support for shared interrupt
    Input: tca8418_keypad - add support for device tree bindings
    Input: remove Compaq iPAQ H3600 (Bitsy) touchscreen driver
    Input: bu21013_ts - add support for Device Tree booting
    Input: bu21013_ts - move GPIO init and exit functions into the driver
    Input: bu21013_ts - request regulator that actually exists
    ARM: ux500: Strip out duplicate touch screen platform information
    ...

    Linus Torvalds
     
  • Pull powerpc update from Benjamin Herrenschmidt:
    "The main highlight is probably some base POWER8 support. There's more
    to come such as transactional memory support but that will wait for
    the next one.

    Overall it's pretty quiet, or rather I've been pretty poor at picking
    things up from patchwork and reviewing them this time around and Kumar
    no better on the FSL side it seems..."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (73 commits)
    powerpc+of: Rename and fix OF reconfig notifier error inject module
    powerpc: mpc5200: Add a3m071 board support
    powerpc/512x: don't compile any platform DIU code if the DIU is not enabled
    powerpc/mpc52xx: use module_platform_driver macro
    powerpc+of: Export of_reconfig_notifier_[register,unregister]
    powerpc/dma/raidengine: add raidengine device
    powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct
    powerpc/mpc85xx: Change spin table to cached memory
    powerpc/fsl-pci: Add PCI controller ATMU PM support
    powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
    drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS]
    powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers
    powerpc: Disable relocation on exceptions when kexecing
    powerpc: Enable relocation on during exceptions at boot
    powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function
    powerpc: Add wrappers to enable/disable relocation on exceptions
    powerpc: Add set_mode hcall
    powerpc: Setup relocation on exceptions for bare metal systems
    powerpc: Move initial mfspr LPCR out of __init_LPCR
    powerpc: Add relocation on exception vector handlers
    ...

    Linus Torvalds
     

18 Dec, 2012

5 commits

  • Add device tree support to the rtc-imxdi driver.

    Signed-off-by: Roland Stigge
    Cc: Alessandro Zummo
    Cc: Grant Likely
    Cc: Sascha Hauer
    Cc: Russell King
    Cc: Shawn Guo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roland Stigge
     
  • Enhance rtc-omap driver with DT capability

    Signed-off-by: Afzal Mohammed
    Acked-by: Sekhar Nori
    Cc: Grant Likely
    Cc: Sekhar Nori
    Cc: Kevin Hilman
    Cc: Russell King
    Cc: Alessandro Zummo
    Cc: Daniel Mack
    Cc: Vaibhav Hiremath
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Afzal Mohammed
     
  • Brings some 52xx updates. Also manually merged tools/perf/perf.h.

    Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • Use the newly introduce cs-gpios dt support on atmel.
    We do not use the hardware cs as it's wired and has bugs and limitations.
    As the controller believes that only active-low devices/systems exists.

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Nicolas Ferre
    Signed-off-by: Grant Likely

    Jean-Christophe PLAGNIOL-VILLARD
     
  • Pull DRM updates from Dave Airlie:
    "This is the one and only next pull for 3.8, we had a regression we
    found last week, so I was waiting for that to resolve itself, and I
    ended up with some Intel fixes on top as well.

    Highlights:
    - new driver: nvidia tegra 20/30/hdmi support
    - radeon: add support for previously unused DMA engines, more HDMI
    regs, eviction speeds ups and fixes
    - i915: HSW support enable, agp removal on GEN6, seqno wrapping
    - exynos: IPP subsystem support (image post proc), HDMI
    - nouveau: display class reworking, nv20->40 z compression
    - ttm: start of locking fixes, rcu usage for lookups,
    - core: documentation updates, docbook integration, monotonic clock
    usage, move from connector to object properties"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (590 commits)
    drm/exynos: add gsc ipp driver
    drm/exynos: add rotator ipp driver
    drm/exynos: add fimc ipp driver
    drm/exynos: add iommu support for ipp
    drm/exynos: add ipp subsystem
    drm/exynos: support device tree for fimd
    radeon: fix regression with eviction since evict caching changes
    drm/radeon: add more pedantic checks in the CP DMA checker
    drm/radeon: bump version for CS ioctl support for async DMA
    drm/radeon: enable the async DMA rings in the CS ioctl
    drm/radeon: add VM CS parser support for async DMA on cayman/TN/SI
    drm/radeon/kms: add evergreen/cayman CS parser for async DMA (v2)
    drm/radeon/kms: add 6xx/7xx CS parser for async DMA (v2)
    drm/radeon: fix htile buffer size computation for command stream checker
    drm/radeon: fix fence locking in the pageflip callback
    drm/radeon: make indirect register access concurrency-safe
    drm/radeon: add W|RREG32_IDX for MM_INDEX|DATA based mmio accesss
    drm/exynos: support extended screen coordinate of fimd
    drm/exynos: fix x, y coordinates for right bottom pixel
    drm/exynos: fix fb offset calculation for plane
    ...

    Linus Torvalds
     

17 Dec, 2012

1 commit

  • Pull MFS update from Samuel Ortiz:
    "This is the MFD patch set for the 3.8 merge window.

    We have several new drivers, most of the time coming with their sub
    devices drivers:

    - Austria Microsystem's AS3711
    - Nano River's viperboard
    - TI's TPS80031, AM335x TS/ADC,
    - Realtek's MMC/memstick card reader
    - Nokia's retu

    We also got some notable cleanups and improvements:

    - tps6586x got converted to IRQ domains.
    - tps65910 and tps65090 moved to the regmap IRQ API.
    - STMPE is now Device Tree aware.
    - A general twl6040 and twl-core cleanup, with moves to the regmap
    I/O and IRQ APIs and a conversion to the recently added PWM
    framework.
    - sta2x11 gained regmap support.

    Then the rest is mostly tiny cleanups and fixes, among which we have
    Mark's wm5xxx and wm8xxx patchset."

    Far amount of annoying but largely trivial conflicts. Many due to
    __devinit/exit removal, others due to one or two of the new drivers also
    having come in through another tree.

    * tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits)
    mfd: tps6507x: Convert to devm_kzalloc
    mfd: stmpe: Update DT support for stmpe driver
    mfd: wm5102: Add readback of DSP status 3 register
    mfd: arizona: Log if we fail to create the primary IRQ domain
    mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ
    mfd: tps80031: Add terminating entry for tps80031_id_table
    mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask()
    mfd: wm5102: Add tuning for revision B
    mfd: arizona: Defer patch initialistation until after first device boot
    mfd: tps65910: Fix wrong ack_base register
    mfd: tps65910: Remove unused data
    mfd: stmpe: Get rid of irq_invert_polarity
    mfd: ab8500-core: Fix invalid free of devm_ allocated data
    mfd: wm5102: Mark DSP memory regions as volatile
    mfd: wm5102: Correct default for LDO1_CONTROL_2
    mfd: arizona: Register haptics devices
    mfd: wm8994: Make current device behaviour the default
    mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ
    mfd: Fix stmpe.c build when OF is not enabled
    mfd: jz4740-adc: Use devm_kzalloc
    ...

    Linus Torvalds
     

16 Dec, 2012

2 commits

  • Pull fbdev changes from Tomi Valkeinen:
    "OMAPDSS changes, including:
    - use dynanic debug prints
    - OMAP platform dependency removals
    - Creation of compat-layer, helping us to improve omapdrm
    - Misc cleanups, aiming to make omadss more in line with the upcoming
    common display framework

    Exynos DP changes for the 3.8 merge window:
    - Device Tree support for Samsung Exynos DP
    - SW Link training is cleaned up.
    - HPD interrupt is supported.

    Samsung Framebuffer changes for the 3.8 merge window:
    - The bit definitions of header file are updated.
    - Some minor typos are fixed.
    - Some minor bugs of s3c_fb_check_var() are fixed.

    FB related changes for SH Mobile, Freescale DIU

    Add support for the Solomon SSD1307 OLED Controller"

    * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
    OMAPDSS: fix TV-out issue with DSI PLL
    Revert "OMAPFB: simplify locking"
    OMAPFB: remove silly loop in fb2display()
    OMAPFB: fix error handling in omapfb_find_best_mode()
    OMAPFB: use devm_kzalloc to allocate omapfb2_device
    OMAPDSS: DISPC: remove dispc fck uses
    OMAPDSS: DISPC: get dss clock rate from dss driver
    drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
    drivers/video: add support for the Solomon SSD1307 OLED Controller
    OMAPDSS: use omapdss_compat_init() in other drivers
    OMAPDSS: export dispc functions
    OMAPDSS: export dss_feat functions
    OMAPDSS: export dss_mgr_ops functions
    OMAPDSS: separate compat files in the Makefile
    OMAPDSS: move display sysfs init to compat layer
    OMAPDSS: DPI: use dispc's check_timings
    OMAPDSS: DISPC: add dispc_ovl_check()
    OMAPDSS: move irq handling to dispc-compat
    OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
    OMAPDSS: move blocking mgr enable/disable to compat layer
    ...

    Conflicts:
    arch/arm/mach-davinci/devices-da8xx.c
    arch/arm/plat-omap/common.c
    drivers/media/platform/omap/omap_vout.c

    Linus Torvalds
     
  • Pull crypto update from Herbert Xu:

    - Added aesni/avx/x86_64 implementations for camellia.

    - Optimised AVX code for cast5/serpent/twofish/cast6.

    - Fixed vmac bug with unaligned input.

    - Allow compression algorithms in FIPS mode.

    - Optimised crc32c implementation for Intel.

    - Misc fixes.

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (32 commits)
    crypto: caam - Updated SEC-4.0 device tree binding for ERA information.
    crypto: testmgr - remove superfluous initializers for xts(aes)
    crypto: testmgr - allow compression algs in fips mode
    crypto: testmgr - add larger crc32c test vector to test FPU path in crc32c_intel
    crypto: testmgr - clean alg_test_null entries in alg_test_descs[]
    crypto: testmgr - remove fips_allowed flag from camellia-aesni null-tests
    crypto: cast5/cast6 - move lookup tables to shared module
    padata: use __this_cpu_read per-cpu helper
    crypto: s5p-sss - Fix compilation error
    crypto: picoxcell - Add terminating entry for platform_device_id table
    crypto: omap-aes - select BLKCIPHER2
    crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher
    crypto: camellia-x86_64 - share common functions and move structures and function definitions to header file
    crypto: tcrypt - add async speed test for camellia cipher
    crypto: tegra-aes - fix error-valued pointer dereference
    crypto: tegra - fix missing unlock on error case
    crypto: cast5/avx - avoid using temporary stack buffers
    crypto: serpent/avx - avoid using temporary stack buffers
    crypto: twofish/avx - avoid using temporary stack buffers
    crypto: cast6/avx - avoid using temporary stack buffers
    ...

    Linus Torvalds
     

15 Dec, 2012

4 commits

  • Pull ARM SoC updates for Marvell mvebu/kirkwood from Olof Johansson:
    "This is a branch with updates for Marvell's mvebu/kirkwood platforms.
    They came in late-ish, and were heavily interdependent such that it
    didn't make sense to split them up across the cross-platform topic
    branches. So here they are (for the second release in a row) in a
    branch on their own."

    * tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (88 commits)
    arm: l2x0: add aurora related properties to OF binding
    arm: mvebu: add Aurora L2 Cache Controller to the DT
    arm: mvebu: add L2 cache support
    dma: mv_xor: fix error handling path
    dma: mv_xor: fix error checking of irq_of_parse_and_map()
    dma: mv_xor: use request_irq() instead of devm_request_irq()
    dma: mv_xor: clear the window override control registers
    arm: mvebu: fix address decoding armada_cfg_base() function
    ARM: mvebu: update defconfig with I2C and RTC support
    ARM: mvebu: Add SATA support for OpenBlocks AX3-4
    ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C on OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C controllers in Armada 370/XP
    arm: mvebu: Add hardware I/O Coherency support
    arm: plat-orion: Add coherency attribute when setup mbus target
    arm: dma mapping: Export a dma ops function arm_dma_set_mask
    arm: mvebu: Add SMP support for Armada XP
    arm: mm: Add support for PJ4B cpu and init routines
    arm: mvebu: Add IPI support via doorbells
    arm: mvebu: Add initial support for power managmement service unit
    ...

    Linus Torvalds
     
  • Pull ARM SoC device-tree updates, take 2, from Olof Johansson:
    "This branch contains device-tree updates for the SPEAr platform. They
    had dependencies on earlier branches from this merge window, which is
    why they were broken out in a separate branch."

    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/
    ARM: SPEAr320: DT: Add SPEAr 320 HMI board support
    ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor
    ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT
    ARM: SPEAr1310: Fix AUXDATA for compact flash controller
    ARM: SPEAr13xx: Remove fields not required for ssp controller
    ARM: SPEAr1310: Move 1310 specific misc register into machine specific files
    ARM: SPEAr: DT: Update device nodes
    ARM: SPEAr: DT: add uart state to fix warning
    ARM: SPEAr: DT: Modify DT bindings for STMMAC
    ARM: SPEAr: DT: Fix existing DT support
    ARM: SPEAr: DT: Update partition info for MTD devices
    ARM: SPEAr: DT: Update pinctrl list
    ARM: SPEAr13xx: DT: Add spics gpio controller nodes

    Linus Torvalds
     
  • Pull ARM Soc updates, take 2, from Olof Johansson:
    "This is the second batch of SoC updates for the 3.8 merge window,
    containing parts that had dependencies on earlier branches such that
    we couldn't include them with the first branch.

    These are general updates for Samsung Exynos, Renesas/shmobile and a
    topic branch that adds SMP support to Altera's socfpga platform."

    Fix up conflicts mostly as per Olof.

    * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: EXYNOS: Clock settings for SATA and SATA PHY
    ARM: EXYNOS: Add ARM down clock support
    ARM: EXYNOS: Fix i2c suspend/resume for legacy controller
    ARM: EXYNOS: Add aliases for i2c controller
    ARM: EXYNOS: Setup legacy i2c controller interrupts
    sh: clkfwk: fixup unsed variable warning
    Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode"
    Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode"
    Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode"
    ARM: highbank: use common debug_ll_io_init
    ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
    ARM: shmobile: sh7372: remove fsidivx clock
    ARM: socfpga: mark secondary_trampoline as cpuinit
    socfpga: map uart into virtual address space so that early_printk() works
    ARM: socfpga: fix build break for allyesconfig
    ARM: socfpga: Enable SMP for socfpga
    ARM: EXYNOS: Add dp clock support for EXYNOS5
    ARM: SAMSUNG: call clk_get_rate for debugfs rate files
    ARM: SAMSUNG: add clock_tree debugfs file in clock

    Linus Torvalds
     
  • Merging in the smp-on-socfpga branch into soc2 since the topics are similar
    and it's a short branch in the first place.

    * next/smp:
    ARM: socfpga: mark secondary_trampoline as cpuinit
    socfpga: map uart into virtual address space so that early_printk() works
    ARM: socfpga: fix build break for allyesconfig
    ARM: socfpga: Enable SMP for socfpga

    Signed-off-by: Olof Johansson

    Olof Johansson
     

14 Dec, 2012

7 commits

  • Pull battery subsystem updates from Anton Vorontsov:
    "Highlights:

    - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and
    bq2415x_charger. The drivers are a part of a solution to replace
    the proprietary Nokia BME stack

    - Power supply core now registers devices with a thermal cooling
    subsystem, so we can now automatically throttle charging. Thanks
    to Ramakrishna Pallala!

    - Device tree support for ab8500 and max8925_power drivers

    - Random fixups and enhancements for a bunch of drivers."

    * tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6: (22 commits)
    max8925_power: Add support for device-tree initialization
    ab8500: Add devicetree support for chargalg
    ab8500: Add devicetree support for charger
    ab8500: Add devicetree support for btemp
    ab8500: Add devicetree support for fuelgauge
    twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*
    jz4740-battery: Use devm_request_and_ioremap
    jz4740-battery: Use devm_kzalloc
    bq27x00_battery: Fixup nominal available capacity reporting
    bq2415x_charger: Fix style issues
    bq2415x_charger: Add Kconfig/Makefile entries
    power_supply: Add bq2415x charger driver
    power_supply: Add new Nokia RX-51 (N900) power supply battery driver
    max17042_battery: Fix missing verify_model_lock() return value check
    ds2782_battery: Fix signedness bug in ds278x_read_reg16()
    lp8788-charger: Fix ADC channel names
    lp8788-charger: Fix wrong ADC conversion
    lp8788-charger: Use consumer device name on setting IIO channels
    power_supply: Register power supply for thermal cooling device
    power_supply: Add support for CHARGE_CONTROL_* attributes
    ...

    Linus Torvalds
     
  • Pull SPI updates from Grant Likely:
    "Primarily SPI device driver bug fixes, one removal of an old driver,
    and some new tegra support. There is some core code change too, but
    all in all pretty small stuff.

    The new features to note are:
    - Common code for describing GPIO CS lines in the device tree
    - Remove the SPI_BUFSIZ limitation on spi_write_the_read()
    - core spi ensures bits_per_word is set correctly
    - SPARC can now use SPI"

    * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6: (36 commits)
    spi/sparc: Allow of_register_spi_devices for sparc
    spi: Remove HOTPLUG section attributes
    spi: Add support for specifying 3-wire mode via device tree
    spi: Fix comparison of different integer types
    spi/orion: Add SPI_CHPA and SPI_CPOL support to kirkwood driver.
    spi/sh: Add SH Mobile series as dependency to MSIOF controller
    spi/sh-msiof: Remove unneeded clock name
    spi: Remove SPI_BUFSIZ restriction on spi_write_then_read()
    spi/stmp: remove obsolete driver
    spi/clps711x: New SPI master driver
    spi: omap2-mcspi: remove duplicate inclusion of linux/err.h
    spi: omap2-mcspi: Fix the redifine warning
    spi/sh-hspi: add CS manual control support
    of_spi: add generic binding support to specify cs gpio
    spi: omap2-mcspi: remove duplicated include from spi-omap2-mcspi.c
    spi/bitbang: (cosmetic) simplify list manipulation
    spi/bitbang: avoid needless loop flow manipulations
    spi/omap: fix D0/D1 direction confusion
    spi: tegra: add spi driver for sflash controller
    spi: Dont call master->setup if not populated
    ...

    Linus Torvalds
     
  • Pull regulator updates from Mark Brown:
    "A fairly quiet release again, a couple of relatively small new
    features and a bunch of driver specific work including yet more code
    elimination and fixes from Axel Lin.

    - Addidion of linear_min_sel for offsetting linear selectors in the
    helpers.
    - Support for continuous voltage ranges for regulators with extremely
    high resolution.
    - Drivers for AS3711, DA9055, MAX9873, TPS51632, TPS80031 and ARM
    vexpress."

    Fix up trivial conflict (due to typo fix) in palmas-regulator.c

    * tag 'regulator-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (80 commits)
    regulator: core: Fix logic to determinate if regulator can change voltage
    regulator: s5m8767: Fix to work even if no DVS gpio present
    regulator: s5m8767: Fix to read the first DVS register.
    regulator: s5m8767: Fix to work when platform registers less regulators
    regulator: gpio-regulator: gpio_set_value should use cansleep
    regulator: gpio-regulator: Fix logical error in for() loop
    regulator: anatop: Use regulator_[get|set]_voltage_sel_regmap
    regulator: anatop: Use linear_min_sel with linear mapping
    regulator: max1586: Implement get_voltage_sel callback
    regulator: lp8788-buck: Kill _gpio_request function
    regulator: tps80031: Convert tps80031_ldo_ops to linear_min_sel and list_voltage_linear
    regulator: lp8788-ldo: Remove val array in lp8788_config_ldo_enable_mode
    regulator: gpio-regulator: Add ifdef CONFIG_OF guard for regulator_gpio_of_match
    regulator: palmas: Convert palmas_ops_smps to regulator_[get|set]_voltage_sel_regmap
    regulator: palmas: Return raw register values as the selectors in [get|set]_voltage_sel
    regulators: add regulator_can_change_voltage() function
    regulator: tps51632: Ensure [base|max]_voltage_uV pdata settings are valid
    regulator: wm831x-dcdc: Add MODULE_ALIAS for wm831x-boostp
    regulator: wm831x-dcdc: Ensure selected voltage falls within requested range
    regulator: tps51632: Use linear_min_sel and regulator_[map|list]_voltage_linear
    ...

    Linus Torvalds
     
  • Pull sound updates from Takashi Iwai:
    "This update contains a fairly wide range of changes all over in sound
    subdirectory, mainly because of UAPI header moves by David and __dev*
    annotation removals by Bill. Other highlights are:

    - Introduced the support for wallclock timestamps in ALSA PCM core

    - Add the poll loop implementation for HD-audio jack detection

    - Yet more VGA-switcheroo fixes for HD-audio

    - New VIA HD-audio codec support

    - More fixes on resource management in USB audio and MIDI drivers

    - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
    Roland VG-99, etc

    - Add support for FastTrack C400 usb-audio

    - Clean ups in many drivers regarding firmware loading

    - Add PSC724 Ultiimate Edge support to ice1712

    - A few hdspm driver updates

    - New Stanton SCS.1d/1m FireWire driver

    - Standardisation of the logging in ASoC codes

    - DT and dmaengine support for ASoC Atmel

    - Support for Wolfson ADSP cores

    - New drivers for Freescale/iVeia P1022 and Maxim MAX98090

    - Lots of other ASoC driver fixes and developments"

    Fix up trivial conflicts. And go out on a limb and assume the dts file
    'status' field of one of the conflicting things was supposed to be
    "disabled", not "disable" like in pretty much all other cases.

    * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
    ALSA: hda - Move runtime PM check to runtime_idle callback
    ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
    ALSA: hda - Avoid doubly suspend after vga switcheroo
    ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
    ALSA: hda - Check validity of CORB/RIRB WP reads
    ALSA: hda - use usleep_range in link reset and change timeout check
    ALSA: HDA: VIA: Add support for codec VT1808.
    ALSA: HDA: VIA Add support for codec VT1705CF.
    ASoC: codecs: remove __dev* attributes
    ASoC: utils: remove __dev* attributes
    ASoC: ux500: remove __dev* attributes
    ASoC: txx9: remove __dev* attributes
    ASoC: tegra: remove __dev* attributes
    ASoC: spear: remove __dev* attributes
    ASoC: sh: remove __dev* attributes
    ASoC: s6000: remove __dev* attributes
    ASoC: OMAP: remove __dev* attributes
    ASoC: nuc900: remove __dev* attributes
    ASoC: mxs: remove __dev* attributes
    ASoC: kirkwood: remove __dev* attributes
    ...

    Linus Torvalds
     
  • Pull ARM SoC driver specific changes from Olof Johansson:
    "A collection of mostly SoC-specific driver updates:
    - a handful of pincontrol and setup changes
    - new drivers for hwmon and reset controller for vexpress
    - timing support updates for OMAP (gpmc and other interfaces)
    - plus a collection of smaller cleanups"

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
    ARM: ux500: fix pin warning
    ARM: OMAP2+: tusb6010: generic timing calculation
    ARM: OMAP2+: smc91x: generic timing calculation
    ARM: OMAP2+: onenand: generic timing calculation
    ARM: OMAP2+: gpmc: generic timing calculation
    ARM: OMAP2+: gpmc: handle additional timings
    ARM: OMAP2+: nand: remove redundant rounding
    gpio: samsung: use pr_* instead of printk
    ARM: ux500: fixup magnetometer pins
    ARM: ux500: add STM pin configuration
    ARM: ux500: 8500: add pinctrl support for uart1 and uart2
    ARM: ux500: cosmetic fixups for uart0
    gpio: samsung: Fix input mode setting function for GPIO int
    ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip
    ARM: ux500: 8500: define SDI sleep states
    ARM: vexpress: Reset driver
    ARM: ux500: 8500: update SKE keypad pinctrl table
    hwmon: Versatile Express hwmon driver
    ARM: ux500: delete duplicate macro
    ARM: ux500: 8500: add IDLE pin configuration for SPI
    ...

    Linus Torvalds
     
  • Pull ARM SoC multiplatform conversion patches from Olof Johansson:
    "Here are more patches in the progression towards multiplatform, sparse
    irq conversions in particular.

    Tegra has a handful of cleanups and general groundwork, but is not
    quite there yet on full enablement.

    Platforms that are enabled through this branch are VT8500 and Zynq.
    Note that i.MX was converted in one of the earlier cleanup branches as
    well (before we started a separate topic for multiplatform). And both
    new platforms for this merge window, sunxi and bcm, were merged with
    multiplatform support enabled."

    Fix up conflicts mostly as per Olof.

    * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: zynq: Remove all unused mach headers
    ARM: zynq: add support for ARCH_MULTIPLATFORM
    ARM: zynq: make use of debug_ll_io_init()
    ARM: zynq: remove TTC early mapping
    ARM: tegra: move debug-macro.S to include/debug
    ARM: tegra: don't include iomap.h from debug-macro.S
    ARM: tegra: decouple uncompress.h and debug-macro.S
    ARM: tegra: simplify DEBUG_LL UART selection options
    ARM: tegra: select SPARSE_IRQ
    ARM: tegra: enhance timer.c to get IO address from device tree
    ARM: tegra: enhance timer.c to get IRQ info from device tree
    ARM: timer: fix checkpatch warnings
    ARM: tegra: add TWD to device tree
    ARM: tegra: define DT bindings for and instantiate RTC
    ARM: tegra: define DT bindings for and instantiate timer
    clocksource/mtu-nomadik: use apb_pclk
    clk: ux500: Register mtu apb_pclocks
    ARM: plat-nomadik: convert platforms to SPARSE_IRQ
    mfd/db8500-prcmu: use the irq_domain_add_simple()
    mfd/ab8500-core: use irq_domain_add_simple()
    ...

    Linus Torvalds
     
  • Pull ARM SoC device tree conversions and enablement from Olof Johansson:
    "Continued device tree conversion and enablement across a number of
    platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other
    smaller series as well.

    ux500 has seen continued conversion for platforms. Several platforms
    have seen pinctrl-via-devicetree conversions for simpler
    multiplatform. Tegra is adding data for new devices/drivers, and
    Exynos has a bunch of new bindings and devices added as well.

    So, pretty much the same progression in the right direction as the
    last few releases."

    Fix up conflicts as per Olof.

    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (185 commits)
    ARM: ux500: Rename dbx500 cpufreq code to be more generic
    ARM: dts: add missing ux500 device trees
    ARM: ux500: Stop registering the PCM driver from platform code
    ARM: ux500: Move board specific GPIO info out to subordinate DTS files
    ARM: ux500: Disable the MMCI gpio-regulator by default
    ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
    ARM: Kirkwood: Add support LED of OpenBlocks A6
    ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
    ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
    ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
    ARM: kirkwood: Add support DT of second I2C bus
    ARM: kirkwood: Convert mplcec4 board to pinctrl
    ARM: Kirkwood: Convert km_kirkwood to pinctrl
    ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
    ARM: Kirkwood: Convert IX2-200 to pinctrl.
    ARM: Kirkwood: Convert lsxl boards to pinctrl.
    ARM: Kirkwood: Convert ib62x0 to pinctrl.
    ARM: Kirkwood: Convert GoFlex Net to pinctrl.
    ARM: Kirkwood: Convert dreamplug to pinctrl.
    ARM: Kirkwood: Convert dockstar to pinctrl.
    ...

    Linus Torvalds
     

13 Dec, 2012

4 commits

  • Pull networking changes from David Miller:

    1) Allow to dump, monitor, and change the bridge multicast database
    using netlink. From Cong Wang.

    2) RFC 5961 TCP blind data injection attack mitigation, from Eric
    Dumazet.

    3) Networking user namespace support from Eric W. Biederman.

    4) tuntap/virtio-net multiqueue support by Jason Wang.

    5) Support for checksum offload of encapsulated packets (basically,
    tunneled traffic can still be checksummed by HW). From Joseph
    Gasparakis.

    6) Allow BPF filter access to VLAN tags, from Eric Dumazet and
    Daniel Borkmann.

    7) Bridge port parameters over netlink and BPDU blocking support
    from Stephen Hemminger.

    8) Improve data access patterns during inet socket demux by rearranging
    socket layout, from Eric Dumazet.

    9) TIPC protocol updates and cleanups from Ying Xue, Paul Gortmaker, and
    Jon Maloy.

    10) Update TCP socket hash sizing to be more in line with current day
    realities. The existing heurstics were choosen a decade ago.
    From Eric Dumazet.

    11) Fix races, queue bloat, and excessive wakeups in ATM and
    associated drivers, from Krzysztof Mazur and David Woodhouse.

    12) Support DOVE (Distributed Overlay Virtual Ethernet) extensions
    in VXLAN driver, from David Stevens.

    13) Add "oops_only" mode to netconsole, from Amerigo Wang.

    14) Support set and query of VEB/VEPA bridge mode via PF_BRIDGE, also
    allow DCB netlink to work on namespaces other than the initial
    namespace. From John Fastabend.

    15) Support PTP in the Tigon3 driver, from Matt Carlson.

    16) tun/vhost zero copy fixes and improvements, plus turn it on
    by default, from Michael S. Tsirkin.

    17) Support per-association statistics in SCTP, from Michele
    Baldessari.

    And many, many, driver updates, cleanups, and improvements. Too
    numerous to mention individually.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
    net/mlx4_en: Add support for destination MAC in steering rules
    net/mlx4_en: Use generic etherdevice.h functions.
    net: ethtool: Add destination MAC address to flow steering API
    bridge: add support of adding and deleting mdb entries
    bridge: notify mdb changes via netlink
    ndisc: Unexport ndisc_{build,send}_skb().
    uapi: add missing netconf.h to export list
    pkt_sched: avoid requeues if possible
    solos-pci: fix double-free of TX skb in DMA mode
    bnx2: Fix accidental reversions.
    bna: Driver Version Updated to 3.1.2.1
    bna: Firmware update
    bna: Add RX State
    bna: Rx Page Based Allocation
    bna: TX Intr Coalescing Fix
    bna: Tx and Rx Optimizations
    bna: Code Cleanup and Enhancements
    ath9k: check pdata variable before dereferencing it
    ath5k: RX timestamp is reported at end of frame
    ath9k_htc: RX timestamp is reported at end of frame
    ...

    Linus Torvalds
     
  • Pull ARM SoC board updates from Olof Johansson:
    "This branch contains a set of various board updates for ARM platforms.

    A few shmobile platforms that are stale have been removed, some
    defconfig updates for various boards selecting new features such as
    pinctrl subsystem support, and various updates enabling peripherals,
    etc."

    Fix up conflicts mostly as per Olof.

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
    ARM: S3C64XX: Add dummy supplies for Glenfarclas LDOs
    ARM: S3C64XX: Add registration of WM2200 Bells device on Cragganmore
    ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
    ARM: Dove: update defconfig
    ARM: Kirkwood: update defconfig for new boards
    arm: orion5x: add DT related options in defconfig
    arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
    arm: orion5x: basic Device Tree support
    arm: orion5x: mechanical defconfig update
    ARM: kirkwood: Add support for the MPL CEC4
    arm: kirkwood: add support for ZyXEL NSA310
    ARM: Kirkwood: new board USI Topkick
    ARM: kirkwood: use gpio-fan DT binding on lsxl
    ARM: Kirkwood: add Netspace boards to defconfig
    ARM: kirkwood: DT board setup for Network Space Mini v2
    ARM: kirkwood: DT board setup for Network Space Lite v2
    ARM: kirkwood: DT board setup for Network Space v2 and parents
    leds: leds-ns2: add device tree binding
    ARM: Kirkwood: Enable the second I2C bus
    ARM: mmp: select pinctrl driver
    ...

    Linus Torvalds
     
  • Pull ARM SoC updates from Olof Johansson:
    "This contains the bulk of new SoC development for this merge window.

    Two new platforms have been added, the sunxi platforms (Allwinner A1x
    SoCs) by Maxime Ripard, and a generic Broadcom platform for a new
    series of ARMv7 platforms from them, where the hope is that we can
    keep the platform code generic enough to have them all share one mach
    directory. The new Broadcom platform is contributed by Christian
    Daudt.

    Highbank has grown support for Calxeda's next generation of hardware,
    ECX-2000.

    clps711x has seen a lot of cleanup from Alexander Shiyan, and he's
    also taken on maintainership of the platform.

    Beyond this there has been a bunch of work from a number of people on
    converting more platforms to IRQ domains, pinctrl conversion, cleanup
    and general feature enablement across most of the active platforms."

    Fix up trivial conflicts as per Olof.

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)
    mfd: vexpress-sysreg: Remove LEDs code
    irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
    clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
    irq: versatile: delete dangling variable
    ARM: sunxi: add missing include for mdelay()
    ARM: EXYNOS: Avoid early use of of_machine_is_compatible()
    ARM: dts: add node for PL330 MDMA1 controller for exynos4
    ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
    ARM: EXYNOS: add UART3 to DEBUG_LL ports
    ARM: S3C24XX: Add clkdev entry for camif-upll clock
    ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
    ARM: sunxi: Add missing sun4i.dtsi file
    pinctrl: samsung: Do not initialise statics to 0
    ARM i.MX6: remove gate_mask from pllv3
    ARM i.MX6: Fix ethernet PLL clocks
    ARM i.MX6: rename PLLs according to datasheet
    ARM i.MX6: Add pwm support
    ARM i.MX51: Add pwm support
    ARM i.MX53: Add pwm support
    ARM: mx5: Replace clk_register_clkdev with clock DT lookup
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups on various subarchitectures from Olof Johansson:
    "Cleanup patches for various ARM platforms and some of their associated
    drivers. There's also a branch in here that enables Freescale i.MX to
    be part of the multiplatform support -- the first "big" SoC that is
    moved over (more multiplatform work comes in a separate branch later
    during the merge window)."

    Conflicts fixed as per Olof, including a silent semantic one in
    arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to
    omap3xxx_restart(), and a new user of the old name was added).

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)
    ARM: omap: fix typo on timer cleanup
    ARM: EXYNOS: Remove unused regs-mem.h file
    ARM: EXYNOS: Remove unused non-dt support for dwmci controller
    ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
    ARM: OMAP3: cm-t3517: use GPTIMER for system clock
    ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
    ARM: SAMSUNG: use devm_ functions for ADC driver
    ARM: EXYNOS: no duplicate mask/unmask in eint0_15
    ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
    ARM: EXYNOS: Remove i2c0 resource information and setting of device names
    ARM: Kirkwood: checkpatch cleanups
    ARM: Kirkwood: Fix sparse warnings.
    ARM: Kirkwood: Remove unused includes
    ARM: kirkwood: cleanup lsxl board includes
    ARM: integrator: use BUG_ON where possible
    ARM: integrator: push down SC dependencies
    ARM: integrator: delete static UART1 mapping
    ARM: integrator: delete SC mapping on the CP
    ARM: integrator: remove static CP syscon mapping
    ARM: integrator: remove static AP syscon mapping
    ...

    Linus Torvalds