Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: (61 commits) gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming mcp23s08: add i2c support mcp23s08: isolate spi specific parts mcp23s08: get rid of setup/teardown callbacks gpio/tegra: dt: add binding for gpio polarity mcp23s08: remove unused work queue gpio/da9052: remove a redundant assignment for gpio->da9052 gpio/mxc: add device tree probe support ARM: mxc: use ARCH_NR_GPIOS to define gpio number gpio/mxc: get rid of the uses of cpu_is_mx() gpio/mxc: add missing initialization of basic_mmio_gpio shadow variables gpio: Move mpc5200 gpio driver to drivers/gpio GPIO: DA9052 GPIO module v3 gpio/tegra: Use engineering names in DT compatible property of/gpio: Add new method for getting gpios under different property names gpio/dt: Refine GPIO device tree binding gpio/ml-ioh: fix off-by-one for displaying variable i in dev_err gpio/pca953x: Deprecate meaningless device-tree bindings gpio/pca953x: Remove dynamic platform data pointer gpio/pca953x: Fix IRQ support. ...
This commit is contained in:
@ -92,7 +92,7 @@ config LEDS_NET48XX
|
||||
config LEDS_NET5501
|
||||
tristate "LED Support for Soekris net5501 series Error LED"
|
||||
depends on LEDS_TRIGGERS
|
||||
depends on X86 && LEDS_GPIO_PLATFORM && GPIO_CS5535
|
||||
depends on X86 && GPIO_CS5535
|
||||
select LEDS_TRIGGER_DEFAULT_ON
|
||||
default n
|
||||
help
|
||||
@ -182,23 +182,6 @@ config LEDS_GPIO
|
||||
defined as platform devices and/or OpenFirmware platform devices.
|
||||
The code to use these bindings can be selected below.
|
||||
|
||||
config LEDS_GPIO_PLATFORM
|
||||
bool "Platform device bindings for GPIO LEDs"
|
||||
depends on LEDS_GPIO
|
||||
default y
|
||||
help
|
||||
Let the leds-gpio driver drive LEDs which have been defined as
|
||||
platform devices. If you don't know what this means, say yes.
|
||||
|
||||
config LEDS_GPIO_OF
|
||||
bool "OpenFirmware platform device bindings for GPIO LEDs"
|
||||
depends on LEDS_GPIO && OF_DEVICE
|
||||
default y
|
||||
help
|
||||
Let the leds-gpio driver drive LEDs which have been defined as
|
||||
of_platform devices. For instance, LEDs which are listed in a "dts"
|
||||
file.
|
||||
|
||||
config LEDS_LP3944
|
||||
tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"
|
||||
depends on LEDS_CLASS
|
||||
|
@ -165,7 +165,7 @@ static inline int sizeof_gpio_leds_priv(int num_leds)
|
||||
}
|
||||
|
||||
/* Code to create from OpenFirmware platform devices */
|
||||
#ifdef CONFIG_LEDS_GPIO_OF
|
||||
#ifdef CONFIG_OF_GPIO
|
||||
static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *np = pdev->dev.of_node, *child;
|
||||
@ -223,13 +223,13 @@ static const struct of_device_id of_gpio_leds_match[] = {
|
||||
{ .compatible = "gpio-leds", },
|
||||
{},
|
||||
};
|
||||
#else
|
||||
#else /* CONFIG_OF_GPIO */
|
||||
static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#define of_gpio_leds_match NULL
|
||||
#endif
|
||||
#endif /* CONFIG_OF_GPIO */
|
||||
|
||||
|
||||
static int __devinit gpio_led_probe(struct platform_device *pdev)
|
||||
|
Reference in New Issue
Block a user