14 Jan, 2012

1 commit

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)
    rtc: max8925: Add function to work as wakeup source
    mfd: Add pm ops to max8925
    mfd: Convert aat2870 to dev_pm_ops
    mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
    mfd: Introduce missing kfree in 88pm860x probe routine
    mfd: Add S5M series configuration
    mfd: Add s5m series irq driver
    mfd: Add S5M core driver
    mfd: Improve mc13xxx dt binding document
    mfd: Fix stmpe section mismatch
    mfd: Fix stmpe build warning
    mfd: Fix STMPE I2c build failure
    mfd: Constify aat2870-core i2c_device_id table
    gpio: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 610
    mfd: Add support for STMPE SPI interface
    mfd: Separate out STMPE controller and interface specific code
    misc: Remove max8997-muic sysfs attributes
    mfd: Remove unused wm831x_irq_data_to_mask_reg()
    ...

    Fix up trivial conflict in drivers/leds/Kconfig due to addition of
    LEDS_MAX8997 and LEDS_TCA6507 next to each other.

    Linus Torvalds
     

13 Jan, 2012

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
    ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
    ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
    ALSA: usb-audio: add Yamaha MOX6/MOX8 support
    ALSA: virtuoso: add S/PDIF input support for all Xonars
    ALSA: ice1724 - Support for ooAoo SQ210a
    ALSA: ice1724 - Allow card info based on model only
    ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
    ALSA: hdspm - Provide unique driver id based on card serial
    ASoC: Dynamically allocate the rtd device for a non-empty release()
    ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
    ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
    ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
    ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
    ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
    ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
    ALSA: hda/cirrus - support for iMac12,2 model
    ASoC: cx20442: add bias control over a platform provided regulator
    ALSA: usb-audio - Avoid flood of frame-active debug messages
    ALSA: snd-usb-us122l: Delete calls to preempt_disable
    mfd: Put WM8994 into cache only mode when suspending
    ...

    Fix up trivial conflicts in:
    - arch/arm/mach-s3c64xx/mach-crag6410.c:
    renamed speyside_wm8962 to tobermory, added littlemill right
    next to it
    - drivers/base/regmap/{regcache.c,regmap.c}:
    duplicate diff that had already come in with other changes in
    the regmap tree

    Linus Torvalds
     

12 Jan, 2012

1 commit

  • * git://git.infradead.org/battery-2.6: (68 commits)
    power_supply: Mark da9052 driver as broken
    power_supply: Drop usage of nowarn variant of sysfs_create_link()
    s3c_adc_battery: Average over more than one adc sample
    power_supply: Add DA9052 battery driver
    isp1704_charger: Fix missing check
    jz4740-battery: Fix signedness bug
    power_supply: Assume mains power by default
    sbs-battery: Fix devicetree match table
    ARM: rx51: Add bq27200 i2c board info
    sbs-battery: Change power supply name
    devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
    devicetree-bindings: Add vendor entry for Smart Battery Systems
    sbs-battery: Rename internals to new name
    bq20z75: Rename to sbs-battery
    wm97xx_battery: Use DEFINE_MUTEX() for work_lock
    max8997_charger: Remove duplicate module.h
    lp8727_charger: Some minor fixes for the header
    lp8727_charger: Add header file
    power_supply: Convert drivers/power/* to use module_platform_driver()
    power_supply: Add "unknown" in power supply type
    ...

    Linus Torvalds
     

11 Jan, 2012

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (40 commits)
    regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config
    regulator: max8925: fix enabled/disabled judgement mistake
    regulator: add regulator_bulk_force_disable function
    regulator: pass regulator_register of_node in fixed voltage driver
    regulator: add regulator_force_disable() definition for !CONFIG_REGULATOR
    regulator: Enable supply regulator if child rail is enabled.
    regulator: mc13892: Convert to devm_kzalloc()
    regulator: mc13783: Convert to devm_kzalloc()
    regulator: Fix checking return value of create_regulator
    regulator: Fix the error handling if create_regulator fails
    regulator: Export regulator_is_supported_voltage()
    regulator: mc13892: add device tree probe support
    regulator: mc13892: remove the unnecessary prefix from regulator name
    regulator: Convert wm831x regulator drivers to devm_kzalloc()
    regulator: da9052: Staticize non-exported symbols
    regulator: Replace kzalloc with devm_kzalloc and if-else with a switch-case for da9052-regulator
    regulator: Update da9052-regulator for DT changes
    regulator: DA9052/53 Regulator support
    regulator: pass device_node to of_get_regulator_init_data()
    regulator: If a single voltage is set with device tree then set apply_uV
    ...

    Linus Torvalds
     
  • Anton Vorontsov
     

09 Jan, 2012

15 commits


04 Jan, 2012

1 commit


22 Dec, 2011

1 commit


15 Dec, 2011

1 commit


14 Dec, 2011

1 commit

  • The DA9052/53 is a highly integrated PMIC subsystem with supply domain
    flexibility to support wide range of high performance application.

    It provides voltage regulators, GPIO controller, Touch Screen, RTC, Battery
    control and other functionality.

    This patch is functionally tested on Samsung SMDKV6410.

    Signed-off-by: David Dajun Chen
    Signed-off-by: Ashish Jangam
    Acked-by: Samuel Ortiz
    Signed-off-by: Mark Brown

    Ashish Jangam
     

13 Dec, 2011

8 commits


01 Dec, 2011

3 commits


26 Nov, 2011

4 commits

  • The power core infrastructure allow external power change
    events to be passed to drivers what are listed in the
    supplied_to call back field. Enable this feature by
    allowing the supplied_to field to be passed to the driver.

    This feature will enable drivers named in the supplied_to
    field that have a external_power_changed callback to be
    notified when power was been turned on or off.

    Signed-off-by: Philip Rakity
    Signed-off-by: Anton Vorontsov

    Philip Rakity
     
  • The max8925 cannot return usb status.  The bits

          [MAX8925_IRQ_VCHG_USB_OVP] = {
                  .reg            = MAX8925_CHG_IRQ1,
                  .mask_reg       = MAX8925_CHG_IRQ1_MASK,
                  .offs           = 1 << 3,
          },
          [MAX8925_IRQ_VCHG_USB_F] =  {
                  .reg            = MAX8925_CHG_IRQ1,
                  .mask_reg       = MAX8925_CHG_IRQ1_MASK,
                  .offs           = 1 << 4,
          },
          [MAX8925_IRQ_VCHG_USB_R] = {
                  .reg            = MAX8925_CHG_IRQ1,
                  .mask_reg       = MAX8925_CHG_IRQ1_MASK,
                  .offs           = 1 << 5,
          },

    do not exist in the irq register.

    Signed-off-by: Philip Rakity
    Signed-off-by: Anton Vorontsov

    Philip Rakity
     
  • On brownstone rev 4 ac-insert detect is handled by vbus.

    allow the platform code to configure the disabling of insert
    by setting no_insert_detect.

    Signed-off-by: Philip Rakity
    Signed-off-by: Anton Vorontsov

    Philip Rakity
     
  • Brownstone does not have temperature reading circuit hooked up.
    This leads to spurious interrupts.

    Allow the platform layer to indicate no temperature circuit
    and do not activate interrupts if no temperature control is set

    Signed-off-by: Philip Rakity
    Signed-off-by: Anton Vorontsov

    Philip Rakity
     

24 Nov, 2011

1 commit