19 Nov, 2013

1 commit

  • Pull i2c changes from Wolfram Sang:
    - new drivers for exynos5, bcm kona, and st micro
    - bigger overhauls for drivers mxs and rcar
    - typical driver bugfixes, cleanups, improvements
    - got rid of the superfluous 'driver' member in i2c_client struct This
    touches a few drivers in other subsystems. All acked.

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
    i2c: bcm-kona: fix error return code in bcm_kona_i2c_probe()
    i2c: i2c-eg20t: do not print error message in syslog if no ACK received
    i2c: bcm-kona: Introduce Broadcom I2C Driver
    i2c: cbus-gpio: Fix device tree binding
    i2c: wmt: add missing clk_disable_unprepare() on error
    i2c: designware: add new ACPI IDs
    i2c: i801: Add Device IDs for Intel Wildcat Point-LP PCH
    i2c: exynos5: Remove incorrect clk_disable_unprepare
    i2c: i2c-st: Add ST I2C controller
    i2c: exynos5: add High Speed I2C controller driver
    i2c: rcar: fixup rcar type naming
    i2c: scmi: remove some bogus NULL checks
    i2c: sh_mobile & rcar: Enable the driver on all ARM platforms
    i2c: sh_mobile: Convert to clk_prepare/unprepare
    i2c: mux: gpio: use reg value for i2c_add_mux_adapter
    i2c: mux: gpio: use gpio_set_value_cansleep()
    i2c: Include linux/of.h header
    i2c: mxs: Fix PIO mode on i.MX23
    i2c: mxs: Rework the PIO mode operation
    i2c: mxs: distinguish i.MX23 and i.MX28 based I2C controller
    ...

    Linus Torvalds
     

30 Sep, 2013

1 commit

  • This patch moves the at24.h header from include/linux/i2c to
    include/linux/platform_data and updates existing support accordingly.

    It also fixes the following checkpatch warning:

    WARNING: please, no space before tabs
    #436: FILE: include/linux/platform_data/at24.h:31:
    + * ^Iu8 *mac_addr = ethernet_pdata->mac_addr;$

    Signed-off-by: Vivien Didelot
    Signed-off-by: Wolfram Sang

    Vivien Didelot
     

28 Sep, 2013

1 commit

  • Used the generic PHY framework API to create the PHY. For powering on
    and powering off the PHY, power_on and power_off ops are used. Once the
    MUSB OMAP glue is adapted to the new framework, the suspend and resume
    ops of usb phy library will be removed. Also twl4030-usb driver is moved
    to drivers/phy/.

    However using the old usb phy library cannot be completely removed
    because otg is intertwined with phy and moving to the new
    framework completely will break otg. Once we have a separate otg state machine,
    we can get rid of the usb phy library.

    Signed-off-by: Kishon Vijay Abraham I
    Acked-by: Felipe Balbi
    Reviewed-by: Sylwester Nawrocki
    Signed-off-by: Greg Kroah-Hartman

    Kishon Vijay Abraham I
     

07 Sep, 2013

2 commits

  • Pull ARM SoC cleanups from Olof Johansson:
    "This branch contains code cleanups, moves and removals for 3.12.

    There's a large number of various cleanups, and a nice net removal of
    13500 lines of code.

    Highlights worth mentioning are:

    - A series of patches from Stephen Boyd removing the ARM local timer
    API.
    - Move of Qualcomm MSM IOMMU code to drivers/iommu.
    - Samsung PWM driver cleanups from Tomasz Figa, removing legacy PWM
    driver and switching over to the drivers/pwm one.
    - Removal of some unusued auto-generated headers for OMAP2+ (PRM/CM).

    There's also a move of a header file out of include/linux/i2c/ to
    platform_data, where it really belongs. It touches mostly ARM
    platform code for include changes so we took it through our tree"

    * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
    ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK
    gpio: (gpio-pca953x) move header to linux/platform_data/
    arm: zynq: hotplug: Remove unreachable code
    ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
    tegra: simplify use of devm_ioremap_resource
    ARM: SAMSUNG: Remove plat/regs-timer.h header
    ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
    ARM: SAMSUNG: Remove pwm-clock infrastructure
    ARM: SAMSUNG: Remove old PWM timer platform devices
    pwm: Remove superseded pwm-samsung-legacy driver
    ARM: SAMSUNG: Modify board files to use new PWM platform device
    ARM: SAMSUNG: Rework private data handling in dev-backlight
    pwm: Add new pwm-samsung driver
    ARM: mach-mvebu: remove redundant DT parsing and validation
    ARM: msm: Only compile io.c on platforms that use it
    iommu/msm: Move mach includes to iommu directory
    ARM: msm: Remove devices-iommu.c
    ARM: msm: Move mach/board.h contents to common.h
    ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
    ARM: msm: Remove TMR and TMR0 static mappings
    ...

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

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

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

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

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

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

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

    - hidraw oops fix, from Manoj Chourasia

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

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

    Linus Torvalds
     

06 Sep, 2013

1 commit


30 Aug, 2013

1 commit


07 Aug, 2013

1 commit

  • To enter high speed mode, following steps should be done:
    1. When running in high speed mode, i2c clock rate is different
    from standard mode. Clock rate must be set according to
    specification first.
    2. When i2c controller sends a master code and wins arbitration,
    high speed mode is entered.

    If you want to enable high speed mode, the following members of
    platform data should be set to proper value:
    1. "high_mode" should be set to "1".
    2. "master_code" should be set to "8'b 0000_1xxx"(x is 0 or 1).
    If no master_code is set, set to default value 0xe.
    3. "rate" should be set according to specification.

    Signed-off-by: Leilei Shang
    Signed-off-by: Wolfram Sang

    Leilei Shang
     

31 Jul, 2013

1 commit


20 Jun, 2013

1 commit

  • The TWL6025 was never released beyond sample form and was replaced by
    the PhoenixLite range of chips - TWL6032. Change the references to
    reference the TWL6032 class and name the registers to twl6032 in line with
    an actual released chip name to avoid confusion.

    Currently there are no users of TWL6025 in the code.

    Signed-off-by: Graeme Gregory
    Signed-off-by: Oleksandr Kozaruk
    Acked-by: Lee Jones
    Reviwed-by: Mark Brown
    Signed-off-by: Samuel Ortiz

    Graeme Gregory
     

19 Jun, 2013

1 commit


08 Apr, 2013

1 commit

  • Driver twl4030-madc has hardcoded channel types (10 - battery current,
    1 - battery temperature) and also conversation data in variable
    twl4030_divider_ratios. These hardcoded channels are incorrect for
    Nokia RX-51 board (where is channel 0 - battery temperature).

    For Nokia RX-51 there is rx51_battery power_supply driver which reporting
    battery information via twl4030_madc_conversion. But this driver needs
    raw values (not converted via some hardcoded functions). So this patch
    adding new parameter "raw" to struct twl4030_madc_request which tell
    twl4030-madc driver to not convert values, but rather return raw.

    Signed-off-by: Pali Rohár
    Reviewed-by: Anton Vorontsov
    Signed-off-by: Samuel Ortiz

    Pali Rohár
     

09 Mar, 2013

1 commit

  • This same driver can be used by atmel based touchscreens and touchpads
    (buttonpads). Platform data may specify a device is a touchpad
    using the is_tp flag.

    This will cause the driver to perform some touchpad specific
    initializations, such as:
    * register input device name "Atmel maXTouch Touchpad" instead of
    Touchscreen.
    * register BTN_LEFT & BTN_TOOL_* event types.
    * register axis resolution (as a fixed constant, for now)
    * register BUTTONPAD property
    * process GPIO buttons using reportid T19

    Input event GPIO mapping is done by the platform data key_map array.

    key_map[x] should contain the KEY or BTN code to send when processing
    GPIOx from T19. To specify a GPIO as not an input source, populate
    with KEY_RESERVED, or 0.

    Signed-off-by: Daniel Kurtz
    Signed-off-by: Benson Leung
    Signed-off-by: Nick Dyer
    Tested-by: Olof Johansson
    Signed-off-by: Linus Torvalds

    Daniel Kurtz
     

14 Feb, 2013

3 commits


19 Dec, 2012

1 commit

  • 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
     

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
     

14 Dec, 2012

1 commit

  • Pull HID subsystem updates from Jiri Kosina:

    1) Support for HID over I2C bus has been added by Benjamin Tissoires.
    ACPI device discovery is still in the works.

    2) Support for Win8 Multitiouch protocol is being added, most work done
    by Benjamin Tissoires as well

    3) EIO/ERESTARTSYS is fixed in hiddev/hidraw, fixes by Andrew Duggan
    and Jiri Kosina

    4) ION iCade driver added by Bastien Nocera

    5) Support for a couple new Roccat devices has been added by Stefan
    Achatz

    6) HID sensor hubs are now auto-detected instead of having to list all
    the VID/PID combinations in the blacklist array

    7) other random fixes and support for new device IDs

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (65 commits)
    HID: i2c-hid: add mutex protecting open/close race
    Revert "HID: sensors: add to special driver list"
    HID: sensors: autodetect USB HID sensor hubs
    HID: hidp: fallback to input session properly if hid is blacklisted
    HID: i2c-hid: fix ret_count check
    HID: i2c-hid: fix i2c_hid_get_raw_report count mismatches
    HID: i2c-hid: remove extra .irq field in struct i2c_hid
    HID: i2c-hid: reorder allocation/free of buffers
    HID: i2c-hid: fix memory corruption due to missing hid declaration
    HID: i2c-hid: remove superfluous include
    HID: i2c-hid: remove unneeded test in i2c_hid_remove
    HID: i2c-hid: i2c_hid_get_report may fail
    HID: i2c-hid: also call i2c_hid_free_buffers in i2c_hid_remove
    HID: i2c-hid: fix error messages
    HID: i2c-hid: fix return paths
    HID: i2c-hid: remove unused static declarations
    HID: i2c-hid: fix i2c_hid_dbg macro
    HID: i2c-hid: fix checkpatch.pl warning
    HID: i2c-hid: enhance Kconfig
    HID: i2c-hid: change I2C name
    ...

    Linus Torvalds
     

07 Dec, 2012

1 commit

  • 6e20a0a429bd4dc07d6de16d9c247270e04e4aa0
    (gpio: pcf857x: enable gpio_to_irq() support)
    added gpio_to_irq() support on pcf857x driver,
    but it used pdata->irq.
    This patch modifies driver to use client->irq instead of it.
    It modifies kzm9g board platform settings,
    and device probe information too.
    This patch is tested on kzm9g board

    Reported-by: Christian Engelmayer
    Acked-by: Simon Horman
    Signed-off-by: Kuninori Morimoto
    Signed-off-by: Linus Walleij

    Kuninori Morimoto
     

21 Nov, 2012

3 commits


19 Nov, 2012

1 commit

  • Microsoft published the protocol specification of HID over i2c:
    http://msdn.microsoft.com/en-us/library/windows/hardware/hh852380.aspx

    This patch introduces an implementation of this protocol.

    This implementation does not includes the ACPI part of the specification.
    This will come when ACPI 5.0 devices enumeration will be available.

    Once the ACPI part is done, OEM will not have to declare HID over I2C
    devices in their platform specific driver.

    Signed-off-by: Benjamin Tissoires
    Signed-off-by: Jiri Kosina

    Benjamin Tissoires
     

16 Nov, 2012

1 commit

  • On newer SH-/R-Mobile SoCs, a clock supply to the I2C hardware block,
    which is used to generate the SCL clock output, is getting faster than
    before, while on the other hand, the SCL clock control registers, ICCH
    and ICCL, stay unchanged in 9-bit-wide (8+1).

    On such silicons, the internal SCL clock counter gets incremented every
    2 clocks of the operating clock.

    This patch makes it configurable through platform data.

    Signed-off-by: Shinya Kuribayashi
    Signed-off-by: Wolfram Sang

    Shinya Kuribayashi
     

11 Oct, 2012

1 commit

  • Pull i2c-embedded changes from Wolfram Sang:
    "The changes for i2c-embedded include:

    - massive rework of the omap driver
    - massive rework of the at91 driver. In fact, the old driver gets
    removed; I am okay with this approach since the old driver was
    depending on BROKEN and its limitations made it practically
    unusable, so people used bitbanging instead. But even if there are
    users, there is no platform_data or module parameter which would
    need to be converted. It is just another driver doing I2C
    transfers, just way better. Modifications of arch/arm/at91 related
    files have proper acks from the maintainer.
    - new driver for R-Car I2C
    - devicetree and generic_clock conversions and fixes
    - usual driver fixes and changes.

    The rework patches have come a long way and lots of people have been
    involved in creating/testing them. Most patches have been in
    linux-next at least since 3.6-rc5. A few have been added in the last
    week, I have to admit.

    An unexpected (but welcome :)) peak in private life is the cause for
    that. The "late" patches shouldn't cause any merge conflicts and I
    will have a special eye on them during the stabilization phase. This
    is an exception and I want to have the patches in place properly in
    time again for the next kernels."

    * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (44 commits)
    MXS: Implement DMA support into mxs-i2c
    i2c: add Renesas R-Car I2C driver
    i2c: s3c2410: use clk_prepare_enable and clk_disable_unprepare
    ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints
    i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
    i2c: algo: pca: Fix chip reset function for PCA9665
    i2c: mpc: Wait for STOP to hit the bus
    i2c: davinci: preparation for switch to common clock framework
    omap-i2c: fix incorrect log message when using a device tree
    i2c: omap: sanitize exit path
    i2c: omap: switch over to autosuspend API
    i2c: omap: remove unnecessary pm_runtime_suspended check
    i2c: omap: switch to threaded IRQ support
    i2c: omap: remove redundant status read
    i2c: omap: get rid of the "complete" label
    i2c: omap: resize fifos before each message
    i2c: omap: simplify IRQ exit path
    i2c: omap: always return IRQ_HANDLED
    i2c: omap: simplify errata check
    i2c: omap: bus: add a receiver flag
    ...

    Linus Torvalds
     

09 Oct, 2012

1 commit

  • Pull sound updates from Takashi Iwai:
    "This contains pretty many small commits covering fairly large range of
    files in sound/ directory. Partly because of additional API support
    and partly because of constantly developed ASoC and ARM stuff.

    Some highlights:

    - Introduced the helper function and documentation for exposing the
    channel map via control API, as discussed in Plumbers; most of PCI
    drivers are covered, will follow more drivers later

    - Most of drivers have been replaced with the new PM callbacks (if
    the bus is supported)

    - HD-audio controller got the support of runtime PM and the support
    of D3 clock-stop. Also changing the power_save option in sysfs
    kicks off immediately to enable / disable the power-save mode.

    - Another significant code change in HD-audio is the rewrite of
    firmware loading code. Other than that, most of changes in
    HD-audio are continued cleanups and standardization for the generic
    auto parser and bug fixes (HBR, device-specific fixups), in
    addition to the support of channel-map API.

    - Addition of ASoC bindings for the compressed API, used by the
    mid-x86 drivers.

    - Lots of cleanups and API refreshes for ASoC codec drivers and
    DaVinci.

    - Conversion of OMAP to dmaengine.

    - New machine driver for Wolfson Microelectronics Bells.

    - New CODEC driver for Wolfson Microelectronics WM0010.

    - Enhancements to the ux500 and wm2000 drivers

    - A new driver for DA9055 and the support for regulator bypass mode."

    Fix up various arm soc header file reorg conflicts.

    * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
    ALSA: hda - Add new codec ALC283 ALC290 support
    ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
    ALSA: hda - fix indices on boost volume on Conexant
    ALSA: aloop - add locking to timer access
    ALSA: hda - Fix hang caused by race during suspend.
    sound: Remove unnecessary semicolon
    ALSA: hda/realtek - Fix detection of ALC271X codec
    ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
    ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
    ALSA: hda - make a generic unsol event handler
    ASoC: codecs: Add DA9055 codec driver
    ASoC: eukrea-tlv320: Convert it to platform driver
    ALSA: ASoC: add DT bindings for CS4271
    ASoC: wm_hubs: Ensure volume updates are handled during class W startup
    ASoC: wm5110: Adding missing volume update bits
    ASoC: wm5110: Add OUT3R support
    ASoC: wm5110: Add AEC loopback support
    ASoC: wm5110: Rename EPOUT to HPOUT3
    ASoC: arizona: Add more clock rates
    ASoC: arizona: Add more DSP options for mixer input muxes
    ...

    Linus Torvalds
     

08 Oct, 2012

1 commit

  • R-Car I2C is similar with SH7760 I2C.
    But the SH7760 I2C driver had many workaround operations, since H/W had bugs.
    Thus, it was pointless to keep compatible between SH7760 and R-Car I2C drivers.
    This patch creates new Renesas R-Car I2C driver.

    Signed-off-by: Kuninori Morimoto
    Signed-off-by: Wolfram Sang

    Kuninori Morimoto
     

06 Oct, 2012

1 commit

  • Let I2C bus segments behind multiplexers have a class. This allows for
    device auto-detection on these segments. As long as parent segments
    don't share the same class, it should be fine.

    I implemented support in drivers i2c-mux-gpio and i2c-mux-pca954x. I
    left i2c-mux-pca9541 and i2c-mux-pinctrl alone for the moment as I
    don't know if this feature makes sense for the use cases of these
    drivers.

    Signed-off-by: Jean Delvare
    Cc: Peter Korsgaard
    Cc: David Daney
    Cc: Michael Lawnick
    Cc: Rodolfo Giometti

    Jean Delvare
     

05 Oct, 2012

1 commit

  • Pull MFD changes from Samuel Ortiz:
    "MFD bits for the 3.7 merge window.

    As usual we have a few new drivers:

    - TI LP8788
    - TI OMAP USB TLL
    - Maxim MAX8907
    - SMSC ECE1099
    - Dialog Semiconductor DA9055
    - A simpler syscon driver that allow us to get rid of the anatop one.

    Drivers are also gradually getting Device Tree and IRQ domain support.

    The following drivers got DT support:
    - palmas, 88pm860x, tc3589x and twl4030-audio

    And those ones now use the IRQ domain APIs:
    - 88pm860x, tc3589x, db8500_prcmu

    Also some other interesting changes:
    - Intel's ICH LPC now supports Lynx Point
    - TI's twl4030-audio added a GPO child
    - tps6527 enabled its backlight subdevice
    - The twl6030 pwm driver moved to the new PWM subsystem

    And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x,
    palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family."

    Fix up various annoying conflicts: the DT and IRQ domain support came in
    twice and was already in 3.6. And then it was apparently rebased.

    Guys, DON'T REBASE!

    * tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits)
    ARM: dts: Enable 88pm860x pmic
    mfd: 88pm860x: Move gpadc init into touch
    mfd: 88pm860x: Device tree support
    mfd: 88pm860x: Use irqdomain
    mfd: smsc: Add support for smsc gpio io/keypad driver
    backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe
    mfd: DA9055 core driver
    mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list
    mfd: wm5110: Add register patches for revision B
    mfd: wm5110: Disable control interface error report for WM5110 rev B
    mfd: max8907: Remove regulator-compatible from DT docs
    backlight: Add TPS65217 WLED driver
    mfd: Add backlight as subdevice to the tps65217
    mfd: Provide the PRCMU with its own IRQ domain
    mfd: Fix max8907 sparse warning
    mfd: Add lp8788 mfd driver
    mfd: dbx500: Provide a more accurate smp_twd clock
    mfd: rc5t583: Fix warning messages
    regulator: palmas: Add DT support
    mfd: palmas: Change regulator defns to better suite DT
    ...

    Linus Torvalds
     

03 Oct, 2012

1 commit

  • Pull GPIO changes from Linus Walleij:
    "So this is the LW GPIO patch stack for v3.7:
    - refactoring from Thierry Redding at Arnd Bergmann's request to use
    the seq_file iterator interface in gpiolib.
    - A new driver for Avionic Design's N-bit GPIO expander.
    - Two instances of mutexes replaced by spinlocks from Axel Lin to
    code that is supposed to be fastpath compliant.
    - IRQ demuxer and gpio_to_irq() support for pcf857x by Kuninori
    Morimoto.
    - Dynamic GPIO numbers, device tree support, daisy chaining and some
    other fixes for the 74x164 driver by Maxime Ripard.
    - IRQ domain and device tree support for the tc3589x driver by Lee
    Jones.
    - Some conversion to use managed resources devm_* code.
    - Some instances of clk_prepare() or clk_prepare_enable() added to
    support the new, stricter common clock framework.
    - Some for_each_set_bit() simplifications.
    - Then a lot of fixes as we fixed up all of the above tripping over
    our own shoelaces and that kind of thing."

    * tag 'gpio-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (34 commits)
    gpio: pcf857x: select IRQ_DOMAIN
    gpio: Document device_node's det_debounce
    gpio-lpc32xx: Add GPI_28
    gpio: adnp: dt: Reference generic interrupt binding
    gpio: Add Avionic Design N-bit GPIO expander support
    gpio: pxa: using for_each_set_bit to simplify the code
    gpio_msm: using for_each_set_bit to simplify the code
    gpio: Enable the tc3298x GPIO expander driver for Device Tree
    gpio: Provide the tc3589x GPIO expander driver with an IRQ domain
    ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
    gpio: pcf857x: fixup smatch WARNING
    gpio: 74x164: Add support for the daisy-chaining
    gpio: 74x164: dts: Add documentation for the dt binding
    dt: Fix incorrect reference in gpio-led documentation
    gpio: 74x164: Add device tree support
    gpio: 74x164: Use dynamic gpio number assignment if no pdata is present
    gpio: 74x164: Use devm_kzalloc
    gpio: 74x164: Use module_spi_driver boiler plate function
    gpio: sx150x: Use irq_data_get_irq_chip_data() at appropriate places
    gpio: em: Use irq_data_get_irq_chip_data() at appropriate places
    ...

    Linus Torvalds
     

22 Sep, 2012

3 commits

  • We no longer have users for the set_hs_extmute callback which has been
    replaced by hs_extmute_gpio so the codec driver can handle the external
    mute if it is needed by the board.

    Signed-off-by: Peter Ujfalusi
    Acked-by: Samuel Ortiz
    Signed-off-by: Mark Brown

    Peter Ujfalusi
     
  • The external mute (if it is in use) is handled by a GPIO line. Prepare to
    remove the set_hs_extmute callback and replace it with:
    hs_extmute_gpio: the GPIO number to use for external mute

    When the users of set_hs_extmute has been converted the callback can be removed.

    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Mark Brown

    Peter Ujfalusi
     
  • CFG_BOOT register's HFCLK_FREQ field hold information about the used HFCLK
    frequency.
    Add possibility for users to get the configured rate based on this
    register.
    This register was configured during boot, without it the chip would not
    operate correctly, so we can trust on this information.

    Signed-off-by: Peter Ujfalusi
    Acked-by: Samuel Ortiz
    Signed-off-by: Mark Brown

    Peter Ujfalusi
     

18 Sep, 2012

1 commit

  • CFG_BOOT register's HFCLK_FREQ field hold information about the used HFCLK
    frequency.
    Add possibility for users to get the configured rate based on this
    register.
    This register was configured during boot, without it the chip would not
    operate correctly, so we can trust on this information.

    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Samuel Ortiz

    Peter Ujfalusi
     

13 Sep, 2012

1 commit


24 Aug, 2012

1 commit


01 Aug, 2012

1 commit

  • Pull battery updates from Anton Vorontsov:
    "The tag contains just a few battery-related changes for v3.6. It's is
    all pretty straightforward, except one thing.

    One of our patches added thermal support for power supply class, but
    thermal/ subsystem changed under our feet. We (well, Stephen, that
    is) caught the issue and it was decided[1] that I'd just delay the
    battery pull request, and then will fix it up by merging upstream back
    into battery tree at the specific commit.

    That's not all though: another[2] small fixup for thermal subsystem
    was needed to get rid of a warning in power supply subsystem (the
    warning was not drivers/power's "fault", the thermal registration
    function just needed a proper const annotation, which is also done by
    a small commit on top of the merge.

    So, to sum this up:
    - The 'master' branch of the battery tree was in the -next tree for
    weeks, was never rebased, altered etc. It should be all OK;
    - Although, for-v3.6 tag contains the 'master' branch + merge + the
    warning fix.

    [1] http://lkml.org/lkml/2012/6/19/23
    [2] http://lkml.org/lkml/2012/6/18/28"

    * tag 'for-v3.6' of git://git.infradead.org/battery-2.6: (23 commits)
    thermal: Constify 'type' argument for the registration routine
    olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries
    olpc-battery: Add VOLTAGE_MAX_DESIGN property
    charger-manager: Fix build break related to EXTCON
    lp8727_charger: Move header file into platform_data directory
    power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT
    bq27x00_battery: Add support for BQ27425 chip
    charger-manager: Set current limit of regulator for over current protection
    charger-manager: Use EXTCON Subsystem to detect charger cables for charging
    test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties
    test_power: Add support for USB AC source
    gpio-charger: Use cansleep version of gpio_set_value
    bq27x00_battery: Add support for power average and health properties
    sbs-battery: Don't trigger false supply_changed event
    twl4030_charger: Allow charger to control the regulator that feeds it
    twl4030_charger: Add backup-battery charging
    twl4030_charger: Fix some typos
    max17042_battery: Support CHARGE_COUNTER power supply attribute
    smb347-charger: Add constant charge and current properties
    power_supply: Add constant charge_current and charge_voltage properties
    ...

    Linus Torvalds
     

27 Jul, 2012

2 commits

  • Pull GPIO changes from Linus Walleij:
    - New driver for AMD-8111 southbridge GPIOs
    - New driver for Wolfson Micro Arizona devices
    - Propagate device tree parse errors
    - Probe deferral finalizations - all expected calls to GPIO will now
    hopefully request deferral where apropriate
    - Misc updates to TCA6424, WM8994, LPC32xx, PCF857x, Samsung MXC, OMAP
    and PCA953X drivers.

    Fix up gpio_idx conflicts in drivers/gpio/gpio-mxc.c

    * tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
    gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available
    gpiolib: Defer failed gpio requests by default
    MAINTAINERS: add entry OMAP GPIO driver
    gpio/pca953x: increase variables size to support 24 bit of data
    GPIO: PCA953X: Increase size of invert variable to support 24 bit
    gpio/omap: move bank->dbck initialization to omap_gpio_mod_init()
    gpio/mxc: use the edge_sel feature if available
    gpio: propagate of_parse_phandle_with_args errors
    gpio: samsung: add flags specifier to device-tree binding
    gpiolib: Add support for Wolfson Microelectronics Arizona class devices
    gpio: gpio-lpc32xx: Add gpio_to_irq mapping
    gpio: pcf857x: share 8/16 bit access functions
    gpio: LPC32xx: Driver cleanup
    MAINTAINERS: Add Wolfson gpiolib drivers to the Wolfson entry
    gpiolib: wm8994: Convert to devm_kzalloc()
    gpiolib: wm8994: Use irq_domain mappings for gpios
    gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips
    gpio/tca6424: merge I2C transactions, remove cast
    gpio/of: fix a typo of comment message

    Linus Torvalds
     
  • Pull input layer updates from Dmitry Torokhov:
    "First set of updates for the input subsystem. You will get a new
    touchscreen driver (Melfas mms114), a new keypad driver for LPC32xx
    SoC, large update to Atmel mXT touchscreen driver, a lot of drivers
    acquired device tree support and a slew of other fixes."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
    Input: add MELFAS mms114 touchscreen driver
    Input: add support for key scan interface of the LPC32xx SoC
    Input: omap4-keypad - add device tree support
    Input: hanwang - add support for Art Master II tablet
    Input: spear_keyboard - reconfigure operating frequency on suspend
    Input: spear_keyboard - fix clock handling during suspend/resume
    Input: ff-memless - fix a couple min_t() casts
    Input: synaptics - print firmware ID and board number at init
    Input: spear_keyboard - generalize keyboard frequency configuration
    Input: spear_keyboard - rename bit definitions to reflect register
    Input: spear_keyboard - use correct io accessors
    Input: spear-keyboard - fix disable device_init_wakeup in remove
    Input: wacom_i2c - fix compiler warning
    Input: imx_keypad - check error returned by clk_prepare_enable()
    Input: imx_keypad - adapt the new kpp clock name
    Input: imx_keypad - use clk_prepare_enable/clk_disable_unprepare()
    Input: ad7879 - add option to correct xy axis
    Input: synaptics_usb - Remove TrackPoint name trailing whitespace
    Revert "Input: atmel_mxt_ts - warn if sysfs could not be created"
    Input: MT - Include win8 support
    ...

    Linus Torvalds