Commit 813e6438 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "These are some GPIO regression fixes for v3.6:
   - Erroneous debug message from of_get_named_gpio_flags()
   - Make sure the MC9S08DZ60 GPIO driver depend on I2C being compiled
     in (not module) or allmodconfig breaks.
   - Check return value from irq_alloc_descs() in the Emma Mobile GPIO
     driver.
   - Assign the owner field for the rdc321x driver so the module won't
     be removed if it has active GPIOs."

* tag 'gpio-fixes-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: rdc321x: Prevent removal of modules exporting active GPIOs
  gpio: em: Fix checking return value of irq_alloc_descs
  gpio: mc9s08dz60: Fix build error if I2C=m
  gpio: Fix debug message in of_get_named_gpio_flags()
parents 5e682c0e 1146f882

drivers/gpio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ config GPIO_MAX732X_IRQ 


config GPIO_MC9S08DZ60

	bool "MX35 3DS BOARD MC9S08DZ60 GPIO functions"

	depends on I2C && MACH_MX35_3DS

	depends on I2C=y && MACH_MX35_3DS

	help

	  Select this to enable the MC9S08DZ60 GPIO driver

drivers/gpio/gpio-em.c

+2 −2
Original line number Diff line number Diff line
@@ -247,9 +247,9 @@ static int __devinit em_gio_irq_domain_init(struct em_gio_priv *p) 


	p->irq_base = irq_alloc_descs(pdata->irq_base, 0,

				      pdata->number_of_pins, numa_node_id());

	if (IS_ERR_VALUE(p->irq_base)) {

	if (p->irq_base < 0) {

		dev_err(&pdev->dev, "cannot get irq_desc\n");

		return -ENXIO;

		return p->irq_base;

	}

	pr_debug("gio: hw base = %d, nr = %d, sw base = %d\n",

		 pdata->gpio_base, pdata->number_of_pins, p->irq_base);

drivers/gpio/gpio-rdc321x.c

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev) 
	rdc321x_gpio_dev->reg2_data_base = r->start + 0x4;



	rdc321x_gpio_dev->chip.label = "rdc321x-gpio";

	rdc321x_gpio_dev->chip.owner = THIS_MODULE;

	rdc321x_gpio_dev->chip.direction_input = rdc_gpio_direction_input;

	rdc321x_gpio_dev->chip.direction_output = rdc_gpio_config;

	rdc321x_gpio_dev->chip.get = rdc_gpio_get_value;

drivers/gpio/gpiolib-of.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname, 
	gpiochip_find(&gg_data, of_gpiochip_find_and_xlate);



	of_node_put(gg_data.gpiospec.np);

	pr_debug("%s exited with status %d\n", __func__, ret);

	pr_debug("%s exited with status %d\n", __func__, gg_data.out_gpio);

	return gg_data.out_gpio;

}

EXPORT_SYMBOL(of_get_named_gpio_flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE