tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds e6827baf dc847d5b

+9 -2
+2 -1
drivers/leds/Kconfig
··· 170 170 171 171 config LEDS_IPAQ_MICRO 172 172 tristate "LED Support for the Compaq iPAQ h3xxx" 173 + depends on LEDS_CLASS 173 174 depends on MFD_IPAQ_MICRO 174 175 help 175 176 Choose this option if you want to use the notification LED on ··· 230 229 tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501" 231 230 depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501 232 231 select FW_LOADER 233 - select FW_LOADER_USER_HELPER_FALLBACK 232 + select FW_LOADER_USER_HELPER 234 233 help 235 234 This option supports common operations for LP5521/5523/55231/5562/8501 236 235 devices.
+2 -1
drivers/leds/leds-aat1290.c
··· 331 331 cfg->max_brightness = b + 1; 332 332 } 333 333 334 - int init_mm_current_scale(struct aat1290_led *led, 334 + static int init_mm_current_scale(struct aat1290_led *led, 335 335 struct aat1290_led_config_data *cfg) 336 336 { 337 337 int max_mm_current_percent[] = { 20, 22, 25, 28, 32, 36, 40, 45, 50, 56, ··· 559 559 { .compatible = "skyworks,aat1290" }, 560 560 {}, 561 561 }; 562 + MODULE_DEVICE_TABLE(of, aat1290_led_dt_match); 562 563 563 564 static struct platform_driver aat1290_led_driver = { 564 565 .probe = aat1290_led_probe,
+1
drivers/leds/leds-bcm6328.c
··· 395 395 { .compatible = "brcm,bcm6328-leds", }, 396 396 { }, 397 397 }; 398 + MODULE_DEVICE_TABLE(of, bcm6328_leds_of_match); 398 399 399 400 static struct platform_driver bcm6328_leds_driver = { 400 401 .probe = bcm6328_leds_probe,
+1
drivers/leds/leds-bcm6358.c
··· 226 226 { .compatible = "brcm,bcm6358-leds", }, 227 227 { }, 228 228 }; 229 + MODULE_DEVICE_TABLE(of, bcm6358_leds_of_match); 229 230 230 231 static struct platform_driver bcm6358_leds_driver = { 231 232 .probe = bcm6358_leds_probe,
+1
drivers/leds/leds-ktd2692.c
··· 426 426 { .compatible = "kinetic,ktd2692", }, 427 427 { /* sentinel */ }, 428 428 }; 429 + MODULE_DEVICE_TABLE(of, ktd2692_match); 429 430 430 431 static struct platform_driver ktd2692_driver = { 431 432 .driver = {
+1
drivers/leds/leds-max77693.c
··· 1080 1080 { .compatible = "maxim,max77693-led" }, 1081 1081 {}, 1082 1082 }; 1083 + MODULE_DEVICE_TABLE(of, max77693_led_dt_match); 1083 1084 1084 1085 static struct platform_driver max77693_led_driver = { 1085 1086 .probe = max77693_led_probe,
+1
drivers/leds/leds-ns2.c
··· 337 337 { .compatible = "lacie,ns2-leds", }, 338 338 {}, 339 339 }; 340 + MODULE_DEVICE_TABLE(of, of_ns2_leds_match); 340 341 #endif /* CONFIG_OF_GPIO */ 341 342 342 343 struct ns2_led_priv {