Eric Lee / smarc-fsl-linux-kernel

22 Nov, 2013

1 commit

  • dd197c1bb   ENGR00288522 power: imx6-usb-charger: fix build error when build as module ... Browse Code »

    It is a library, so it can't be built as a module, besides,
    it uses anatop register, it should depends on imx6 soc series.
    Below is the build error message it fixes:

    CC [M] drivers/power/imx6_usb_charger.o
    /home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:173:5: error: redefinition of 'imx6_usb_vbus_connect'
    /home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:70:5: note: previous definition of 'imx6_usb_vbus_connect' was here
    /home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:200:5: error: redefinition of 'imx6_usb_charger_detect_post'
    /home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:74:5: note: previous definition of 'imx6_usb_charger_detect_post' was here
    /home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:235:5: error: redefinition of 'imx6_usb_vbus_disconnect'
    /home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:65:5: note: previous definition of 'imx6_usb_vbus_disconnect' was here
    /home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:256:5: error: redefinition of 'imx6_usb_create_charger'
    /home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:59:5: note: previous definition of 'imx6_usb_create_charger' was here
    /home/b29397/work/projects/linux-2.6-imx/drivers/power/imx6_usb_charger.c:290:6: error: redefinition of 'imx6_usb_remove_charger'
    /home/b29397/work/projects/linux-2.6-imx/include/linux/power/imx6_usb_charger.h:54:6: note: previous definition of 'imx6_usb_remove_charger' was here
    make[3]: *** [drivers/power/imx6_usb_charger.o] Error 1
    make[2]: *** [drivers/power] Error 2

    Signed-off-by: Peter Chen

    Peter Chen
     

18 Nov, 2013

2 commits

  • 8d5051f9e   ENGR00287992-1 power: imx6: add imx6 USB charger detection ... Browse Code »

    Add imx6 USB charger detection, the vbus supplier will create and
    remove struct usb_charger, and notify vbus connect and disconnect
    event. The detail USB charger detection flow is at: "i.MX6 RM,
    Chapter Universal Serial Bus 2.0 Integrated PHY (USB-PHY),
    Charger detection, Charger detection software flow".

    Since imx6 only has charger detection function, and no charging
    current function is existed. It the user wants the detection abilities
    from SoC, it can use this detection method
    (add imx6-usb-charger-detection at dts). If the charger IC
    already has USB charger detection function, and the user wants
    to use the detection method from charger IC, please do not add
    imx6-usb-charger-detection property at dts.

    Signed-off-by: Peter Chen

    Peter Chen
     
  • 1bfc070d9   ENGR00288351 sabresd_battery: fix usb charger detect when resume back on mx6sl ... Browse Code »

    Fix below redundant log after first resume back on mx6slevk:
    max8903-charger max8903.12: USB Charger Connected

    It's caused by not add enough prepare for uok&dok which are connected, such as
    i.MX6SL-EVK. In this case the board only support DC charger detect, so we
    didn't need judge the uok pin for USB charger detect, although uok share with
    dok pin.

    Signed-off-by: Robin Gong

    Robin Gong
     

30 Oct, 2013

2 commits

14 Jul, 2013

1 commit

  • e64c7e14f   charger-manager: Ensure event is not used as format string ... Browse Code »

    commit 3594f4c0d7bc51e3a7e6d73c44e368ae079e42f3 upstream.

    The exposed interface for cm_notify_event() could result in the event msg
    string being parsed as a format string. Make sure it is only used as a
    literal string.

    Signed-off-by: Kees Cook
    Cc: Anton Vorontsov
    Cc: David Woodhouse
    Signed-off-by: Anton Vorontsov
    Signed-off-by: Greg Kroah-Hartman

    Kees Cook
     

26 May, 2013

1 commit

  • 72de4c63e   Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6 ... Browse Code »

    Pull bettery fixes from Anton Vorontsov:
    "Last minute one-liners: wrong kfree usage fix, module alias fixup and
    kconfig adjustments"

    * tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6:
    pm2301_charger: Fix module alias prefix
    wm831x_backup: Fix wrong kfree call for devdata->backup.name
    bq27x00: Fix I2C dependency in KConfig
    lp8788-charger: Fix kconfig dependency

    Linus Torvalds
     

11 May, 2013

3 commits

  • dccab6092   pm2301_charger: Fix module alias prefix ... Browse Code »

    This driver is a i2c driver, use "i2c" rather than "platform" prefix for
    module alias.

    Signed-off-by: Axel Lin
    Signed-off-by: Anton Vorontsov

    Axel Lin
     
  • c909fc857   wm831x_backup: Fix wrong kfree call for devdata->backup.name ... Browse Code »

    devdata->backup.name points to devdata->name, the memory for devdata->name
    is part of struct wm831x_backup. Thus remove kfree call for
    devdata->backup.name.

    Signed-off-by: Axel Lin
    Acked-by: Mark Brown
    Signed-off-by: Anton Vorontsov

    Axel Lin
     
  • a2d0dbb4b   bq27x00: Fix I2C dependency in KConfig ... Browse Code »

    This patch fixes build failure(randconfig) of next-20130501. When config
    I2C as m, BATTERY_BQ27x00 as y, here comes the failure. The driver depends
    on I2C only if I2C is not disabled, as Lars commented. Last version of
    this patch make the driver depend on I2C unconditionally.

    Failure message:
    drivers/built-in.o: In function `bq27x00_read_i2c':
    bq27x00_battery.c:(.text+0x1082a7): undefined reference to `i2c_transfer'
    drivers/built-in.o: In function `bq27x00_battery_init':
    bq27x00_battery.c:(.init.text+0x6085): undefined reference to `i2c_register_driver'
    bq27x00_battery.c:(.init.text+0x60c7): undefined reference to `i2c_del_driver'
    drivers/built-in.o: In function `bq27x00_battery_exit':
    bq27x00_battery.c:(.exit.text+0xbf0): undefined reference to `i2c_del_driver'
    make: *** [vmlinux] Error 1

    Signed-off-by: Xiong Zhou
    Cc: Lars-Peter Clausen
    Signed-off-by: Anton Vorontsov

    Xiong Zhou
     

06 May, 2013

1 commit

  • d7ab7302f   Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next ... Browse Code »

    Pull MFD update from Samuel Ortiz:
    "For 3.10 we have a few new MFD drivers for:

    - The ChromeOS embedded controller which provides keyboard, battery
    and power management services. This controller is accessible
    through i2c or SPI.

    - Silicon Laboratories 476x controller, providing access to their FM
    chipset and their audio codec.

    - Realtek's RTS5249, a memory stick, MMC and SD/SDIO PCI based
    reader.

    - Nokia's Tahvo power button and watchdog device. This device is
    very similar to Retu and is thus supported by the same code base.

    - STMicroelectronics STMPE1801, a keyboard and GPIO controller
    supported by the stmpe driver.

    - ST-Ericsson AB8540 and AB8505 power management and voltage
    converter controllers through the existing ab8500 code.

    Some other drivers got cleaned up or improved. In particular:

    - The Linaro/STE guys got the ab8500 driver in sync with their
    internal code through a series of optimizations, fixes and
    improvements.

    - The AS3711 and OMAP USB drivers now have DT support.

    - The arizona clock and interrupt handling code got improved.

    - The wm5102 register patch and boot mechanism also got improved."

    * tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (104 commits)
    mfd: si476x: Don't use 0bNNN
    mfd: vexpress: Handle pending config transactions
    mfd: ab8500: Export ab8500_gpadc_sw_hw_convert properly
    mfd: si476x: Fix i2c warning
    mfd: si476x: Add header files and Kbuild plumbing
    mfd: si476x: Add chip properties handling code
    mfd: si476x: Add the bulk of the core driver
    mfd: si476x: Add commands abstraction layer
    mfd: rtsx: Support RTS5249
    mfd: retu: Add Tahvo support
    mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
    mfd: wm8994: Add some OF properties
    mfd: wm8994: Add device ID data to WM8994 OF device IDs
    input: Export matrix_keypad_parse_of_params()
    mfd: tps65090: Add compatible string for charger subnode
    mfd: db8500-prcmu: Support platform dependant device selection
    mfd: syscon: Fix warnings when printing resource_size_t
    of: Add stub of_get_parent for non-OF builds
    mfd: omap-usb-tll: Convert to devm_ioremap_resource()
    mfd: omap-usb-host: Convert to devm_ioremap_resource()
    ...

    Linus Torvalds
     

03 May, 2013

1 commit

  • 237a1b01f   lp8788-charger: Fix kconfig dependency ... Browse Code »

    Fix build errors in lp8788-charger by making it depend on IIO.
    Fixes errors when CONFIG_IIO=m and CHARGER_LP8788=y.

    lp8788-charger.c:(.text+0x2146b5): undefined reference to `iio_channel_get'
    lp8788-charger.c:(.text+0x2146ce): undefined reference to `iio_channel_get'
    lp8788-charger.c:(.text+0x214a86): undefined reference to `iio_read_channel_processed'
    lp8788-charger.c:(.text+0x214b51): undefined reference to `iio_read_channel_processed'
    lp8788-charger.c:(.text+0x214c30): undefined reference to `iio_read_channel_processed'
    lp8788-charger.c:(.text+0x214d93): undefined reference to `iio_channel_release'
    lp8788-charger.c:(.text+0x214dac): undefined reference to `iio_channel_release'

    Signed-off-by: Randy Dunlap
    Acked-by: Milo Kim
    Signed-off-by: Anton Vorontsov

    Randy Dunlap
     

01 May, 2013

2 commits

  • 151173e8c   Merge tag 'for-v3.10' of git://git.infradead.org/battery-2.6 ... Browse Code »

    Pull battery updates from Anton Vorontsov:
    "Highlights:

    - OpenFirmware/DeviceTree support for the Power Supply core: the core
    now automatically populates supplied_from hierarchy from the device
    tree. With these patches chargers and batteries can now lookup
    each other without the board files support shim. Rhyland Klein at
    NVIDIA did the work

    - New ST-Ericsson ABX500 hwmon driver. The driver is heavily using
    the AB85xx core and depends on some recent changes to it, so that
    is why the driver comes through the battery tree. It has an
    appropriate ack from the hwmon maintainer (i.e. Guenter Roeck).
    Martin Persson at ST-Ericsson and Hongbo Zhang at Linaro authored
    the driver

    - Final bits to sync AB85xx ST-Ericsson changes into mainline. The
    changes touch mfd parts, but these were acked by the appropriate
    MFD maintainer (ie Samuel Ortiz). Lee Jones at Linaro did most of
    the work and lead the submission process.

    Minor changes, but still worth mentioning:

    - Battery temperature reporting fix for Nokia N900 phones
    - Versatile Express poweroff driver moved into drivers/power/reset/
    - Tree-wide: use devm_kzalloc() where appropriate
    - Tree-wide: dev_pm_ops cleanups/fixes"

    * tag 'for-v3.10' of git://git.infradead.org/battery-2.6: (112 commits)
    pm2301-charger: Fix suspend/resume
    charger-manager: Use kmemdup instead of kzalloc + memcpy
    power_supply: Populate supplied_from hierarchy from the device tree
    power_supply: Add core support for supplied_from
    power_supply: Define Binding for power-supplies
    rx51_battery: Fix reporting temperature
    hwmon: Add ST-Ericsson ABX500 hwmon driver
    ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
    ab8500_{bmdata,fg}: Add const attributes to some data arrays
    ab8500_bmdata: Eliminate CamelCase warning of some variables
    ab8500_btemp: Make ab8500_btemp_get* interfaces public
    goldfish_battery: Use resource_size()
    lp8788-charger: Use PAGE_SIZE for the sysfs read operation
    max8925_power: Use devm_kzalloc()
    da9030_battery: Use devm_kzalloc()
    da9052-battery: Use devm_kzalloc()
    ds2760_battery: Use devm_kzalloc()
    ds2780_battery: Use devm_kzalloc()
    gpio-charger: Use devm_kzalloc()
    isp1704_charger: Use devm_kzalloc()
    ...

    Linus Torvalds
     
  • 5d434fcb2   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    Pull trivial tree updates from Jiri Kosina:
    "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
    code cleanups"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
    mm: Convert print_symbol to %pSR
    gfs2: Convert print_symbol to %pSR
    m32r: Convert print_symbol to %pSR
    iostats.txt: add easy-to-find description for field 6
    x86 cmpxchg.h: fix wrong comment
    treewide: Fix typo in printk and comments
    doc: devicetree: Fix various typos
    docbook: fix 8250 naming in device-drivers
    pata_pdc2027x: Fix compiler warning
    treewide: Fix typo in printks
    mei: Fix comments in drivers/misc/mei
    treewide: Fix typos in kernel messages
    pm44xx: Fix comment for "CONFIG_CPU_IDLE"
    doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
    mmzone: correct "pags" to "pages" in comment.
    kernel-parameters: remove outdated 'noresidual' parameter
    Remove spurious _H suffixes from ifdef comments
    sound: Remove stray pluses from Kconfig file
    radio-shark: Fix printk "CONFIG_LED_CLASS"
    doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
    ...

    Linus Torvalds
     

17 Apr, 2013

9 commits

08 Apr, 2013

1 commit

  • 8059c1c6b   power: rx51_battery: Fix reporting correct values ... Browse Code »

    Tell twl4030_madc_conversion that this driver needs raw values.
    Driver twl4030_madc has some hardcoded values and conversation
    functions which are incorrect for Nokia RX-51 board. This driver
    rx51_battery expects raw values which convert itself.

    This patch fixing values reported by power supply interface.
    Before this patch driver reported always incorrect values on
    3.8 kernel (sometimes design capacity was negative).

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

    Pali Rohár
     

01 Apr, 2013

16 commits