linux/drivers/leds
Linus Torvalds 1bfecd9358 ARM: board specific updates
These changes are all specific to one board only. We're trying to keep
 the number of board files low, but generally board level updates are
 ok on platforms that are working on moving towards DT based probing,
 which will eventually lead to removing them.
 
 The board-ams-delta.c board file gets a conflict between the removal of
 ams_delta_config and the addition of a lot of other data. The Kconfig
 file has two changes in the same line, and in exynos, the power domain
 cleanup conflicts with the addition of the image sensor device.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 [olof: Amended a fix for a mismerge to board-omap4panda.c]
 Signed-off-by: Olof Johansson <olof@lixom.net>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPckIXAAoJEIwa5zzehBx35uUP/jns0renNAMmiu2vBHGQtn4z
 xiNXjDTJ8DeD4mKf17rjn/uaJgQ0w3Doq2nEsi5rPqLK4Uqqk+NG1zYa77QBWHbx
 FUgBPz+oViTDkanp4G8cygXvGfNkb1GvuJxEBvxQ1mwuG4JhwlFbQxGIaS8ZwOAN
 DIyVCgSXy40B+748RwdZ2AY7CYvWiQWrQYsIH6NO0rtZIXjyV0kIsyVtEXZpqWtF
 xNz2HHXVMrui2JQ7FQ0zZglY8+YCxjeJk4v++FfqCJiMzU1yZJw7E30NjhcWAaR6
 odJM2YIyhvunxPfx3ZUHimsNjfU+l/0uXgDHeLFSWVyIjPFXwqZDi/6onP3FI4Jc
 sIoTSwDAQpnZJ6KffAYkcyyfsWN61GOE96Xa2eRb6+78CEiMh7vJ8TIRieiOWxjm
 NbB0xzaKxa97F/8z7w6V6Z4dNhnokWJZvtJdgLZUYAqIgnxstFkJZ9+Tqt77G4t3
 5iSbIMeFPsfh5sUeAVjr5+zVeUOm9PTRI0n0RY+Wd16Ke6DO1qobKAYOzrzI5idz
 k7ni76/zgGn3NS5F3TxdRHowkeGUwUU6poyopgQ0pyscDylVpzgMIqmAwLdzrVp5
 joVEoKi6h4oqhAZtiysXuF85bUfCW0ziDUuib07SX8wcEIAIr+mWob1Ei+wJrefe
 g0Ch3ZbCRQMOwSOQ70Ci
 =HPiJ
 -----END PGP SIGNATURE-----

Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson:
 "These changes are all specific to one board only.  We're trying to
  keep the number of board files low, but generally board level updates
  are ok on platforms that are working on moving towards DT based
  probing, which will eventually lead to removing them.

  The board-ams-delta.c board file gets a conflict between the removal
  of ams_delta_config and the addition of a lot of other data.  The
  Kconfig file has two changes in the same line, and in exynos, the
  power domain cleanup conflicts with the addition of the image sensor
  device.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  [olof: Amended a fix for a mismerge to board-omap4panda.c]
  Signed-off-by: Olof Johansson <olof@lixom.net>"

Fixed up some fairly trivial conflicts manually.

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)
  i.MX35-PDK: Add Camera support
  ARM : mx35: 3ds-board: add framebuffer device
  pxa/hx4700: Remove pcmcia platform_device structure
  ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
  ARM: pxa/hx4700: Remove unwanted request for GPIO105
  ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
  ARM: EXYNOS: Register JPEG on nuri
  ARM: EXYNOS: Register JPEG on universal_c210
  ARM: S5PV210: Enable JPEG on SMDKV210
  ARM: S5PV210: Add JPEG board definition
  ARM: EXYNOS: Enable JPEG on Origen
  ARM: EXYNOS: Enable JPEG on SMDKV310
  ARM: EXYNOS: Add __init attribute to universal_camera_init()
  ARM: EXYNOS: Add __init attribute to nuri_camera_init()
  ARM: S5PV210: Enable FIMC on SMDKC110
  ARM: S5PV210: Enable FIMC on SMDKV210
  ARM: S5PV210: Enable MFC on SMDKC110
  ARM: S5PV210: Enable MFC on SMDKV210
  ARM: EXYNOS: Enable G2D on SMDKV310
  ARM: tegra: update defconfig
  ...
2012-03-27 16:27:28 -07:00
..
dell-led.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
Kconfig ARM: board specific updates 2012-03-27 16:27:28 -07:00
led-class.c led-class: change back LEDS_CLASS to tristate instead of bool 2012-03-23 16:58:35 -07:00
led-core.c led-class: change back LEDS_CLASS to tristate instead of bool 2012-03-23 16:58:35 -07:00
led-triggers.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
leds-88pm860x.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-adp5520.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-asic3.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-atmel-pwm.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-bd2802.c drivers/leds/leds-bd2802.c: use gpio_request_one() 2012-01-10 16:30:49 -08:00
leds-clevo-mail.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
leds-cobalt-qube.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-cobalt-raq.c drivers/leds: Add export.h for THIS_MODULE to leds-cobalt-raq.c 2011-10-31 19:31:50 -04:00
leds-da903x.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-dac124s085.c leds: convert leds-dac124s085 to module_spi_driver 2012-01-10 16:30:49 -08:00
leds-fsg.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-gpio-register.c leds: provide helper to register "leds-gpio" devices 2011-05-25 08:39:51 -07:00
leds-gpio.c drivers/leds/leds-gpio.c: use linux/gpio.h rather than asm/gpio.h 2012-03-23 16:58:35 -07:00
leds-hp6xx.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-lm3530.c drivers/leds/leds-lm3530.c: move the code setting gen_config to one place 2012-03-23 16:58:35 -07:00
leds-locomo.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
leds-lp3944.c leds: convert led i2c drivers to module_i2c_driver 2012-01-10 16:30:48 -08:00
leds-lp5521.c drivers/leds/leds-lp5521.c: ret may be uninitialized 2012-03-23 16:58:35 -07:00
leds-lp5523.c drivers/leds/leds-lp5523.c: constify some data 2012-03-23 16:58:35 -07:00
leds-lt3593.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-max8997.c leds: Add suuport for MAX8997-LED driver 2012-01-09 00:37:41 +01:00
leds-mc13783.c drivers/leds/leds-mc13783.c: fix off-by-one for checking num_leds 2012-01-10 16:30:49 -08:00
leds-net48xx.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
leds-netxbig.c drivers/leds/leds-netxbig.c: use gpio_request_one() 2012-01-10 16:30:49 -08:00
leds-ns2.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-ot200.c leds: add led driver for Bachmann's ot200 2012-01-23 08:38:47 -08:00
leds-pca955x.c leds: convert led i2c drivers to module_i2c_driver 2012-01-10 16:30:48 -08:00
leds-pca9532.c leds: convert led i2c drivers to module_i2c_driver 2012-01-10 16:30:48 -08:00
leds-pca9633.c drivers/leds/leds-pca9633.c: remove unused 'adapter' variable 2012-03-23 16:58:35 -07:00
leds-pwm.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-rb532.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-regulator.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-renesas-tpu.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-s3c24xx.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-ss4200.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
leds-sunfire.c drivers/leds/leds-sunfire.c: fix sunfire_led_generic_probe() error handling 2011-07-25 20:57:15 -07:00
leds-tca6507.c drivers/leds/leds-tca6507.c: remove obsolete cleanup for clientdata 2012-03-23 16:58:34 -07:00
leds-wm831x-status.c leds: convert wm831x status driver to devm_kzalloc() 2012-01-10 16:30:49 -08:00
leds-wm8350.c leds: convert wm8350 driver to devm_kzalloc() 2012-01-10 16:30:49 -08:00
leds-wrap.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
leds.h leds: support automatic start of blinking with ledtrig-timer 2011-05-25 08:39:49 -07:00
ledtrig-backlight.c
ledtrig-default-on.c
ledtrig-gpio.c drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking 2011-01-20 17:02:06 -08:00
ledtrig-heartbeat.c
ledtrig-ide-disk.c
ledtrig-timer.c drivers/leds/ledtrig-timer.c: fix broken sysfs delay handling 2011-09-14 18:09:38 -07:00
Makefile ARM: board specific updates 2012-03-27 16:27:28 -07:00