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

Commit 21d2f8dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull gpio fixes from Linus Walleij:
 - Fix a resource leak in the SCH driver
 - Fix the register address calculation in the MSIC driver
 - Fix the PXA driver's devicetree functions
 - Delete redundant shadow variable leftovers in the MXC driver
 - Specify the GPIO base for the device tree probe in the MXC driver
 - Add a modalias for the i.MX driver
 - Fix off-by-one bug in the Samsung driver
 - Fix erroneous errorpath in the Langwell driver

* tag 'gpio-fixes-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  drivers/gpio/gpio-langwell.c: fix error return code
  gpio: samsung: Fix off-by-one bug in gpio addresses
  ARM: dts: imx: add alias for gpio
  gpio/mxc: specify gpio base for device tree probe
  gpio/mxc: remove redundant shadow variables initialization
  GPIO: gpio-pxa: fix devicetree functions
  gpio: msic: Fix calculating register address in msic_gpio_to_oreg()
  gpio-sch: Fix leak of resource
parents c8dfbf48 d6a2b7ba

arch/arm/boot/dts/imx27.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
		serial3 = &uart4;

		serial4 = &uart5;

		serial5 = &uart6;

		gpio0 = &gpio1;

		gpio1 = &gpio2;

		gpio2 = &gpio3;

		gpio3 = &gpio4;

		gpio4 = &gpio5;

		gpio5 = &gpio6;

	};



	avic: avic-interrupt-controller@e0000000 {

arch/arm/boot/dts/imx51.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		gpio0 = &gpio1;

		gpio1 = &gpio2;

		gpio2 = &gpio3;

		gpio3 = &gpio4;

	};



	tzic: tz-interrupt-controller@e0000000 {

arch/arm/boot/dts/imx53.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ 
		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

		gpio0 = &gpio1;

		gpio1 = &gpio2;

		gpio2 = &gpio3;

		gpio3 = &gpio4;

		gpio4 = &gpio5;

		gpio5 = &gpio6;

		gpio6 = &gpio7;

	};



	tzic: tz-interrupt-controller@0fffc000 {

arch/arm/boot/dts/imx6q.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ 
		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

		gpio0 = &gpio1;

		gpio1 = &gpio2;

		gpio2 = &gpio3;

		gpio3 = &gpio4;

		gpio4 = &gpio5;

		gpio5 = &gpio6;

		gpio6 = &gpio7;

	};



	cpus {

drivers/gpio/gpio-langwell.c

+5 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 
	resource_size_t start, len;

	struct lnw_gpio *lnw;

	u32 gpio_base;

	int retval = 0;

	int retval;

	int ngpio = id->driver_data;



	retval = pci_enable_device(pdev);
@@ -357,6 +357,7 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 
	base = ioremap_nocache(start, len);

	if (!base) {

		dev_err(&pdev->dev, "error mapping bar1\n");

		retval = -EFAULT;

		goto err3;

	}

	gpio_base = *((u32 *)base + 1);
@@ -381,8 +382,10 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 


	lnw->domain = irq_domain_add_linear(pdev->dev.of_node, ngpio,

					    &lnw_gpio_irq_ops, lnw);

	if (!lnw->domain)

	if (!lnw->domain) {

		retval = -ENOMEM;

		goto err3;

	}



	lnw->reg_base = base;

	lnw->chip.label = dev_name(&pdev->dev);