Commit 6b935ca2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux 

Pull GPIO regression fix from Grant Likely:
 "It took a while to work out the correct solution to this regression.
  It is sorted now.  This branch was constructed and tested by Tony.
  I've verified that it builds and signed the tag"

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
  gpio/omap: don't use linear domain mapping for OMAP1
parents 687058ae 397eada9

drivers/gpio/gpio-omap.c

+21 −1
Original line number Diff line number Diff line
@@ -1094,6 +1094,9 @@ static int omap_gpio_probe(struct platform_device *pdev) 
	const struct omap_gpio_platform_data *pdata;

	struct resource *res;

	struct gpio_bank *bank;

#ifdef CONFIG_ARCH_OMAP1

	int irq_base;

#endif



	match = of_match_device(of_match_ptr(omap_gpio_match), dev);
@@ -1135,11 +1138,28 @@ static int omap_gpio_probe(struct platform_device *pdev) 
				pdata->get_context_loss_count;

	}



#ifdef CONFIG_ARCH_OMAP1

	/*

	 * REVISIT: Once we have OMAP1 supporting SPARSE_IRQ, we can drop

	 * irq_alloc_descs() and irq_domain_add_legacy() and just use a

	 * linear IRQ domain mapping for all OMAP platforms.

	 */

	irq_base = irq_alloc_descs(-1, 0, bank->width, 0);

	if (irq_base < 0) {

		dev_err(dev, "Couldn't allocate IRQ numbers\n");

		return -ENODEV;

	}



	bank->domain = irq_domain_add_legacy(node, bank->width, irq_base,

					     0, &irq_domain_simple_ops, NULL);

#else

	bank->domain = irq_domain_add_linear(node, bank->width,

					     &irq_domain_simple_ops, NULL);

	if (!bank->domain)

#endif

	if (!bank->domain) {

		dev_err(dev, "Couldn't register an IRQ domain\n");

		return -ENODEV;

	}



	if (bank->regs->set_dataout && bank->regs->clr_dataout)

		bank->set_dataout = _set_gpio_dataout_reg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE