History

Merge tag 'gpio-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

Pull GPIO fixes from Linus Walleij: "Here us a bunch of patches for the v3.13 series. Most important stuff is related to fixes and documentation for the new GPIO descriptor API. If the diffstat is scary you'll notice most of it is to Documentation/*: - A big slew of documentation for the gpiod transition that happened in the merge window, no semantic effect, but we should provide proper documentation with the new API. - Fix flags related to the new API. - Fix to the find_chip_by_name() lookup function related to the new API. - Fix of_find_gpio() when not using device tree. - Bug fix for the TB10x direction setting. - Error path fixes from Dan Carpenter. - Nasty IRQdomain bug relating to taking an unitialized spinlock. - Minor fixes here and there" * tag 'gpio-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio: bcm281xx: Fix return value of bcm_kona_gpio_get() gpio: pl061: move irqdomain initialization gpio: ucb1400: Add MODULE_ALIAS gpiolib: fix of_find_gpio() when OF not defined gpio: fix memory leak in error path gpio: rcar: NULL dereference on error in probe() gpio: msm: make msm_gpio.summary_irq signed for error handling gpio: mvebu: make mvchip->irqbase signed for error handling gpiolib: use dedicated flags for GPIO properties gpiolib: fix find_chip_by_name() Documentation: gpiolib: document new interface gpio: tb10x: Set output value before setting direction to output

Linus Torvalds committed 12 years ago

Commit dda9cc32 parents 962ba26 e2f0b0015 files · +713 −37Browse files

Showing the changes to include (1 of 15 files). Show all

Unified · Split

include/linux/gpio/driver.h+9−2
@@ -125,6 +125,13 @@ extern struct gpio_chip *gpiochip_find(void *data, · 124 unmodified lines
125int gpiod_lock_as_irq(struct gpio_desc *desc);125int gpiod_lock_as_irq(struct gpio_desc *desc);
126void gpiod_unlock_as_irq(struct gpio_desc *desc);126void gpiod_unlock_as_irq(struct gpio_desc *desc);
127 127
128enum gpio_lookup_flags {
129 GPIO_ACTIVE_HIGH = (0 << 0),
130 GPIO_ACTIVE_LOW = (1 << 0),
131 GPIO_OPEN_DRAIN = (1 << 1),
132 GPIO_OPEN_SOURCE = (1 << 2),
133};
134
128/**135/**
129 * Lookup table for associating GPIOs to specific devices and functions using136 * Lookup table for associating GPIOs to specific devices and functions using
130 * platform data.137 * platform data.
@@ -152,9 +159,9 @@ struct gpiod_lookup { · 21 unmodified lines
152 */159 */
153 unsigned int idx;160 unsigned int idx;
154 /*161 /*
155 * mask of GPIOF_* values162 * mask of GPIO_* values
156 */163 */
157 unsigned long flags;164 enum gpio_lookup_flags flags;
158};165};
159 166
160/*167/*