Commit e6827baf authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'led-fixes-for-v4.3-rc2' of...

Merge tag 'led-fixes-for-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds

Pull LED fixes from Jacek Anaszewski:
 - fix module autoload for six OF platform drivers (aat1290, bcm6328,
   bcm6358, ktd2692, max77693, ns2)
 - aat1290: add missing static modifier
 - ipaq-micro: add missing LEDS_CLASS dependency
 - lp55xx: correct Kconfig dependecy for f/w user helper

* tag 'led-fixes-for-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  leds:lp55xx: Correct Kconfig dependency for f/w user helper
  leds: leds-ipaq-micro: Add LEDS_CLASS dependency
  leds: aat1290: add 'static' modifier to init_mm_current_scale
  leds: leds-ns2: Fix module autoload for OF platform driver
  leds: max77693: Fix module autoload for OF platform driver
  leds: ktd2692: Fix module autoload for OF platform driver
  leds: bcm6358: Fix module autoload for OF platform driver
  leds: bcm6328: Fix module autoload for OF platform driver
  leds: aat1290: Fix module autoload for OF platform driver
parents dc847d5b 2338f73d
...@@ -170,6 +170,7 @@ config LEDS_SUNFIRE ...@@ -170,6 +170,7 @@ config LEDS_SUNFIRE
config LEDS_IPAQ_MICRO config LEDS_IPAQ_MICRO
tristate "LED Support for the Compaq iPAQ h3xxx" tristate "LED Support for the Compaq iPAQ h3xxx"
depends on LEDS_CLASS
depends on MFD_IPAQ_MICRO depends on MFD_IPAQ_MICRO
help help
Choose this option if you want to use the notification LED on Choose this option if you want to use the notification LED on
...@@ -229,7 +230,7 @@ config LEDS_LP55XX_COMMON ...@@ -229,7 +230,7 @@ config LEDS_LP55XX_COMMON
tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501" tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501"
depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501 depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501
select FW_LOADER select FW_LOADER
select FW_LOADER_USER_HELPER_FALLBACK select FW_LOADER_USER_HELPER
help help
This option supports common operations for LP5521/5523/55231/5562/8501 This option supports common operations for LP5521/5523/55231/5562/8501
devices. devices.
......
...@@ -331,7 +331,7 @@ static void aat1290_led_validate_mm_current(struct aat1290_led *led, ...@@ -331,7 +331,7 @@ static void aat1290_led_validate_mm_current(struct aat1290_led *led,
cfg->max_brightness = b + 1; cfg->max_brightness = b + 1;
} }
int init_mm_current_scale(struct aat1290_led *led, static int init_mm_current_scale(struct aat1290_led *led,
struct aat1290_led_config_data *cfg) struct aat1290_led_config_data *cfg)
{ {
int max_mm_current_percent[] = { 20, 22, 25, 28, 32, 36, 40, 45, 50, 56, int max_mm_current_percent[] = { 20, 22, 25, 28, 32, 36, 40, 45, 50, 56,
...@@ -559,6 +559,7 @@ static const struct of_device_id aat1290_led_dt_match[] = { ...@@ -559,6 +559,7 @@ static const struct of_device_id aat1290_led_dt_match[] = {
{ .compatible = "skyworks,aat1290" }, { .compatible = "skyworks,aat1290" },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, aat1290_led_dt_match);
static struct platform_driver aat1290_led_driver = { static struct platform_driver aat1290_led_driver = {
.probe = aat1290_led_probe, .probe = aat1290_led_probe,
......
...@@ -395,6 +395,7 @@ static const struct of_device_id bcm6328_leds_of_match[] = { ...@@ -395,6 +395,7 @@ static const struct of_device_id bcm6328_leds_of_match[] = {
{ .compatible = "brcm,bcm6328-leds", }, { .compatible = "brcm,bcm6328-leds", },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, bcm6328_leds_of_match);
static struct platform_driver bcm6328_leds_driver = { static struct platform_driver bcm6328_leds_driver = {
.probe = bcm6328_leds_probe, .probe = bcm6328_leds_probe,
......
...@@ -226,6 +226,7 @@ static const struct of_device_id bcm6358_leds_of_match[] = { ...@@ -226,6 +226,7 @@ static const struct of_device_id bcm6358_leds_of_match[] = {
{ .compatible = "brcm,bcm6358-leds", }, { .compatible = "brcm,bcm6358-leds", },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, bcm6358_leds_of_match);
static struct platform_driver bcm6358_leds_driver = { static struct platform_driver bcm6358_leds_driver = {
.probe = bcm6358_leds_probe, .probe = bcm6358_leds_probe,
......
...@@ -426,6 +426,7 @@ static const struct of_device_id ktd2692_match[] = { ...@@ -426,6 +426,7 @@ static const struct of_device_id ktd2692_match[] = {
{ .compatible = "kinetic,ktd2692", }, { .compatible = "kinetic,ktd2692", },
{ /* sentinel */ }, { /* sentinel */ },
}; };
MODULE_DEVICE_TABLE(of, ktd2692_match);
static struct platform_driver ktd2692_driver = { static struct platform_driver ktd2692_driver = {
.driver = { .driver = {
......
...@@ -1080,6 +1080,7 @@ static const struct of_device_id max77693_led_dt_match[] = { ...@@ -1080,6 +1080,7 @@ static const struct of_device_id max77693_led_dt_match[] = {
{ .compatible = "maxim,max77693-led" }, { .compatible = "maxim,max77693-led" },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, max77693_led_dt_match);
static struct platform_driver max77693_led_driver = { static struct platform_driver max77693_led_driver = {
.probe = max77693_led_probe, .probe = max77693_led_probe,
......
...@@ -337,6 +337,7 @@ static const struct of_device_id of_ns2_leds_match[] = { ...@@ -337,6 +337,7 @@ static const struct of_device_id of_ns2_leds_match[] = {
{ .compatible = "lacie,ns2-leds", }, { .compatible = "lacie,ns2-leds", },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, of_ns2_leds_match);
#endif /* CONFIG_OF_GPIO */ #endif /* CONFIG_OF_GPIO */
struct ns2_led_priv { struct ns2_led_priv {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment