04 Jun, 2012

1 commit

  • This is useful for SoCs whose I2C module's signals can be routed to
    different sets of pins at run-time, using the pinctrl API.

    +-----+ +-----+
    | dev | | dev |
    +------------------------+ +-----+ +-----+
    | SoC | | |
    | /----|------+--------+
    | +---+ +------+ | child bus A, on first set of pins
    | |I2C|---|Pinmux| |
    | +---+ +------+ | child bus B, on second set of pins
    | \----|------+--------+--------+
    | | | | |
    +------------------------+ +-----+ +-----+ +-----+
    | dev | | dev | | dev |
    +-----+ +-----+ +-----+

    Signed-off-by: Stephen Warren
    Acked-by: Linus Walleij
    Acked-by: Rob Herring
    Signed-off-by: Wolfram Sang

    Stephen Warren
     

02 Jun, 2012

1 commit

  • Pull mtd update from David Woodhouse:
    - More robust parsing especially of xattr data in JFFS2
    - Updates to mxc_nand and gpmi drivers to support new boards and device tree
    - Improve consistency of information about ECC strength in NAND devices
    - Clean up partition handling of plat_nand
    - Support NAND drivers without dedicated access to OOB area
    - BCH hardware ECC support for OMAP
    - Other fixes and cleanups, and a few new device IDs

    Fixed trivial conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c due to
    added include files next to each other.

    * tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd: (75 commits)
    mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
    mtd: block2mtd: fix recursive call of mtd_writev
    mtd: gpmi-nand: define ecc.strength
    mtd: of_parts: fix breakage in Kconfig
    mtd: nand: fix scan_read_raw_oob
    mtd: docg3 fix in-middle of blocks reads
    mtd: cfi_cmdset_0002: Slight cleanup of fixup messages
    mtd: add fixup for S29NS512P NOR flash.
    jffs2: allow to complete xattr integrity check on first GC scan
    jffs2: allow to discriminate between recoverable and non-recoverable errors
    mtd: nand: omap: add support for hardware BCH ecc
    ARM: OMAP3: gpmc: add BCH ecc api and modes
    mtd: nand: check the return code of 'read_oob/read_oob_raw'
    mtd: nand: remove 'sndcmd' parameter of 'read_oob/read_oob_raw'
    mtd: m25p80: Add support for Winbond W25Q80BW
    jffs2: get rid of jffs2_sync_super
    jffs2: remove unnecessary GC pass on sync
    jffs2: remove unnecessary GC pass on umount
    jffs2: remove lock_super
    mtd: gpmi: add gpmi support for mx6q
    ...

    Linus Torvalds
     

30 May, 2012

6 commits

  • Pull IOMMU updates from Joerg Roedel:
    "Not much stuff this time. The only change to the IOMMU core code is
    the addition of a handle to the fault handling code. A few updates to
    the AMD IOMMU driver to work around new errata. The other patches are
    mostly fixes and enhancements to the existing ARM IOMMU drivers and
    documentation updates.

    A new IOMMU driver for the Exynos platform was also underway but got
    merged via the Samsung tree and is not part of this tree."

    * tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
    Documentation: kernel-parameters.txt Add amd_iommu_dump
    iommu/core: pass a user-provided token to fault handlers
    iommu/tegra: gart: Fix register offset correctly
    iommu: OMAP: device detach on domain destroy
    iommu: tegra/gart: Add device tree support
    iommu: tegra/gart: use correct gart_device
    iommu/tegra: smmu: Print device name correctly
    iommu/amd: Add workaround for event log erratum
    iommu/amd: Check for the right TLP prefix bit
    dma-debug: release free_entries_lock before saving stack trace

    Linus Torvalds
     
  • Joerg Roedel
     
  • Pull MIPS updates from Ralf Baechle:
    "The whole series has been sitting in -next for quite a while with no
    complaints. The last change to the series was before the weekend the
    removal of an SPI patch which Grant - even though previously acked by
    himself - appeared to raise objections. So I removed it until the
    situation is clarified. Other than that all the patches have the acks
    from their respective maintainers, all MIPS and x86 defconfigs are
    building fine and I'm not aware of any problems introduced by this
    series.

    Among the key features for this patch series is a sizable patchset for
    Lantiq which among other things introduces support for Lantiq's
    flagship product, the FALCON SOC. It also means that the opensource
    developers behind this patchset have overtaken Lantiq's competing
    inhouse development team that was working behind closed doors.

    Less noteworthy the ath79 patchset which adds support for a few more
    chip variants, cleanups and fixes. Finally the usual dose of tweaking
    of generic code."

    Fix up trivial conflicts in arch/mips/lantiq/xway/gpio_{ebu,stp}.c where
    printk spelling fixes clashed with file move and eventual removal of the
    printk.

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (81 commits)
    MIPS: lantiq: remove orphaned code
    MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.
    MIPS: lantiq: implement support for FALCON soc
    MTD: MIPS: lantiq: verify that the NOR interface is available on falcon soc
    MTD: MIPS: lantiq: implement OF support
    watchdog: MIPS: lantiq: implement OF support and minor fixes
    SERIAL: MIPS: lantiq: implement OF support
    GPIO: MIPS: lantiq: convert gpio-stp-xway to OF
    GPIO: MIPS: lantiq: convert gpio-mm-lantiq to OF and of_mm_gpio
    GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to the subsystem folder
    MIPS: pci: convert lantiq driver to OF
    MIPS: lantiq: convert dma to platform driver
    MIPS: lantiq: implement support for clkdev api
    MIPS: lantiq: drop ltq_gpio_request() and gpio_to_irq()
    OF: MIPS: lantiq: implement irq_domain support
    OF: MIPS: lantiq: implement OF support
    MIPS: lantiq: drop mips_machine support
    OF: PCI: const usage needed by MIPS
    MIPS: Cavium: Remove smp_reserve_lock.
    MIPS: Move cache setup to setup_arch().
    ...

    Linus Torvalds
     
  • Adds device tree support for rtc-lpc32xx.c

    Signed-off-by: Roland Stigge
    Acked-by: Rob Herring
    Acked-by: Arnd Bergmann
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roland Stigge
     
  • SPEAr platforms now support DT and so must convert all drivers support DT.
    This patch adds DT probing support for rtc and updates its documentation
    too.

    Signed-off-by: Viresh Kumar
    Cc: Stefan Roese
    Cc: Arnd Bergmann
    Cc: Alessandro Zummo
    Cc: Rajeev Kumar
    Cc: Rob Herring
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Viresh Kumar
     
  • Pull MFD changes from Samuel Ortiz:
    "Besides the usual cleanups, this one brings:

    * Support for 5 new chipsets: Intel's ICH LPC and SCH Centerton,
    ST-E's STAX211, Samsung's MAX77693 and TI's LM3533.

    * Device tree support for the twl6040, tps65910, da9502 and ab8500
    drivers.

    * Fairly big tps56910, ab8500 and db8500 updates.

    * i2c support for mc13xxx.

    * Our regular update for the wm8xxx driver from Mark."

    Fix up various conflicts with other trees, largely due to ab5500 removal
    etc.

    * tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (106 commits)
    mfd: Fix build break of max77693 by adding REGMAP_I2C option
    mfd: Fix twl6040 build failure
    mfd: Fix max77693 build failure
    mfd: ab8500-core should depend on MFD_DB8500_PRCMU
    gpio: tps65910: dt: process gpio specific device node info
    mfd: Remove the parsing of dt info for tps65910 gpio
    mfd: Save device node parsed platform data for tps65910 sub devices
    mfd: Add r_select to lm3533 platform data
    gpio: Add Intel Centerton support to gpio-sch
    mfd: Emulate active low IRQs as well as active high IRQs for wm831x
    mfd: Mark two lm3533 zone registers as volatile
    mfd: Fix return type of lm533 attribute is_visible
    mfd: Enable Device Tree support in the ab8500-pwm driver
    mfd: Enable Device Tree support in the ab8500-sysctrl driver
    mfd: Add support for Device Tree to twl6040
    mfd: Register the twl6040 child for the ASoC codec unconditionally
    mfd: Allocate twl6040 IRQ numbers dynamically
    mfd: twl6040 code cleanup in interrupt initialization part
    mfd: Enable ab8500-gpadc driver for Device Tree
    mfd: Prevent unassigned pointer from being used in ab8500-gpadc driver
    ...

    Linus Torvalds
     

27 May, 2012

5 commits

  • Pull i2c-embedded changes from Wolfram Sang:
    "Major changes:

    - lots of devicetree additions for existing drivers. I tried hard to
    make sure the bindings are proper. In more complicated cases, I
    requested acks from people having more experience with them than
    me. That took a bit of extra time and also some time went into
    discussions with developers about what bindings are and what not.
    I have the feeling that the workflow with bindings should be
    improved to scale better. I will spend some more thought on
    this...

    - i2c-muxes are succesfully used meanwhile, so we dropped
    EXPERIMENTAL for them and renamed the drivers to a standard pattern
    to match the rest of the subsystem. They can also be used with
    devicetree now.

    - ixp2000 was removed since the whole platform goes away.

    - cleanups (strlcpy instead of strcpy, NULL instead of 0)

    - The rest is typical driver fixes I assume.

    All patches have been in linux-next at least since v3.4-rc6."

    Fixed up trivial conflict in arch/arm/mach-lpc32xx/common.c due to the
    same patch already having come in through the arm/soc trees, with
    additional patches on top of it.

    * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (35 commits)
    i2c: davinci: Free requested IRQ in remove
    i2c: ocores: register OF i2c devices
    i2c: tegra: notify transfer-complete after clearing status.
    I2C: xiic: Add OF binding support
    i2c: Rename last mux driver to standard pattern
    i2c: tegra: fix 10bit address configuration
    i2c: muxes: rename first set of drivers to a standard pattern
    of/i2c: implement of_find_i2c_adapter_by_node
    i2c: implement i2c_verify_adapter
    i2c-s3c2410: Add HDMIPHY quirk for S3C2440
    i2c-s3c2410: Rework device type handling
    i2c: muxes are not EXPERIMENTAL anymore
    i2c/of: Automatically populate i2c mux busses from device tree data.
    i2c: Add a struct device * parameter to i2c_add_mux_adapter()
    of/i2c: call i2c_verify_client from of_find_i2c_device_by_node
    i2c: designware: Add clk_{un}prepare() support
    i2c: designware: add PM support
    i2c: ixp2000: remove driver
    i2c: pnx: add device tree support
    i2c: imx: don't use strcpy but strlcpy
    ...

    Linus Torvalds
     
  • Pull arm-soc: soc specific changes (part 2) from Olof Johansson:
    "This adds support for the spear13xx platform, which has first been
    under review a long time ago and finally been completed after generic
    spear work has gone into the clock, dt and pinctrl branches.

    Also a number of updates for the samsung socs are part of this branch."

    Fix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much
    worse than they are: the exonys5 init code was refactored in commit
    fd454997d687 ("gpio: samsung: refactor gpiolib init for exynos4/5"), and
    then commit f10590c9836c ("ARM: EXYNOS: add GPC4 bank instance") added a
    new gpio chip define and did tiny updates to the init code.

    So the conflict diff looks like hell, but it's actually a fairly simple
    change.

    * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
    ARM: exynos: fix building with CONFIG_OF disabled
    ARM: EXYNOS: Add AUXDATA for i2c controllers
    ARM: dts: Update device tree source files for EXYNOS5250
    ARM: EXYNOS: Add device tree support for interrupt combiner
    ARM: EXYNOS: Add irq_domain support for interrupt combiner
    ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
    ARM: EXYNOS: update irqs for EXYNOS5250 SoC
    ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
    ARM: EXYNOS: add GPC4 bank instance
    ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
    ARM: EXYNOS: Modify the GIC physical address for static io-mapping
    ARM: EXYNOS: Add watchdog timer clock instance
    pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
    SPEAr: Update MAINTAINERS and Documentation
    SPEAr13xx: Add defconfig
    SPEAr13xx: Add compilation support
    SPEAr13xx: Add dts and dtsi files
    pinctrl: Add SPEAr13xx pinctrl drivers
    pinctrl: SPEAr: Create macro for declaring GPIO PINS
    SPEAr13xx: Add common clock framework support
    ...

    Linus Torvalds
     
  • Pull arm-soc device tree conversions (part 2) from Olof Johansson:
    "These continue the device tree work from part 1, this set is for the
    tegra, mxs and imx platforms, all of which have dependencies on clock
    or pinctrl changes submitted earlier."

    Fix up trivial conflicts due to nearby changes in
    drivers/{gpio/gpio,i2c/busses/i2c}-mxs.c

    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
    ARM: dt: tegra: invert status=disable vs status=okay
    ARM: dt: tegra: consistent basic property ordering
    ARM: dt: tegra: sort nodes based on bus order
    ARM: dt: tegra: remove duplicate device_type property
    ARM: dt: tegra: consistenly use lower-case for hex constants
    ARM: dt: tegra: format regs properties consistently
    ARM: dt: tegra: gpio comment cleanup
    ARM: dt: tegra: remove unnecessary unit addresses
    ARM: dt: tegra: whitespace cleanup
    ARM: dt: tegra cardhu: fix typo in SDHCI node name
    ARM: dt: tegra: cardhu: register core regulator tps62361
    ARM: dt: tegra30.dtsi: Add SMMU node
    ARM: dt: tegra20.dtsi: Add GART node
    ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
    ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
    ARM: dt: tegra: Add device tree support for AHB
    ARM: dts: enable audio support for imx28-evk
    ARM: dts: enable i2c device for imx28-evk
    i2c: mxs: add device tree probe support
    ARM: dts: enable mmc for imx28-evk
    ...

    Linus Torvalds
     
  • Pull arm-soc clock driver changes from Olof Johansson:
    "The new clock subsystem was merged in linux-3.4 without any users,
    this now moves the first three platforms over to it: imx, mxs and
    spear.

    The series also contains the changes for the clock subsystem itself,
    since Mike preferred to have it together with the platforms that
    require these changes, in order to avoid interdependencies and
    conflicts."

    Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
    removed in one branch, added OF support in another) and
    drivers/dma/imx-sdma.c (independent changes next to each other).

    * tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
    clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
    clk: Provide dummy clk_unregister()
    SPEAr: Update defconfigs
    SPEAr: Add SMI NOR partition info in dts files
    SPEAr: Switch to common clock framework
    SPEAr: Call clk_prepare() before calling clk_enable
    SPEAr: clk: Add General Purpose Timer Synthesizer clock
    SPEAr: clk: Add Fractional Synthesizer clock
    SPEAr: clk: Add Auxiliary Synthesizer clock
    SPEAr: clk: Add VCO-PLL Synthesizer clock
    SPEAr: Add DT bindings for SPEAr's timer
    ARM i.MX: remove now unused clock files
    ARM: i.MX6: implement clocks using common clock framework
    ARM i.MX35: implement clocks using common clock framework
    ARM i.MX5: implement clocks using common clock framework
    ARM: Kirkwood: Replace clock gating
    ARM: Orion: Audio: Add clk/clkdev support
    ARM: Orion: PCIE: Add support for clk
    ARM: Orion: XOR: Add support for clk
    ARM: Orion: CESA: Add support for clk
    ...

    Linus Torvalds
     
  • Pull arm-soc driver specific updates from Olof Johansson:
    "These changes are specific to some driver that may be used by multiple
    boards or socs. The most significant change in here is the move of
    the samsung iommu code from a platform specific in-kernel interface to
    the generic iommu subsystem."

    Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
    mmc: dt: Consolidate DT bindings
    iommu/exynos: Add iommu driver for EXYNOS Platforms
    ARM: davinci: optimize the DMA ISR
    ARM: davinci: implement DEBUG_LL port choice
    ARM: tegra: Add SMMU enabler in AHB
    ARM: tegra: Add Tegra AHB driver
    Input: pxa27x_keypad add choice to set direct_key_mask
    Input: pxa27x_keypad direct key may be low active
    Input: pxa27x_keypad bug fix for direct_key_mask
    Input: pxa27x_keypad keep clock on as wakeup source
    ARM: dt: tegra: pinmux changes for USB ULPI
    ARM: tegra: add USB ULPI PHY reset GPIO to device tree
    ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
    ARM: tegra: change pll_p_out4's rate to 24MHz
    ARM: tegra: fix pclk rate
    ARM: tegra: reparent sclk to pll_c_out1
    ARM: tegra: Add pllc clock init table
    ARM: dt: tegra cardhu: basic audio support
    ARM: dt: tegra30.dtsi: Add audio-related nodes
    ARM: tegra: add AUXDATA required for audio
    ...

    Linus Torvalds
     

26 May, 2012

1 commit

  • Pull slave-dmaengine updates from Vinod Koul:
    "Nothing exciting this time, odd fixes in a bunch of drivers"

    * 'next' of git://git.infradead.org/users/vkoul/slave-dma:
    dmaengine: at_hdmac: take maxburst from slave configuration
    dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant
    dmaengine: at_hdmac: remove some at_dma_slave comments
    dma: imx-sdma: make channel0 operations atomic
    dmaengine: Fixup dmaengine_prep_slave_single() to be actually useful
    dmaengine: Use dma_sg_len(sg) instead of sg->length
    dmaengine: Use sg_dma_address instead of sg_phys
    DMA: PL330: Remove duplicate header file inclusion
    dma: imx-sdma: keep the callbacks invoked in the tasklet
    dmaengine: dw_dma: add Device Tree probing capability
    dmaengine: dw_dmac: Add clk_{un}prepare() support
    dma/amba-pl08x: add support for the Nomadik variant
    dma/amba-pl08x: check for terminal count status only

    Linus Torvalds
     

25 May, 2012

5 commits

  • Pull sound update from Takashi Iwai:
    "This is the second updates for 3.5-rc1. It's mainly for OMAP4 HDMI
    updates and the device tree updates for OMAP, in addition to a couple
    of PCM accuray improvement and Realtek ALC269VD codec support."

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
    ALSA: hda/realtek - Add new codec support for ALC269VD
    ALSA: core: group read of pointer, tstamp and jiffies
    ASoC: OMAP: HDMI: Rename sound card source file
    ASoC: OMAP: HDMI: Make sound card naming more generic
    ASoC: OMAP: HDMI: Make build config options more generic
    ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI
    ASoC: OMAP: HDMI: Improve how the display state is verified
    ASoC: OMAP: HDMI: Expand configuration of hw_params
    ASoC: OMAP: HDMI: Use the DSS audio interface
    ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI
    ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI
    ASoC: OMAP: HDMI: Update the platform device names
    ASoC: omap-abe-twl6040: Introduce driver data for runtime parameters
    ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm table
    ASoC: omap-abe-twl6040: Keep only one snd_soc_dai_link structure
    ASoC: omap-dmic: Add device tree bindings
    ASoC: omap-mcpdm: Add device tree bindings
    ASoC: omap-mcbsp: buffer size constraint only applies to playback stream
    ASoC: omap-mcbsp: Use the common interrupt line if supported by the SoC
    ASoC: omap-mcbsp: Remove unused FRAME dma_op_mode
    ...

    Linus Torvalds
     
  • Pull MMC changes from Chris Ball
    - at91-mci: This driver will be replaced by atmel-mci in 3.7.
    - atmel-mci: Add support for old at91-mci hardware.
    - dw_mmc: Allow multiple controllers; this previously caused
    corruption.
    - imxmmc: Remove this driver, replaced by mxcmmc.
    - mmci: Add device tree support.
    - omap: Allow multiple controllers.
    - omap_hsmmc: Auto CMD12, DDR support.
    - tegra: Support SD 3.0 spec.

    Fix up the usual trivial conflicts in feature-removal-schedule.txt

    * tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (38 commits)
    mmc: at91-mci: this driver is now deprecated
    mmc: omap_hsmmc: pass IRQF_ONESHOT to request_threaded_irq
    mmc: block: Allow disabling 512B sector size emulation
    mmc: atmel-mci: add debug logs
    mmc: atmel-mci: add support for version lower than v2xx
    mmc: atmel-mci: change the state machine for compatibility with old IP
    mmc: atmel-mci: the r/w proof capability lack was not well managed
    mmc: dw_mmc: Fixed sdio interrupt mask bit setting bug
    mmc: omap: convert to module_platform_driver
    mmc: omap: make it behave well as a module
    mmc: omap: convert to per instance workqueue
    mmc: core: Remove dead code
    mmc: card: Avoid null pointer dereference
    mmc: core: Prevent eMMC VCC supply to be cut from late init
    mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue
    mmc: queue: remove redundant memsets
    mmc: queue: rename mmc_request function
    mmc: core: skip card initialization if power class selection fails
    mmc: core: fix the signaling 1.8V for HS200
    mmc: core: fix the decision of HS200/DDR card-type
    ...

    Linus Torvalds
     
  • Pull GPIO driver changes from Grant Likely:
    "Lots of gpio changes, both to core code and drivers.

    Changes do touch architecture code to remove the need for separate
    arm/gpio.h includes in most architectures.

    Some new drivers are added, and a number of gpio drivers are converted
    to use irq_domains for gpio inputs used as interrupts. Device tree
    support has been amended to allow multiple gpio_chips to use the same
    device tree node.

    Remaining changes are primarily bug fixes."

    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: (33 commits)
    gpio/generic: initialize basic_mmio_gpio shadow variables properly
    gpiolib: Remove 'const' from data argument of gpiochip_find()
    gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583
    gpiolib: quiet gpiochip_add boot message noise
    gpio: mpc8xxx: Prevent NULL pointer deref in demux handler
    gpio/lpc32xx: Add device tree support
    gpio: Adjust of_xlate API to support multiple GPIO chips
    gpiolib: Implement devm_gpio_request_one()
    gpio-mcp23s08: dbg_show: fix pullup configuration display
    Add support for TCA6424A
    gpio/omap: (re)fix wakeups on level-triggered GPIOs
    gpio/omap: fix broken context restore for non-OFF mode transitions
    gpio/omap: fix missing check in *_runtime_suspend()
    gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()
    gpio/omap: remove suspend/resume callbacks
    gpio/omap: remove retrigger variable in gpio_irq_handler
    gpio/omap: remove saved_wakeup field from struct gpio_bank
    gpio/omap: remove suspend_wakeup field from struct gpio_bank
    gpio/omap: remove saved_fallingdetect, saved_risingdetect
    gpio/omap: remove virtual_irq_start variable
    ...

    Conflicts:
    drivers/gpio/gpio-samsung.c

    Linus Torvalds
     
  • Pull device tree changes from Grant Likely:
    "Mostly documentation updates, but also includes an empty stub for
    non-CONFIG_OF builds."

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
    dt/documentation: Fix value format description
    dt: add vendor prefix for EM Microelectronics
    ARM: DT: Add binding for GIC virtualization extentions (VGIC)
    of/irq: add empty irq_of_parse_and_map() for non-dt builds

    Linus Torvalds
     
  • Pull input layer updates from Dmitry Torokhov:
    - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics
    Navpoint, LM8333 keypads, Wacom I2C touhscreen);
    - updates to existing touchpad drivers (ALPS, Sntelic);
    - Wacom driver now supports Intuos5;
    - device-tree bindings in numerous drivers;
    - other cleanups and fixes.

    Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think
    implies that the input layer device naming is broken, but let's see. I
    brough it up with Dmitry.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
    Input: matrix-keymap - fix building keymaps
    Input: spear-keyboard - document DT bindings
    Input: spear-keyboard - add device tree bindings
    Input: matrix-keymap - wire up device tree support
    Input: matrix-keymap - uninline and prepare for device tree support
    Input: adp5588 - add support for gpio names
    Input: omap-keypad - dynamically handle register offsets
    Input: synaptics - fix compile warning
    MAINTAINERS: adjust input-related patterns
    Input: ALPS - switch to using input_mt_report_finger_count
    Input: ALPS - add semi-MT support for v4 protocol
    Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver
    Input: atmel_mxt_ts - dump each message on just 1 line
    Input: atmel_mxt_ts - do not read extra (checksum) byte
    Input: atmel_mxt_ts - verify object size in mxt_write_object
    Input: atmel_mxt_ts - only allow root to update firmware
    Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
    Input: sentelic - report device's production serial number
    Input: tl6040-vibra - Device Tree support
    Input: evdev - properly handle read/write with count 0
    ...

    Linus Torvalds
     

24 May, 2012

2 commits

  • Pull first set of watchdog updates from Wim Van Sebroeck:
    "This pull contains:

    - The removal of ixp2000_wdt
    - The addition of ie6xx_wdt
    - Some documentation fixes
    - Small fixes and improvements

    (Note: Part 2 will contain generic watchdog core changes + conversion
    of some more drivers)"

    * git://www.linux-watchdog.org/linux-watchdog:
    Documentation/watchdog: Fix the file descriptor leak when no cmdline arg given
    Documentation/watchdog: close the fd when cmdline arg given
    Documentation/watchdog: Fix a small typo
    watchdog: s3c2410_wdt: Set timeout to actually achieved timeout
    watchdog: wm831x: Convert to gpio_request_one()
    watchdog: via_wdt: depends on PCI
    watchdog: ie6xx_wdt needs io.h
    watchdog: ie6xx_wdt.c: fix printk format warning
    watchdog: Add watchdog driver for Intel Atom E6XX
    watchdog: it87_wdt: Add support for IT8728F watchdog.
    watchdog: i6300esb: don't depend on X86
    watchdog: Use module_pci_driver
    watchdog: sch311x_wdt.c: Remove RESGEN
    watchdog: s3c2410-wdt: Use of_match_ptr().
    watchdog: Device tree support for pnx4008-wdt
    watchdog: ar7_wdt.c: use devm_request_and_ioremap
    watchdog: remove ixp2000 driver
    watchdog: sp5100_tco.c: quiet sparse noise about using plain integer was NULL pointer

    Linus Torvalds
     
  • Pull sound updates from Takashi Iwai:
    "This is the first big chunk for 3.5 merges of sound stuff.

    There are a few big changes in different areas. First off, the
    streaming logic of USB-audio endpoints has been largely rewritten for
    the better support of "implicit feedback". If anything about USB got
    broken, this change has to be checked.

    For HD-audio, the resume procedure was changed; instead of delaying
    the resume of the hardware until the first use, now waking up
    immediately at resume. This is for buggy BIOS.

    For ASoC, dynamic PCM support and the improved support for digital
    links between off-SoC devices are major framework changes.

    Some highlights are below:

    * HD-audio
    - Avoid accesses of invalid pin-control bits that may stall the codec
    - V-ref setup cleanups
    - Fix the races in power-saving code
    - Fix the races in codec cache hashes and connection lists
    - Split some common codes for BIOS auto-parser to hda_auto_parser.c
    - Changed the PM resume code to wake up immediately for buggy BIOS
    - Creative SoundCore3D support
    - Add Conexant CX20751/2/3/4 codec support

    * ASoC
    - Dynamic PCM support, allowing support for SoCs with internal
    routing through components with tight sequencing and formatting
    constraints within their internal paths or where there are multiple
    components connected with CPU managed DMA controllers inside the
    SoC.
    - Greatly improved support for direct digital links between off-SoC
    devices, providing a much simpler way of connecting things like
    digital basebands to CODECs.
    - Much more fine grained and robust locking, cleaning up some of the
    confusion that crept in with multi-component.
    - CPU support for nVidia Tegra 30 I2S and audio hub controllers and
    ST-Ericsson MSP I2S controolers
    - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,
    Texas Instruments LM49453.
    - Some regmap changes needed by the Tegra I2S driver.
    - mc13783 audio support.

    * Misc
    - Rewrite with module_pci_driver()
    - Xonar DGX support for snd-oxygen
    - Improvement of packet handling in snd-firewire driver
    - New USB-endpoint streaming logic
    - Enhanced M-audio FTU quirks and relevant cleanups
    - Increment the support of OSS devices to 256
    - snd-aloop accuracy improvement

    There are a few more pending changes for 3.5, but they will be sent
    slightly later as partly depending on the changes of DRM."

    Fix up conflicts in regmap (due to duplicate patches, with some further
    updates then having already come in from the regmap tree). Also some
    fairly trivial context conflicts in the imx and mcx soc drivers.

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)
    ALSA: snd-usb: fix stream info output in /proc
    ALSA: pcm - Add proper state checks to snd_pcm_drain()
    ALSA: sh: Fix up namespace collision in sh_dac_audio.
    ALSA: hda/realtek - Fix unused variable compile warning
    ASoC: sh: fsi: enable chip specific data transfer mode
    ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()
    ASoC: sh: fsi: use same format for IN/OUT
    ASoC: sh: fsi: add fsi_version() and removed meaningless version check
    ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC
    ASoC: tegra: Add machine driver for WM8753 codec
    ALSA: hda - Fix possible races of accesses to connection list array
    ASoC: OMAP: HDMI: Introduce codec
    ARM: mx31_3ds: Add sound support
    ASoC: imx-mc13783 cleanup
    mx31moboard: Add sound support
    ASoC: mc13783 codec cleanups
    ASoC: add imx-mc13783 sound support
    ASoC: Add mc13783 codec
    mfd: mc13xxx: add codec platform data
    ASoC: don't flip master of DT-instantiated DAI links
    ...

    Linus Torvalds
     

23 May, 2012

11 commits

  • This patch adds device tree support to pnx4008-wdt.c

    Signed-off-by: Roland Stigge
    Reviewed-by: Arnd Bergmann
    Signed-off-by: Wim Van Sebroeck

    Roland Stigge
     
  • Pull trivial updates from Jiri Kosina:
    "As usual, it's mostly typo fixes, redundant code elimination and some
    documentation updates."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
    edac, mips: don't change code that has been removed in edac/mips tree
    xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
    lib: Change mail address of Oskar Schirmer
    net: Change mail address of Oskar Schirmer
    arm/m68k: Change mail address of Sebastian Hess
    i2c: Change mail address of Oskar Schirmer
    net: Fix tcp_build_and_update_options comment in struct tcp_sock
    atomic64_32.h: fix parameter naming mismatch
    Kconfig: replace "--- help ---" with "---help---"
    c2port: fix bogus Kconfig "default no"
    edac: Fix spelling errors.
    qla1280: Remove redundant NULL check before release_firmware() call
    remoteproc: remove redundant NULL check before release_firmware()
    qla2xxx: Remove redundant NULL check before release_firmware() call.
    aic94xx: Get rid of redundant NULL check before release_firmware() call
    tehuti: delete redundant NULL check before release_firmware()
    qlogic: get rid of a redundant test for NULL before call to release_firmware()
    bna: remove redundant NULL test before release_firmware()
    tg3: remove redundant NULL test before release_firmware() call
    typhoon: get rid of redundant conditional before all to release_firmware()
    ...

    Linus Torvalds
     
  • Pull staging tree changes from Greg Kroah-Hartman:
    "Here is the big staging tree pull request for the 3.5-rc1 merge
    window.

    Loads of changes here, and we just narrowly added more lines than we
    added:
    622 files changed, 28356 insertions(+), 26059 deletions(-)

    But, good news is that there is a number of subsystems that moved out
    of the staging tree, to their respective "real" portions of the
    kernel.

    Code that moved out was:
    - iio core code
    - mei driver
    - vme core and bridge drivers

    There was one broken network driver that moved into staging as a step
    before it is removed from the tree (pc300), and there was a few new
    drivers added to the tree:
    - new iio drivers
    - gdm72xx wimax USB driver
    - ipack subsystem and 2 drivers

    All of the movements around have acks from the various subsystem
    maintainers, and all of this has been in the linux-next tree for a
    while.

    Signed-off-by: Greg Kroah-Hartman "

    Fixed up various trivial conflicts, along with a non-trivial one found
    in -next and pointed out by Olof Johanssen: a clean - but incorrect -
    merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually
    as per Stephen Rothwell.

    * tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
    Staging: bcm: Remove two unused variables from Adapter.h
    Staging: bcm: Removes the volatile type definition from Adapter.h
    Staging: bcm: Rename all "INT" to "int" in Adapter.h
    Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
    Staging: bcm: Correctly format all comments in Adapter.h
    Staging: bcm: Fix all whitespace issues in Adapter.h
    Staging: bcm: Properly format braces in Adapter.h
    Staging: ipack/bridges/tpci200: remove unneeded casts
    Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
    Staging: ipack: remove board_name and bus_name fields from struct ipack_device
    Staging: ipack: improve the register of a bus and a device in the bus.
    staging: comedi: cleanup all the comedi_driver 'detach' functions
    staging: comedi: remove all 'default N' in Kconfig
    staging: line6/config.h: Delete unused header
    staging: gdm72xx depends on NET
    staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
    staging: drm/omap: initial dmabuf/prime import support
    staging: drm/omap: dmabuf/prime mmap support
    pstore/ram: Add ECC support
    pstore/ram: Switch to persistent_ram routines
    ...

    Linus Torvalds
     
  • Pull driver core updates from Greg Kroah-Hartman:
    "Here's the driver core, and other driver subsystems, pull request for
    the 3.5-rc1 merge window.

    Outside of a few minor driver core changes, we ended up with the
    following different subsystem and core changes as well, due to
    interdependancies on the driver core:
    - hyperv driver updates
    - drivers/memory being created and some drivers moved into it
    - extcon driver subsystem created out of the old Android staging
    switch driver code
    - dynamic debug updates
    - printk rework, and /dev/kmsg changes

    All of this has been tested in the linux-next releases for a few weeks
    with no reported problems.

    Signed-off-by: Greg Kroah-Hartman "

    Fix up conflicts in drivers/extcon/extcon-max8997.c where git noticed
    that a patch to the deleted drivers/misc/max8997-muic.c driver needs to
    be applied to this one.

    * tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)
    uio_pdrv_genirq: get irq through platform resource if not set otherwise
    memory: tegra{20,30}-mc: Remove empty *_remove()
    printk() - isolate KERN_CONT users from ordinary complete lines
    sysfs: get rid of some lockdep false positives
    Drivers: hv: util: Properly handle version negotiations.
    Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()
    memory: tegra{20,30}-mc: Use dev_err_ratelimited()
    driver core: Add dev_*_ratelimited() family
    Driver Core: don't oops with unregistered driver in driver_find_device()
    printk() - restore prefix/timestamp printing for multi-newline strings
    printk: add stub for prepend_timestamp()
    ARM: tegra30: Make MC optional in Kconfig
    ARM: tegra20: Make MC optional in Kconfig
    ARM: tegra30: MC: Remove unnecessary BUG*()
    ARM: tegra20: MC: Remove unnecessary BUG*()
    printk: correctly align __log_buf
    ARM: tegra30: Add Tegra Memory Controller(MC) driver
    ARM: tegra20: Add Tegra Memory Controller(MC) driver
    printk() - restore timestamp printing at console output
    printk() - do not merge continuation lines of different threads
    ...

    Linus Torvalds
     
  • Pull Char/Misc patches from Greg Kroah-Hartman:
    "Here are a few various char/misc tree patches for the 3.5-rc1 merge
    window.

    Nothing major here at all, just different driver updates and some
    parport dead code removal.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'char-misc-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
    parport: remove unused dead code from lowlevel drivers
    xilinx_hwicap: reset XHI_MAX_RETRIES
    xilinx_hwicap: add support for virtex6 FPGAs
    Support M95040 SPI EEPROM
    misc: add support for bmp18x chips to the bmp085 driver
    misc: bmp085: add device tree properties
    misc: clean up bmp085 driver
    misc: do not mark exported functions __devexit
    misc: add missing __devexit_p() annotations
    pch_phub: delete duplicate definitions
    misc: Fix irq leak in max8997_muic_probe error path

    Linus Torvalds
     
  • Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
    "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.

    It's touches a lot of different parts of the kernel, all USB drivers,
    due to some API cleanups (getting rid of the ancient err() macro) and
    some changes that are needed for USB 3.0 power management updates.

    There are also lots of new drivers, pimarily gadget, but others as
    well. We deleted a staging driver, which was nice, and finally
    dropped the obsolete usbfs code, which will make Al happy to never
    have to touch that again.

    There were some build errors in the tree that linux-next found a few
    days ago, but those were fixed by the most recent changes (all were
    due to us not building with CONFIG_PM disabled.)

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
    xhci: Fix DIV_ROUND_UP compile error.
    xhci: Fix compile with CONFIG_USB_SUSPEND=n
    USB: Fix core compile with CONFIG_USB_SUSPEND=n
    brcm80211: Fix compile error for .disable_hub_initiated_lpm.
    Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
    MAINTAINERS: Add myself as maintainer to the USB PHY Layer
    USB: EHCI: fix command register configuration lost problem
    USB: Remove races in devio.c
    USB: ehci-platform: remove update_device
    USB: Disable hub-initiated LPM for comms devices.
    xhci: Add Intel U1/U2 timeout policy.
    xhci: Add infrastructure for host-specific LPM policies.
    USB: Add macros for interrupt endpoint types.
    xhci: Reserve one command for USB3 LPM disable.
    xhci: Some Evaluate Context commands must succeed.
    USB: Disable USB 3.0 LPM in critical sections.
    USB: Add support to enable/disable USB3 link states.
    USB: Allow drivers to disable hub-initiated LPM.
    USB: Calculate USB 3.0 exit latencies for LPM.
    USB: Refactor code to set LPM support flag.
    ...

    Conflicts:
    arch/arm/mach-exynos/mach-nuri.c
    arch/arm/mach-exynos/mach-universal_c210.c
    drivers/net/wireless/ath/ath6kl/usb.c

    Linus Torvalds
     
  • Pull arm-soc board specific changes from Olof Johansson:
    "While we generally attempt to get rid of board specific files and
    replace them with device tree based descriptions, a lot of platforms
    have not come that far:

    In shmobile, we add two new board files because their recently started
    effort to add DT support has not proceeded enough to use it for all of
    the important hardware.

    In Kirkwood, we are adding support for new boards with a combination
    of DT and board file contents in multiple cases.

    pxa/mmp and imx are extending support for existing board files but not
    adding new ones."

    Fix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
    ARM: shmobile: fix smp build
    ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree
    kirkwood: Add iconnect support
    orion/kirkwood: create a generic function for gpio led blinking
    kirkwood/orion: fix orion_gpio_set_blink
    ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt
    kirkwood: Allow nand to be configured via. devicetree
    mtd: Add orion_nand devicetree bindings
    ARM: kirkwood: Basic support for DNS-320 and DNS-325
    ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
    ARM: mach-shmobile: Use DT_MACHINE for KZM9G
    ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
    ARM: pxa: Use REGULATOR_SUPPLY macro
    ARM: mach-shmobile: kzm9g: enable SMP boot
    ARM: mach-shmobile: kzm9g: defconfig update
    ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
    ARM: mach-shmobile: kzm9g: add SDHI support
    ARM: mach-shmobile: kzm9g: add MMCIF support
    ARM: mach-shmobile: kzm9g: correct screen direction
    ARM: mach-shmobile: sh73a0.h: add GPIO_NR
    ...

    Linus Torvalds
     
  • Pull arm soc-specific pinctrl changes from Olof Johansson:
    "With this, five platforms are moving to the relatively new pinctrl
    subsystem for their pin management, replacing the older soc specific
    in-kernel interfaces with common code.

    There is quite a bit of net addition of code for each platform being
    added to the pinctrl subsystem. But the payback comes later when
    adding new boards can be done by only providing new device trees
    instead."

    Fix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}

    * tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
    mtd: nand: gpmi: fix compile error caused by pinctrl call
    ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig
    ARM: nomadik: enable PINCTRL_NOMADIK where needed
    ARM: mxs: enable pinctrl support
    video: mxsfb: adopt pinctrl support
    ASoC: mxs-saif: adopt pinctrl support
    i2c: mxs: adopt pinctrl support
    mtd: nand: gpmi: adopt pinctrl support
    mmc: mxs-mmc: adopt pinctrl support
    serial: mxs-auart: adopt pinctrl support
    serial: amba-pl011: adopt pinctrl support
    spi/imx: adopt pinctrl support
    i2c: imx: adopt pinctrl support
    can: flexcan: adopt pinctrl support
    net: fec: adopt pinctrl support
    ARM: ux500: switch MSP to using pinctrl for pins
    ARM: ux500: alter MSP registration to return a device pointer
    ARM: ux500: switch to using pinctrl for uart0
    ARM: ux500: delete custom pin control system
    ARM: ux500: switch over to Nomadik pinctrl driver
    ...

    Linus Torvalds
     
  • Device tree support for OMAP4+ dmic cpu dai driver.

    Signed-off-by: Peter Ujfalusi
    Reviewed-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Peter Ujfalusi
     
  • Device tree support for OMAP4+ McPDM cpu dai driver.

    Signed-off-by: Peter Ujfalusi
    Reviewed-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Peter Ujfalusi
     
  • Pull device tree conversions for arm-soc, part 1, from Olof Johansson:
    "The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game
    of booting using device trees, which is a great step forward for them.
    at91 and spear have pretty much completed this process with a huge
    amount of work being put into at91. The other platforms are
    continuing the process.

    We finally start to see the payback on this investment, as new
    machines are getting supported purely by adding a .dts source file
    that can be completely independent of the kernel source."

    Fix up trivial conflict in arch/arm/Kconfig

    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
    ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
    arm/dts: omap4-panda: Add LEDs support
    arm/dts: omap4-sdp: Add LEDs support
    arm/dts: twl4030: Add twl4030-gpio node
    OMAP4: devices: Do not create mcpdm device if the dtb has been provided
    OMAP4: devices: Do not create dmic device if the dtb has been provided
    Documentation: update docs for mmp dt
    ARM: dts: refresh dts file for arch mmp
    ARM: mmp: support pxa910 with device tree
    ARM: mmp: support mmp2 with device tree
    gpio: pxa: parse gpio from DTS file
    ARM: mmp: support DT in timer
    ARM: mmp: support DT in irq
    ARM: mmp: append CONFIG_MACH_MMP2_DT
    ARM: mmp: fix build issue on mmp with device tree
    ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree
    ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
    ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement
    ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball
    ARM: SPEAr3xx: Correct keyboard data passed from DT
    ...

    Linus Torvalds
     

22 May, 2012

3 commits

  • Pull pin control subsystem changes from Linus Walleij:

    - Generic Device Tree bindings and hooks for drivers so we can move
    over modern drivers to using this.

    - Device Tree bindings for Tegra SoCs.

    - Funneling some devicetree helper code for the drivers/of subsystem.

    - New pin control drivers for:
    * Freescale MXS
    * Freescale i.MX51
    * Freescale i.MX53
    All of these use Device Tree bindings.

    - Dummy pinctrl handles for stepwise migration to pinctrl, akin to
    dummy regulators.
    - Minor non-urgent fixes and improvments.

    Fix up trivial conflicts in Documentation/driver-model/devres.txt and
    drivers/pinctrl/core.c,

    * tag 'pinctrl-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (46 commits)
    pinctrl: pinctrl-imx: add imx51 pinctrl driver
    pinctrl: pinctrl-imx: add imx53 pinctrl driver
    pinctrl: pinctrl-pxa3xx: remove empty pinmux disable function
    pinctrl: pinctrl-mxs: remove empty pinmux disable function
    pinctrl: pinctrl-imx: remove empty pinmux disable function
    pinctrl: make pinmux disable function optional
    pinctrl: a minor error checking improvement for pinconf
    pinctrl: mxs: skip gpio nodes for group creation
    pinctrl: mxs: create group for pin config node
    pinctrl: (cosmetic) fix two entries in DocBook comments
    pinctrl: add more info to error msgs in pin_request
    pinctrl: add pinctrl-mxs support
    pinctrl: pinctrl-imx: add imx6q pinctrl driver
    pinctrl: pinctrl-imx: add imx pinctrl core driver
    dt: add of_get_child_count helper function
    pinctrl: support gpio request deferred probing
    pinctrl: add pinctrl_provide_dummies interface for platforms to use
    pinctrl: enhance reporting of errors when loading from DT
    pinctrl: add kerneldoc for pinctrl_ops device tree functions
    pinctrl: propagate map validation errors
    ...

    Linus Torvalds
     
  • Pull regulator updates from Mark Brown:
    "The major thing here is the addition of some helpers to factor code
    out of drivers, making a fair proportion of regulators much more just
    data rather than code which is nice.

    - Helpers in the core for regulators using regmap, providing generic
    implementations of the enable and voltage selection operations which
    just need data to describe them in the drivers.
    - Split out voltage mapping and voltage setting, allowing many more
    drivers to take advantage of the infrastructure for selectors.
    - Loads and loads of cleanups from Axel Lin once again, including many
    changes to take advantage of the above new framework features
    - New drivers for Ricoh RC5T583, TI TPS62362, TI TPS62363, TI
    TPS65913, TI TWL6035 and TI TWL6037.

    Some of the registration changes to support the core refactoring
    caused so many conflicts that eventually topic branches were abandoned
    for this release."

    * tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (227 commits)
    regulator: tps65910: use of_node of matched regulator being register
    regulator: tps65910: dt: support when "regulators" node found
    regulator: tps65910: add error message in case of failure
    regulator: tps62360: dt: initialize of_node param for regulator register.
    regulator: tps65910: use devm_* for memory allocation
    regulator: tps65910: use small letter for regulator names
    mfd: tpx6586x: Depend on regulator
    regulator: regulator for Palmas Kconfig
    regulator: regulator driver for Palmas series chips
    regulator: Enable Device Tree for the db8500-prcmu regulator driver
    regulator: db8500-prcmu: Separate regulator registration from probe
    regulator: ab3100: Use regulator_map_voltage_iterate()
    regulator: tps65217: Convert to set_voltage_sel and map_voltage
    regulator: Enable the ab8500 for Device Tree
    regulator: ab8500: Split up probe() into manageable pieces
    regulator: max8925: Remove check_range function and max_uV from struct rc5t583_regulator_info
    regulator: max8649: Remove unused check_range() function
    regulator: rc5t583: Remove max_uV from struct rc5t583_regulator_info
    regulator: da9052: Convert to set_voltage_sel and map_voltage
    regulator: max8952: Use devm_kzalloc
    ...

    Linus Torvalds
     
  • Pull core ARM updates from Russell King:
    "This is the bulk of the core ARM updates for this merge window.
    Included in here is a different way to handle the VIVT cache flushing
    on context switch, which should allow scheduler folk to remove a
    special case in their core code.

    We have architectured timer support here, which is a set of timers
    specified by the ARM architecture for future SoCs. So we should see
    less variability in timer design going forward.

    The last big thing here is my cleanup to the way we handle PCI across
    ARM, fixing some oddities in some platforms which hadn't realised
    there was a way to deal with their private data already built in to
    our PCI backend.

    I've also removed support for the ARMv3 architecture; it hasn't worked
    properly for years so it seems pointless to keep it around."

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (47 commits)
    ARM: PCI: remove per-pci_hw list of buses
    ARM: PCI: dove/kirkwood/mv78xx0: use sys->private_data
    ARM: PCI: provide a default bus scan implementation
    ARM: PCI: get rid of pci_std_swizzle()
    ARM: PCI: versatile: fix PCI interrupt setup
    ARM: PCI: integrator: use common PCI swizzle
    ARM: 7416/1: LPAE: Remove unused L_PTE_(BUFFERABLE|CACHEABLE) macros
    ARM: 7415/1: vfp: convert printk's to pr_*'s
    ARM: decompressor: avoid speculative prefetch from non-RAM areas
    ARM: Remove ARMv3 support from decompressor
    ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level
    ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs
    ARM: 7363/1: DEBUG_LL: limit early mapping to the minimum
    ARM: 7391/1: versatile: add some auxdata for device trees
    ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller
    AMBA: get rid of last two uses of NO_IRQ
    ARM: 7408/1: cacheflush: return error to userspace when flushing syscall fails
    ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held
    ARM: 7404/1: cmpxchg64: use atomic64 and local64 routines for cmpxchg64
    ARM: 7347/1: SCU: use cpu_logical_map for per-CPU low power mode
    ...

    Linus Torvalds
     

21 May, 2012

5 commits

  • Implements OF support and add code to load custom properties from the DT.

    The Serial To Parallel (STP) is found on MIPS based Lantiq socs. It is a
    peripheral controller used to drive external shift register cascades. At most
    3 groups of 8 bits can be driven. The hardware is able to allow the DSL modem
    to drive the 2 LSBs of the cascade automatically. Newer socs are also able to
    automatically drive some pins via the internal PHYs. The driver currently only
    supports output functionality. Patches for the input feature found on newer
    generations of the soc will be provided in a later series.

    Signed-off-by: John Crispin
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Acked-by: Grant Likely
    Patchwork: https://patchwork.linux-mips.org/patch/3839/
    Signed-off-by: Ralf Baechle

    John Crispin
     
  • Implements OF support and convert to of_mm_gpio.

    By attaching hardware latches to the External Bus Unit (EBU) on Lantiq SoC, it
    is possible to create output only gpios. This driver configures a special
    memory address, which when written to, outputs 16 bit to the latches.

    Signed-off-by: John Crispin
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Acked-by: Grant Likely
    Patchwork: https://patchwork.linux-mips.org/patch/3840/
    Signed-off-by: Ralf Baechle

    John Crispin
     
  • Signed-off-by: Viresh Kumar
    Signed-off-by: Dmitry Torokhov

    Viresh Kumar
     
  • Grant Likely
     
  • ChangeLog v1->v2:
    * change PIN_FUNC_ID base in binding doc to 0 from 1.

    Acked-by: Shawn Guo
    Acked-by: Stephen Warren
    Signed-off-by: Dong Aisheng
    Signed-off-by: Linus Walleij

    Dong Aisheng