1
0
Fork 0
alistair23-linux/include/linux/platform_data
Linus Torvalds 4b24ff7110 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQIcBAABAgAGBQJQF9V8AAoJEGgI9fZJve1bLvkP/j/Nt1fBud2w5Q/NJr310hYJ
 NWIMSJwFbMhPoNd7sESznogXH8eHQ6YJP+CmkA5Gxr0t8pjEEJHEEyEcf1eNv6/c
 YDZfDB3TIaeYzulvRUkXMQ1f7hiA5Bq2t13yXeMM19+r9DzNZ51jZ3TXETLkpWZG
 BfZPg5wmP0xssXB3fjJMWuW5hVEc503WLpLFXkWfWKMU3PGdy/8DckV/YLvf2l7K
 1fkBLZry0gtruKqFbwcXhanP1JQ8FFFO8n1tSVLJhXXoym5twn/5GAgcpcKSFfJg
 mkGXAQLLuXKfERBIda7qbQl74HmTzYadCcueeXy1hTpom+VwfOpG+by2t/FrXT/M
 aJW6hfSLMgicG8FIuSYqbkutvijU9srU/YI00zrSGDBgi4sGKChRMf4sKQXnHO7X
 Lb7csQ7hEWsfG5gkgjRkmgZdhqWYoIxxe5Gv2Z9MKF27mHoSM03KHiZGlDJMrmNs
 w4KcU5H9tA62dT/UFszuu7NZenmsVS/ktiHWe5k+EXElZMZRrxKDJk2cvLPkRz/E
 VkXGvAmTDYPasZm29yzTnPKcuo6pfeOVJnUWybHOYxhkqAhJu1QzHCatqapgfy8E
 F2ODI5FoWtQES96B9t3tY4lTzq/0yUHcbiJt4BsyRcCGP+ggEQjCq0HGqOca12XX
 gxE20O3l+YQTCQIYKH+S
 =1NaS
 -----END PGP SIGNATURE-----

Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6

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
  ...
2012-07-31 18:08:25 -07:00
..
ad7266.h iio:adc: Add AD7265/AD7266 support 2012-06-30 10:15:07 +01:00
at91_adc.h ARM: AT91: Add platform data for the AT91 ADCs 2012-05-14 13:17:49 -07:00
atmel-aes.h ARM: AT91SAM9G45: add crypto peripherals 2012-07-11 11:06:16 +08:00
atmel.h avr32: fix build failures from mis-naming of atmel_nand.h 2012-04-02 14:41:25 -07:00
clk-integrator.h ARM: integrator: convert to common clock 2012-07-11 17:58:45 -07:00
clk-nomadik.h ARM: nomadik: convert to generic clock 2012-06-10 18:41:40 +02:00
clk-u300.h ARM: u300: convert to common clock 2012-07-11 15:36:45 -07:00
cpsw.h netdev: driver: ethernet: Add TI CPSW driver 2012-03-19 18:02:05 -04:00
dwc3-exynos.h usb: dwc3: Add Exynos Specific Glue layer 2012-03-02 12:11:28 +02:00
dwc3-omap.h
efm32-uart.h serial/efm32: add new driver 2012-01-26 11:29:47 -08:00
ehci-sh.h usb: ehci-sh: Add PHY init function with platform data 2012-04-18 13:52:35 -07:00
emif_plat.h memory: emif: add basic infrastructure for EMIF driver 2012-05-02 00:10:49 -07:00
exynos4_tmu.h hwmon: Add driver for EXYNOS4 TMU 2011-10-24 11:09:35 -07:00
fsa9480.h
gpio-em.h gpio: Emma Mobile GPIO driver V2 2012-05-18 00:00:45 +02:00
i2c-nomadik.h i2c-nomadik: move header to <linux/platform_data/i2c-nomadik.h> 2012-07-09 11:40:40 +02:00
ina2xx.h hwmon: INA219 and INA226 support 2012-05-22 06:48:02 -07:00
leds-lm3556.h leds: Add LED driver for lm3556 chip 2012-07-24 07:52:35 +08:00
leds-renesas-tpu.h drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data 2011-10-31 17:30:55 -07:00
lp855x.h backlight: move lp855x header into platform_data directory 2012-07-30 17:25:15 -07:00
lp8727.h lp8727_charger: Move header file into platform_data directory 2012-07-14 01:14:35 -07:00
macb.h ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
mmp_audio.h ASoC: mmp: add audio dma support 2012-06-13 13:13:37 +01:00
msm_serial_hs.h
mv_usb.h usb/marvell: remove conditional compilation of clk code 2012-07-30 17:25:12 -07:00
ntc_thermistor.h doc: fix broken references 2011-09-27 18:08:04 +02:00
omap-abe-twl6040.h include: platform_data: Platform data header for OMAP4 ASoC audio 2012-01-26 15:39:09 +02:00
omap4-keypad.h Input: omap4-keypad - move platform_data to <linux/platform_data> 2012-03-16 22:49:46 -07:00
omap_drm.h omap2+: add drm device 2012-07-02 04:05:57 -07:00
pxa_sdhci.h
s3c-hsotg.h usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h 2012-07-17 10:54:29 -07:00
s3c-hsudc.h usb: gadget: s3c-hsudc: move platform_data struct to global header 2011-12-21 13:24:27 +02:00
tegra_emc.h ARM: tegra: emc: convert tegra2_emc to a platform driver 2012-02-06 18:24:59 -08:00
tegra_usb.h usb: ehci-tegra: Add vbus_gpio to platform data 2012-04-18 10:26:37 -06:00
uio_pruss.h
wiznet.h Ethernet driver for the WIZnet W5300 chip 2012-04-05 01:43:02 -04:00