24 Mar, 2012

1 commit

  • Pull i2c embedded updates from Wolfram Sang:
    "Nothing special from i2c-embedded for this merge window. Two new
    drivers, minor feature additions, bugfixes, cleanups.

    All patches have been in linux-next for some time, too."

    * 'i2c-embedded/for-3.4' of git://git.pengutronix.de/git/wsa/linux:
    i2c-eg20t: Remove write-only variables
    i2c-eg20t: Rework pch_i2c_wait_for_bus_idle to reduce wait time
    i2c-s3c2410: Add stub runtime power management
    i2c-s3c2410: Convert to devm_kzalloc()
    i2c: add CSR SiRFprimaII on-chip I2C controllers driver
    i2c: tegra: Remove unnecessary write to INT_STATUS
    i2c: imx: fix imx driver to work though signal is pending
    i2c: designware: dw_i2c_init_driver as subsys initcall
    misc: at24: describe platform_data with kernel_doc
    i2c: Move I2C_EG20T option to the right place.
    i2c: Support for Netlogic XLR/XLS I2C controller.
    i2c: mpc: Add support for SMBUS_READ_BLOCK_DATA
    i2c: versatile: Add Device Tree support

    Linus Torvalds
     

23 Mar, 2012

1 commit

  • Pull drm main changes from Dave Airlie:
    "This is the main drm pull request, I'm probably going to send two more
    smaller ones, will explain below.

    This contains a patch that is also in the fbdev tree, but it should be
    the same patch, it added an API for hot unplugging framebuffer
    devices, and I need that API for a new driver.

    It also contains some changes to the i2c tree which Jean has acked,
    and one change to moorestown platform stuff in x86.

    Highlights:
    - new drivers: UDL driver for USB displaylink devices, kms only,
    should support correct hotplug operations.
    - core: i2c speedups + better hotplug support, EDID overriding via
    firmware interface - allows user to load a firmware for a broken
    monitor/kvm from userspace, it even has documentation for it.
    - exynos: new HDMI audio + hdmi 1.4 + virtual output driver
    - gma500: code cleanup
    - radeon: cleanups, CS optimisations, streamout support and pageflip
    fix
    - nouveau: NVD9 displayport support + more reclocking work
    - i915: re-enabling GMBUS, finish gpu patch (might help hibernation
    who knows), missed irq fixes, stencil tiling fixes, interlaced
    support, aliasesd PPGTT support for SNB/IVB, swizzling for SNB/IVB,
    semaphore fixes

    As well as the usual bunch of cleanups and fixes all over the place.

    I've got two things I'd like to merge a bit later:

    a) AMD support for all their new radeonhd 7000 series GPU and APUs.
    AMD dropped this a bit late due to insane internal review
    processes, (please AMD just follow Intel and let open source guys
    ship stuff early) however I don't want to penalise people who own
    this hardware (since its been on sale for 3-4 months and GPU hw
    doesn't exactly have a lifetime in years) and consign them to
    using closed drivers for longer than necessary. The changes are
    well contained and just plug into the driver new gpu functionality
    so they should be fairly regression proof. I just want to give
    them a bit of a run on the hw AMD kindly sent me.

    b) drm prime/dma-buf interface code. This is just infrastructure
    code to expose the dma-buf stuff to drm drivers and to userspace.
    I'm not planning on pushing any driver support in this cycle
    (except maybe exynos), but I'd like to get the infrastructure code
    in so for the next cycle I can start getting the driver support
    into the individual drivers. We have started driver support for
    i915, nouveau and udl along with I think exynos and omap in
    staging. However this code relies on the dma-buf tree being
    pulled into your tree first since it needs the latest interfaces
    from that tree. I'll push to get that tree sent asap.

    (oh and any warnings you see in i915 are gcc's fault from what anyone
    can see)."

    Fix up trivial conflicts in arch/x86/platform/mrst/mrst.c due to the new
    msic_thermal_platform_data() thermal function being added next to the
    tc35876x_platform_data() i2c device function..

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (326 commits)
    drm/i915: use DDC_ADDR instead of hard-coding it
    drm/radeon: use DDC_ADDR instead of hard-coding it
    drm: remove unneeded redefinition of DDC_ADDR
    drm/exynos: added virtual display driver.
    drm: allow loading an EDID as firmware to override broken monitor
    drm/exynos: enable hdmi audio feature
    drm/exynos: add default pixel format for plane
    drm/exynos: cleanup exynos_hdmi.h
    drm/exynos: add is_local member in exynos_drm_subdrv struct
    drm/exynos: add subdrv open/close functions
    drm/exynos: remove module of exynos drm subdrv
    drm/exynos: release pending pageflip events when closed
    drm/exynos: added new funtion to get/put dma address.
    drm/exynos: update gem and buffer framework.
    drm/exynos: added mode_fixup feature and code clean.
    drm/exynos: add HDMI version 1.4 support
    drm/exynos: remove exynos_mixer.h
    gma500: Fix mmap frambuffer
    drm/radeon: Drop radeon_gem_object_(un)pin.
    drm/radeon: Restrict offset for legacy display engine.
    ...

    Linus Torvalds
     

12 Mar, 2012

3 commits

  • To be able to attach consumers to these supplies from board
    files we need to have regulator_init_data for them.

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

    Peter Ujfalusi
     
  • vdd1 and vdd2 are now common regulators for twl4030 and twl6030. Also
    added vdd3 as a new regulator for twl6030. twl6030 vdd1...vdd3 smps
    regulator voltages can only be controlled through the smartreflex
    voltage channel, thus the support for the voltage_get and set is
    minimal and requires external controller.

    Signed-off-by: Tero Kristo
    Signed-off-by: Rajendra Nayak
    Acked-by: Samuel Ortiz
    Signed-off-by: Mark Brown

    Tero Kristo
     
  • This is needed for SMPS regulators, which use the OMAP voltage
    processor for voltage get/set functions instead of the normal I2C
    channel. For this purpose, regulator_init_data->driver_data contents
    are expanded, it is now a struct which contains function pointers
    for the set/get voltage operations, a data pointer for these, and
    the previously used features bitmask.

    Signed-off-by: Tero Kristo
    Acked-by: Samuel Ortiz [for the MFD part]
    Signed-off-by: Mark Brown

    Tero Kristo
     

10 Mar, 2012

1 commit

  • We need to merge this ahead of some of the cleanup because a lot of needed
    cleanup spans both new and old chips. If we try and clean up and the merge
    we end up fighting ourselves.

    Signed-off-by: Kirill A. Shutemov
    [With a load of the cleanup stuff folded in, register stuff reworked sanely]
    Signed-off-by: Alan Cox
    Signed-off-by: Dave Airlie

    Kirill A. Shutemov
     

25 Feb, 2012

1 commit


09 Jan, 2012

1 commit

  • TWL family of PMICs, used in master mode, have a power off
    functionality. The resulting power off sequence shuts down all the SoC
    supplies, LDOs, etc. The sequence is described in the datasheets
    chapter "Power-Off Sequence".
    Note, that board must be wired correctly for the power off to work as
    expected.

    Signed-off-by: Igor Grinberg
    Signed-off-by: Samuel Ortiz

    Igor Grinberg
     

04 Nov, 2011

1 commit

  • * 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
    mfd: Fix missing abx500 header file updates
    mfd: Add missing include to intel_msic
    x86, mrst: add platform support for MSIC MFD driver
    mfd: Expose TurnOnStatus in ab8500 sysfs
    mfd: Remove support for early drop ab8500 chip
    mfd: Add support for ab8500 v3.3
    mfd: Add ab8500 interrupt disable hook
    mfd: Convert db8500-prcmu panic() into pr_crit()
    mfd: Refactor db8500-prcmu request_clock() function
    mfd: Rename db8500-prcmu init function
    mfd: Fix db5500-prcmu defines
    mfd: db8500-prcmu voltage domain consumers additions
    mfd: db8500-prcmu reset code retrieval
    mfd: db8500-prcmu tweak for modem wakeup
    mfd: Add db8500-pcmu watchdog accessor functions for watchdog
    mfd: hwacc power state db8500-prcmu accessor
    mfd: Add db8500-prcmu accessors for PLL and SGA clock
    mfd: Move to the new db500 PRCMU API
    mfd: Create a common interface for dbx500 PRCMU drivers
    mfd: Initialize DB8500 PRCMU regs
    ...

    Fix up trivial conflicts in
    arch/arm/mach-imx/mach-mx31moboard.c
    arch/arm/mach-omap2/board-omap3beagle.c
    arch/arm/mach-u300/include/mach/irqs.h
    drivers/mfd/wm831x-spi.c

    Linus Torvalds
     

24 Oct, 2011

1 commit

  • Without turning the MADC clock on, no MADC conversions occur.

    $ cat /sys/class/hwmon/hwmon0/device/in8_input
    [ 53.428436] twl4030_madc twl4030_madc: conversion timeout!
    cat: read error: Resource temporarily unavailable

    Signed-off-by: Kyle Manna
    Signed-off-by: Samuel Ortiz

    Kyle Manna
     

12 Oct, 2011

1 commit


18 Jul, 2011

1 commit


05 Jul, 2011

3 commits

  • Enable ramp down/up step to be configured based on
    platform.

    Signed-off-by: Axel Castaneda Gonzalez
    Signed-off-by: Misael Lopez Cruz
    Signed-off-by: Peter Ujfalusi
    Acked-by: Mark Brown

    Axel Castaneda Gonzalez
     
  • Add twl6040_vibra as a child of MFD device twl6040_codec. This
    implementation covers the PCM-to-PWM mode of TWL6040 vibrator
    module.

    Signed-off-by: Misael Lopez Cruz
    Signed-off-by: Peter Ujfalusi
    CC: Tejun Heo
    Acked-by: Dmitry Torokhov

    Misael Lopez Cruz
     
  • TWL6040 IC provides analog high-end audio codec functions for
    handset applications. It contains several audio analog inputs
    and outputs as well as vibrator support. It's connected to the
    host processor via PDM interface for audio data communication.
    The audio modules are controlled by internal registers that
    can be accessed by I2C and PDM interface.

    TWL6040 MFD will be registered as a child of TWL-CORE, and will
    have two children of its own: twl6040-codec and twl6040-vibra.

    This driver is based on TWL4030 and WM8350 MFD drivers.

    Signed-off-by: Misael Lopez Cruz
    Signed-off-by: Peter Ujfalusi
    Acked-by: Samuel Ortiz

    Misael Lopez Cruz
     

04 Jul, 2011

1 commit

  • Allign the platform data names for twl4030 audio submodule:
    twl4030_audio_data: for the core MFD driver
    twl4030_codec_data: for ASoC codec driver
    twl4030_vibra_data: for the input/ForceFeedback driver

    To avoid breakage, change all depending drivers, files
    to use the new types.

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

    Peter Ujfalusi
     

16 Jun, 2011

1 commit


27 May, 2011

4 commits


25 May, 2011

1 commit

  • * 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux: (21 commits)
    mach-ux500: set proper I2C platform data from MOP500s
    i2c-nomadik: break out single messsage transmission
    i2c-nomadik: reset the hw after status check
    i2c-nomadik: remove the unnecessary delay
    i2c-nomadik: change the TX and RX threshold
    i2c-nomadik: add code to retry on timeout failure
    i2c-nomadik: use pm_runtime API
    i2c-nomadik: print abort cause only on abort tag
    i2c-nomadik: correct adapter timeout initialization
    i2c-nomadik: remove the redundant error message
    i2c-nomadik: corrrect returned error numbers
    i2c-nomadik: fix speed enumerator
    i2c-nomadik: make i2c timeout specific per i2c bus
    i2c-nomadik: add regulator support
    i2c: i2c-sh_mobile bus speed platform data V2
    i2c: i2c-sh_mobile clock string removal
    i2c-eg20t: Support new device ML7223 IOH
    i2c: tegra: Add de-bounce cycles.
    i2c: tegra: fix repeated start handling
    i2c: tegra: recover from spurious interrupt storm
    ...

    Linus Torvalds
     

18 May, 2011

4 commits

  • These new platform-specific values can be used to set the fuzz parameter
    passed to the input_set_abs_params() function for the ABS_X, ABS_Y and
    ABS_PRESSURE axes.

    Signed-off-by: Thierry Reding
    Signed-off-by: Dmitry Torokhov

    Thierry Reding
     
  • This new parameter allows the polling frequency to be configured while
    keeping the default of once every millisecond.

    Signed-off-by: Thierry Reding
    Signed-off-by: Dmitry Torokhov

    Thierry Reding
     
  • Depending on the quality of the touch panel, the time for the X-, X+, Y-
    and Y+ inputs to settle may vary. The poll_delay parameter can be used
    to override the default of 1 millisecond.

    Cc: Dmitry Torokhov
    Cc: Kwangwoo Lee
    Signed-off-by: Thierry Reding
    Signed-off-by: Dmitry Torokhov

    Thierry Reding
     
  • Finger touch events or very quick stylus events on low-quality panels
    can cause the tsc2007 to read bogus values. Looking at oscilloscope
    snapshots, this seems to be caused by the touch event disappearing
    during the measurements. These bogus values result in misclicks, where
    the X and Y values deviate from the real position.

    Most of these misclicks can be filtered out by setting a low enough
    threshold for the maximum resistance (which is loosely the inverse of
    the pressure) allowed to consider a set of values valid. Since this
    behaviour is largely dependent on the type and quality of the panel,
    this commit introduces the max_rt parameter. The default value is kept
    at MAX_12BIT.

    Signed-off-by: Thierry Reding
    Signed-off-by: Dmitry Torokhov

    Thierry Reding
     

12 May, 2011

1 commit

  • This patch adds basic support for Freescale MPR121 capacitive touch
    sensor. It's an i2c controller with up to 12 capacitance sensing inputs.

    Product information (data sheet, application notes) can be found here:
    http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=MPR121

    Signed-off-by: Zhang Jiejing
    Signed-off-by: Dmitry Torokhov

    Zhang Jiejing
     

11 May, 2011

1 commit


23 Mar, 2011

3 commits

  • Introducing a driver for MADC on TWL4030 powerIC. MADC stands for monitoring
    ADC. This driver monitors the real time conversion of analog signals like
    battery temperature, battery cuurent etc.

    Signed-off-by: Keerthy
    Signed-off-by: Samuel Ortiz

    Keerthy
     
  • In OMAP4 Blaze and Panda, 32KHz clock to WLAN is supplied from Phoenix
    TWL6030. The 32KHz clock state (ON/OFF) is configured in
    CLK32KG_CFG_[GRP, TRANS, STATE] register. This follows the same register
    programming model as other regulators in TWL6030. So add CLK32KG as pseudo
    regulator.

    Signed-off-by: Balaji T K
    Acked-by: Mark Brown
    Signed-off-by: Samuel Ortiz

    Balaji T K
     
  • * 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux:
    i2c-pxa2xx: Don't clear isr bits too early
    i2c-pxa2xx: Fix register offsets
    i2c-pxa2xx: pass of_node from platform driver to adapter and publish
    i2c-pxa2xx: check timeout correctly
    i2c-pxa2xx: add support for shared IRQ handler
    i2c-pxa2xx: Add PCI support for PXA I2C controller
    ARM: pxa2xx: reorganize I2C files
    i2c-pxa2xx: use dynamic register layout
    i2c-mxs: set controller to pio queue mode after reset
    i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH
    i2c/busses: Add support for Diolan U2C-12 USB-I2C adapter

    Linus Torvalds
     

22 Mar, 2011

2 commits


21 Mar, 2011

1 commit

  • This patch moves the platform data definition from
    arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so
    it can be accessed from x86 the same way as on ARM.

    This change should make no functional change to the PXA code. The move
    is verified by building the following defconfigs:
    cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
    imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
    raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig
    pxa910_defconfig

    Signed-off-by: Sebastian Andrzej Siewior
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Ben Dooks

    Sebastian Andrzej Siewior
     

20 Mar, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
    Input: tsc2005 - remove 'disable' sysfs attribute
    Input: tsc2005 - add open/close
    Input: tsc2005 - handle read errors from SPI layer
    Input: tsc2005 - do not rearm timer in hardirq handler
    Input: tsc2005 - don't use work for 'pen up' handling
    Input: tsc2005 - do not use 0 in place of NULL
    Input: tsc2005 - use true/false for boolean variables
    Input: tsc2005 - hide selftest attribute if we can't reset
    Input: tsc2005 - rework driver initialization code
    Input: tsc2005 - set up bus type in input device
    Input: tsc2005 - set up parent device
    Input: tsc2005 - clear driver data after unbinding
    Input: tsc2005 - add module description
    Input: tsc2005 - remove driver banner message
    Input: tsc2005 - remove incorrect module alias
    Input: tsc2005 - convert to using dev_pm_ops
    Input: tsc2005 - use spi_get/set_drvdata()
    Input: introduce tsc2005 driver
    Input: xen-kbdfront - move to drivers/input/misc
    Input: xen-kbdfront - add grant reference for shared page
    ...

    Linus Torvalds
     

18 Mar, 2011

2 commits

  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
    omap: zoom: host should not pull up wl1271's irq line
    arm: plat-omap: iommu: fix request_mem_region() error path
    OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
    omap4: mux: Remove duplicate mux modes
    omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
    omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
    omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
    omap4: board-omap4panda: Initialise the serial pads
    omap3: board-3430sdp: Initialise the serial pads
    omap4: board-4430sdp: Initialise the serial pads
    omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
    omap2+: mux: Remove the use of IDLE flag
    omap2+: Add separate list for dynamic pads to mux
    perf: add OMAP support for the new power events
    OMAP4: Add IVA OPP enteries.
    OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
    OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
    OMAP3+: OPP: Replace voltage values with Macros
    OMAP3: wdtimer: Fix CORE idle transition
    Watchdog: omap_wdt: add fine grain runtime-pm
    ...

    Fix up various conflicts in
    - arch/arm/mach-omap2/board-omap3evm.c
    - arch/arm/mach-omap2/clock3xxx_data.c
    - arch/arm/mach-omap2/usb-musb.c
    - arch/arm/plat-omap/include/plat/usb.h
    - drivers/usb/musb/musb_core.h

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
    hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes
    hwmon/f71882fg: Add support for f71808e
    hwmon/f71882fg: Add support for f71869f and f71869e
    hwmon/f71882fg: Add support for f71889ed
    hwmon/f71882fg: Break out test for auto pwm's controlled by digital readings
    hwmon/f71882fg: Separate temp beep sysfs attr from the other temp sysfs attr
    hwmon/f71882fg: Remove bogus temp2_type for certain models
    hwmon/f71882fg: Make number of temps configurable
    hwmon/f71882fg: Make creation of in sysfs attributes more generic
    hwmon/f71882fg: Only allow negative auto point temps if fan_neg_temp is enabled
    hwmon/f71882fg: Fix temp1 sensor type reporting
    hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F
    hwmon: (w83627ehf) Add fan debounce support for NCT6775F and NCT6776F
    hwmon: (w83627ehf) Update Kconfig for W83677HG-B, NCT6775F and NCT6776F
    hwmon: (w83627ehf) Store rpm instead of raw fan speed data
    hwmon: (w83627ehf) Use 16 bit fan count registers if supported
    hwmon: (w83627ehf) Add support for Nuvoton NCT6775F and NCT6776F
    hwmon: (w83627ehf) Permit enabling SmartFan IV mode if configured at startup
    hwmon: (w83627ehf) Convert register arrays to 16 bit, and convert access to pointers
    hwmon: (w83627ehf) Remove references to datasheets which no longer exist
    ...

    Linus Torvalds
     

15 Mar, 2011

2 commits


03 Mar, 2011

1 commit