Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds (61abfd2d) · Commits · 戴 / test

Documentation/leds-lp3944.txt

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		Kernel driver lp3944
		====================

		* National Semiconductor LP3944 Fun-light Chip
		Prefix: 'lp3944'
		Addresses scanned: None (see the Notes section below)
		Datasheet: Publicly available at the National Semiconductor website
		http://www.national.com/pf/LP/LP3944.html

		Authors:
		Antonio Ospite <ospite@studenti.unina.it>


		Description
		-----------
		The LP3944 is a helper chip that can drive up to 8 leds, with two programmable
		DIM modes; it could even be used as a gpio expander but this driver assumes it
		is used as a led controller.

		The DIM modes are used to set _blink_ patterns for leds, the pattern is
		specified supplying two parameters:
		- period: from 0s to 1.6s
		- duty cycle: percentage of the period the led is on, from 0 to 100

		Setting a led in DIM0 or DIM1 mode makes it blink according to the pattern.
		See the datasheet for details.

		LP3944 can be found on Motorola A910 smartphone, where it drives the rgb
		leds, the camera flash light and the lcds power.


		Notes
		-----
		The chip is used mainly in embedded contexts, so this driver expects it is
		registered using the i2c_board_info mechanism.

		To register the chip at address 0x60 on adapter 0, set the platform data
		according to include/linux/leds-lp3944.h, set the i2c board info:

		static struct i2c_board_info __initdata a910_i2c_board_info[] = {
		{
		I2C_BOARD_INFO("lp3944", 0x60),
		.platform_data = &a910_lp3944_leds,
		},
		};

		and register it in the platform init function

		i2c_register_board_info(0, a910_i2c_board_info,
		ARRAY_SIZE(a910_i2c_board_info));

Documentation/powerpc/dts-bindings/gpio/led.txt

+16 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,17 @@ LED sub-node properties:
		string defining the trigger assigned to the LED. Current triggers are:
		"backlight" - LED will act as a back-light, controlled by the framebuffer
		system
		"default-on" - LED will turn on
		"default-on" - LED will turn on, but see "default-state" below
		"heartbeat" - LED "double" flashes at a load average based rate
		"ide-disk" - LED indicates disk activity
		"timer" - LED flashes at a fixed, configurable rate
		- default-state: (optional) The initial state of the LED. Valid
		values are "on", "off", and "keep". If the LED is already on or off
		and the default-state property is set the to same value, then no
		glitch should be produced where the LED momentarily turns off (or
		on). The "keep" setting will keep the LED at whatever its current
		state is, without producing a glitch. The default is off if this
		property is not present.

		Examples:

		@@ -30,14 +37,22 @@ leds {
		gpios = <&mcu_pio 0 1>; /* Active low */
		linux,default-trigger = "ide-disk";
		};

		fault {
		gpios = <&mcu_pio 1 0>;
		/* Keep LED on if BIOS detected hardware fault */
		default-state = "keep";
		};
		};

		run-control {
		compatible = "gpio-leds";
		red {
		gpios = <&mpc8572 6 0>;
		default-state = "off";
		};
		green {
		gpios = <&mpc8572 7 0>;
		default-state = "on";
		};
		}

drivers/leds/Kconfig

+8 −6

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ config LEDS_ALIX2
		depends on LEDS_CLASS && X86 && EXPERIMENTAL
		help
		This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs.
		You have to set leds-alix2.force=1 for boards with Award BIOS.

		config LEDS_H1940
		tristate "LED Support for iPAQ H1940 device"
		@@ -145,15 +146,16 @@ config LEDS_GPIO_OF
		of_platform devices. For instance, LEDs which are listed in a "dts"
		file.

		config LEDS_LP5521
		tristate "LED Support for the LP5521 LEDs"
		config LEDS_LP3944
		tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"
		depends on LEDS_CLASS && I2C
		help
		If you say 'Y' here you get support for the National Semiconductor
		LP5521 LED driver used in n8x0 boards.
		This option enables support for LEDs connected to the National
		Semiconductor LP3944 Lighting Management Unit (LMU) also known as
		Fun Light Chip.

		This driver can be built as a module by choosing 'M'. The module
		will be called leds-lp5521.
		To compile this driver as a module, choose M here: the
		module will be called leds-lp3944.

		config LEDS_CLEVO_MAIL
		tristate "Mail LED on Clevo notebook"

drivers/leds/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
		obj-$(CONFIG_LEDS_SUNFIRE) += leds-sunfire.o
		obj-$(CONFIG_LEDS_PCA9532) += leds-pca9532.o
		obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
		obj-$(CONFIG_LEDS_LP3944) += leds-lp3944.o
		obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
		obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
		obj-$(CONFIG_LEDS_FSG) += leds-fsg.o

drivers/leds/leds-alix2.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@

		static int force = 0;
		module_param(force, bool, 0444);
		MODULE_PARM_DESC(force, "Assume system has ALIX.2 style LEDs");
		MODULE_PARM_DESC(force, "Assume system has ALIX.2/ALIX.3 style LEDs");

		struct alix_led {
		struct led_classdev cdev;
		@@ -155,6 +155,11 @@ static int __init alix_led_init(void)
		goto out;
		}

		/* enable output on GPIO for LED 1,2,3 */
		outl(1 << 6, 0x6104);
		outl(1 << 9, 0x6184);
		outl(1 << 11, 0x6184);

		pdev = platform_device_register_simple(KBUILD_MODNAME, -1, NULL, 0);
		if (!IS_ERR(pdev)) {
		ret = platform_driver_probe(&alix_led_driver, alix_led_probe);

Admin message