Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eda4020 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull GPIO fixes from Linus Walleij:
 "All but one are long-standing bug fixes that are also tagged for
  stable

   - Driver bug fixes for SH PFC, TWL4030, MSM and RCAR.

   - Update the MAINTAINERS"

* tag 'gpio-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: rcar: Fix level interrupt handling
  gpio: msm: Fix irq mask/unmask by writing bits instead of numbers
  gpio: twl4030: Fix regression for twl gpio LED output
  sh-pfc: Fix PINMUX_GPIO macro
  MAINTAINERS: update GPIO maintainers entry
parents a5905a92 8808b64d

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -3761,9 +3761,11 @@ F: include/uapi/linux/gigaset_dev.h 


GPIO SUBSYSTEM

M:	Linus Walleij <linus.walleij@linaro.org>

S:	Maintained

M:	Alexandre Courbot <gnurou@gmail.com>

L:	linux-gpio@vger.kernel.org

F:	Documentation/gpio.txt

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git

S:	Maintained

F:	Documentation/gpio/

F:	drivers/gpio/

F:	include/linux/gpio*

F:	include/asm-generic/gpio.h

drivers/gpio/gpio-msm-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static void msm_gpio_irq_mask(struct irq_data *d) 


	spin_lock_irqsave(&tlmm_lock, irq_flags);

	writel(TARGET_PROC_NONE, GPIO_INTR_CFG_SU(gpio));

	clear_gpio_bits(INTR_RAW_STATUS_EN | INTR_ENABLE, GPIO_INTR_CFG(gpio));

	clear_gpio_bits(BIT(INTR_RAW_STATUS_EN) | BIT(INTR_ENABLE), GPIO_INTR_CFG(gpio));

	__clear_bit(gpio, msm_gpio.enabled_irqs);

	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

}
@@ -264,7 +264,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d) 


	spin_lock_irqsave(&tlmm_lock, irq_flags);

	__set_bit(gpio, msm_gpio.enabled_irqs);

	set_gpio_bits(INTR_RAW_STATUS_EN | INTR_ENABLE, GPIO_INTR_CFG(gpio));

	set_gpio_bits(BIT(INTR_RAW_STATUS_EN) | BIT(INTR_ENABLE), GPIO_INTR_CFG(gpio));

	writel(TARGET_PROC_SCORPION, GPIO_INTR_CFG_SU(gpio));

	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

}

drivers/gpio/gpio-rcar.c

+2 −1
Original line number Diff line number Diff line
@@ -169,7 +169,8 @@ static irqreturn_t gpio_rcar_irq_handler(int irq, void *dev_id) 
	u32 pending;

	unsigned int offset, irqs_handled = 0;



	while ((pending = gpio_rcar_read(p, INTDT))) {

	while ((pending = gpio_rcar_read(p, INTDT) &

			  gpio_rcar_read(p, INTMSK))) {

		offset = __ffs(pending);

		gpio_rcar_write(p, INTCLR, BIT(offset));

		generic_handle_irq(irq_find_mapping(p->irq_domain, offset));

drivers/gpio/gpio-twl4030.c

+12 −3
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int twl_direction_in(struct gpio_chip *chip, unsigned offset) 
	if (offset < TWL4030_GPIO_MAX)

		ret = twl4030_set_gpio_direction(offset, 1);

	else

		ret = -EINVAL;

		ret = -EINVAL;	/* LED outputs can't be set as input */



	if (!ret)

		priv->direction &= ~BIT(offset);
@@ -354,11 +354,20 @@ static void twl_set(struct gpio_chip *chip, unsigned offset, int value) 
static int twl_direction_out(struct gpio_chip *chip, unsigned offset, int value)

{

	struct gpio_twl4030_priv *priv = to_gpio_twl4030(chip);

	int ret = -EINVAL;

	int ret = 0;



	mutex_lock(&priv->mutex);

	if (offset < TWL4030_GPIO_MAX)

	if (offset < TWL4030_GPIO_MAX) {

		ret = twl4030_set_gpio_direction(offset, 0);

		if (ret) {

			mutex_unlock(&priv->mutex);

			return ret;

		}

	}



	/*

	 *  LED gpios i.e. offset >= TWL4030_GPIO_MAX are always output

	 */



	priv->direction |= BIT(offset);

	mutex_unlock(&priv->mutex);

drivers/pinctrl/sh-pfc/sh_pfc.h

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ struct sh_pfc_soc_info { 
#define PINMUX_GPIO(_pin)						\

	[GPIO_##_pin] = {						\

		.pin = (u16)-1,						\

		.name = __stringify(name),				\

		.name = __stringify(GPIO_##_pin),			\

		.enum_id = _pin##_DATA,					\

	}