Doug / smarc-fsl-linux-kernel

08 Sep, 2010

1 commit

24 Aug, 2010

1 commit

13 Aug, 2010

1 commit

  • 16bb85bc1   Merge git://git.infradead.org/battery-2.6 ... Browse Code »

    * git://git.infradead.org/battery-2.6:
    intel_mid_battery: Fix battery scaling
    intel_mid_battery: Fix the argument order to intel_scu_ipc_command
    olpc_battery: Fix build failure caused by sysfs changes
    Add s3c-adc-battery driver
    Intel MID platform battery driver

    Fix up trivial conflicts (battery drivers added from different branches)
    in drivers/power/{Kconfig,Makefile}

    Linus Torvalds
     

12 Aug, 2010

1 commit

  • 636d17427   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
    ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
    ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
    ARM: 6322/1: imx/pca100: Fix name of spi platform data
    ARM: 6321/1: fix syntax error in main Kconfig file
    ARM: 6297/1: move U300 timer to dynamic clock lookup
    ARM: 6296/1: clock U300 intcon and timer properly
    ARM: 6295/1: fix U300 apb_pclk split
    ARM: 6306/1: fix inverted MMC card detect in U300
    ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
    ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
    ARM: 6292/1: coresight: add ETM management registers
    ARM: 6288/1: ftrace: document mcount formats
    ARM: 6287/1: ftrace: clean up mcount assembly indentation
    ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
    ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
    ARM: 6280/1: imx: Fix build failure when including without
    ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
    ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
    ARM: S5PV210: Override FIMC driver name on Aquila board
    ARM: S5PC100: enable FIMC on SMDKC100
    ...

    Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
    different subsystem 'setname' calls, and trivial port types in
    include/linux/serial_core.h

    Linus Torvalds
     

11 Aug, 2010

1 commit

10 Aug, 2010

3 commits

07 Aug, 2010

1 commit

05 Aug, 2010

2 commits

28 Jul, 2010

1 commit

23 Jul, 2010

1 commit

  • 808be4b22   Add s3c-adc-battery driver ... Browse Code »

    s3c-adc-battery is driver for monitoring and charging battery on
    iPAQ H1930/H1940/RX1950.

    It depends on s3c-adc driver to get battery voltage and current.

    Signed-off-by: Vasily Khoruzhick
    Signed-off-by: Anton Vorontsov

    Vasily Khoruzhick
     

20 Jul, 2010

1 commit

21 Jun, 2010

1 commit

18 Jun, 2010

1 commit

  • 6721081b6   Intel MID platform battery driver ... Browse Code »

    The PMIC Battery driver provides battery charging and battery gauge
    functionality on Intel MID platforms. This provides the basic functions.
    There are some USB drivers to merge before the selection of charging
    between the different USB power levels can be enabled.

    Moved to a platform device by Alek Du.

    Signed-off-by: Nithish Mahalingam
    Signed-off-by: Alan Cox
    Signed-off-by: Anton Vorontsov

    Nithish Mahalingam
     

14 Jun, 2010

1 commit

  • eb9650d6d   ds2782_battery: Rename get_current to fix build failure / name conflict ... Browse Code »

    This patch changes the name of get_current function pointer to
    get_battery_current to resolve a name conflict with the get_current
    macro defined in current.h.

    This conflict resulted in a build-failure[1] for the sh4 arch
    allyesconfig:

    drivers/power/ds2782_battery.c:216:48: error: macro "get_current"
    passed 2 arguments, but takes just

    This patch fixes the issue. To be consistent the other function pointers
    (_voltage,_capacity) were renamed too.

    Signed-off-by: Peter Huewe
    Acked-by: Ryan Mallon
    Acked-by: Mike Rapoport
    Signed-off-by: Anton Vorontsov

    Peter Huewe
     

13 Jun, 2010

1 commit

03 Jun, 2010

1 commit

  • fbae3fb15   i2c: Remove all i2c_set_clientdata(client, NULL) in drivers ... Browse Code »

    I2C drivers can use the clientdata-pointer to point to private data. As I2C
    devices are not really unregistered, but merely detached from their driver, it
    used to be the drivers obligation to clear this pointer during remove() or a
    failed probe(). As a couple of drivers forgot to do this, it was agreed that it
    was cleaner if the i2c-core does this clearance when appropriate, as there is
    no guarantee for the lifetime of the clientdata-pointer after remove() anyhow.
    This feature was added to the core with commit
    e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers.

    As there is no need anymore to clear the clientdata-pointer, remove all current
    occurrences in the drivers to simplify the code and prevent confusion.

    Signed-off-by: Wolfram Sang
    Acked-by: Mark Brown
    Acked-by: Greg Kroah-Hartman
    Acked-by: Richard Purdie
    Acked-by: Dmitry Torokhov
    Signed-off-by: Jean Delvare

    Wolfram Sang
     

25 May, 2010

2 commits

  • 4961ab934   Merge git://git.infradead.org/battery-2.6 ... Browse Code »

    * git://git.infradead.org/battery-2.6:
    power_supply: Fix regression for 'type' property

    Linus Torvalds
     
  • bbabb158f   power_supply: Fix regression for 'type' property ... Browse Code »

    Commit 5f487cd34f4337f9bc27ca19da72a39d1b0a0ab4 (power_supply: Use
    attribute groups) causes a regression the power supply core does not
    export the 'type' attribute anymore.

    POWER_SUPPLY_PROP_TYPE is handled by the power supply core without the
    low-level driver, so power_supply_attr_is_visible() must always return
    the entry as readable.

    Reported-by: Rafael J. Wysocki
    Signed-off-by: Daniel Mack
    Tested-by: Rafael J. Wysocki
    Signed-off-by: Anton Vorontsov

    Daniel Mack
     

24 May, 2010

1 commit

  • 15953654c   Merge git://git.infradead.org/battery-2.6 ... Browse Code »

    * git://git.infradead.org/battery-2.6:
    ds2760_battery: Document ABI change
    ds2760_battery: Make charge_now and charge_full writeable
    power_supply: Add support for writeable properties
    power_supply: Use attribute groups
    power_supply: Add test_power driver
    tosa_battery: Fix build error due to direct driver_data usage
    wm97xx_battery: Quieten sparse warning (bat_set_pdata not declared)
    ds2782_battery: Get rid of magic numbers in driver_data
    ds2782_battery: Add support for ds2786 battery gas gauge
    pda_power: Add function callbacks for suspend and resume
    wm831x_power: Use genirq
    Driver for Zipit Z2 battery chip
    ds2782_battery: Fix clientdata on removal

    Linus Torvalds
     

22 May, 2010

1 commit

19 May, 2010

3 commits

  • bd52ca555   ds2760_battery: Make charge_now and charge_full writeable ... Browse Code »

    For userspace tools and daemons, it might be necessary to adjust
    the charge_now and charge_full properties of the ds2760 battery monitor,
    for example for unavoidable corrections due to aging batteries.

    Signed-off-by: Daniel Mack
    Cc: Matt Reimer
    Cc: Evgeniy Polyakov
    Cc: Tejun Heo
    Cc: David Woodhouse
    Cc: Alexey Starikovskiy
    Cc: Len Brown
    Cc: Mark Brown
    Signed-off-by: Anton Vorontsov

    Daniel Mack
     
  • 0011d2d4a   power_supply: Add support for writeable properties ... Browse Code »

    This patch adds support for writeable power supply properties and
    exposes them as writeable to sysfs.

    A power supply implementation must implement two new function calls in
    order to use that feature:

    int set_property(struct power_supply *psy,
    enum power_supply_property psp,
    const union power_supply_propval *val);

    int property_is_writeable(struct power_supply *psy,
    enum power_supply_property psp);

    Signed-off-by: Daniel Mack
    Cc: David Woodhouse
    Cc: Alexey Starikovskiy
    Cc: Len Brown
    Cc: Mark Brown
    Cc: Matt Reimer
    Cc: Evgeniy Polyakov
    Cc: Tejun Heo
    Signed-off-by: Anton Vorontsov

    Daniel Mack
     
  • 5f487cd34   power_supply: Use attribute groups ... Browse Code »

    This fixes a race between power supply device and initial
    attributes creation, plus makes it possible to implement
    writable properties.

    [Daniel Mack - removed superflous return statement
    and dropped .mode attribute from POWER_SUPPLY_ATTR]

    Suggested-by: Greg KH
    Suggested-by: Kay Sievers
    Signed-off-by: Anton Vorontsov
    Tested-by: Daniel Mack

    Anton Vorontsov
     

18 May, 2010

1 commit

03 May, 2010

3 commits

  • 06b9e650c   tosa_battery: Fix build error due to direct driver_data usage ... Browse Code »

    The driver isn't buildable since 2.6.32 (i.e. commit b4028437
    "Driver core: move dev_get/set_drvdata to drivers/base/dd.c"):

    CC tosa_battery.o
    tosa_battery.c: In function 'tosa_read_bat':
    tosa_battery.c:64: error: 'struct device' has no member named 'driver_data'
    tosa_battery.c: In function 'tosa_read_temp':
    tosa_battery.c:84: error: 'struct device' has no member named 'driver_data'

    Nowadays we must not access driver_data directly, use dev_get_drvdata()
    instead.

    Signed-off-by: Dmitry Eremin-Solenikov
    Signed-off-by: Andrew Morton
    Signed-off-by: Anton Vorontsov

    Dmitry Eremin-Solenikov
     
  • b1458fb57   wm97xx_battery: Quieten sparse warning (bat_set_pdata not declared) ... Browse Code »

    This patch fixes following sparse warning:

    drivers/power/wm97xx_battery.c:311:6: warning: symbol 'wm97xx_bat_set_pdata' was not declared. Should it be static?

    Note that we can't just include linux/wm97xx_batt.h because the header
    is deprecated, and so this pops up:

    In file included from drivers/power/wm97xx_battery.c:22:
    include/linux/wm97xx_batt.h:6: warning: #warning This file will be removed soon, use wm97xx.h instead!

    Since wm97xx_bat_set_pdata() is also deprecated (in favour of pdata
    passed via AC97 bus), just workaround the issue by declaring the
    function in wm97xx_battery.c.

    Signed-off-by: Anton Vorontsov

    Anton Vorontsov
     
  • ab6cc8f9b   ds2782_battery: Get rid of magic numbers in driver_data ... Browse Code »

    Constructions like 'if (id->driver_data == 1)' look quite weird.
    This patch introduces 'enum ds278x_num_id', which makes things
    much more understandable, i.e. 'if (id->driver_data == DS2786)'.

    Signed-off-by: Anton Vorontsov
    Acked-by: Mike Rapoport

    Anton Vorontsov
     

27 Apr, 2010

2 commits

16 Apr, 2010

1 commit

07 Apr, 2010

3 commits

  • b5874f33b   wm831x_power: Use genirq ... Browse Code »

    Since the WM831x core has been converted to use genirq for the
    interrupt controller there is no longer any need for chip specific
    wrappers for IRQ operations. Convert to use genirq directly.

    Signed-off-by: Mark Brown
    Signed-off-by: Anton Vorontsov

    Mark Brown
     
  • e3e8d1c93   Driver for Zipit Z2 battery chip ... Browse Code »

    This patch adds driver for Zipit Z2 battery chip called AER915. No
    details are known about the chip. The chip is available through I2C bus
    at address 0x55 and it's register 0x02 contains battery voltage.

    Signed-off-by: Marek Vasut
    Signed-off-by: Anton Vorontsov

    Marek Vasut
     
  • a009d29ea   ds2782_battery: Fix clientdata on removal ... Browse Code »

    Probably due to a copy & paste bug, clientdata was set again to the data
    structure (which is freed immediately afterwards) when it should be
    NULLed. Just remove the calls as the i2c-core does this automatically
    now.

    Signed-off-by: Wolfram Sang
    Cc: Ryan Mallon
    Cc: Hans Verkuil
    Cc: Jean Delvare
    Signed-off-by: Anton Vorontsov

    Wolfram Sang
     

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

15 Mar, 2010

1 commit

08 Mar, 2010

2 commits