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

Commit 29059af3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull late GPIO fixes from Linus Walleij:
 "Here are the (hopefully) last GPIO fixes for v4.0.  Nothing
  controversial whatsoever, just fixes:

   - syscon GPIO fix for Keystone DSP GPIOs

   - pin number translation fix for ACPI GPIO

   - a smallish compiler warning fix on the mpc8xxx driver"

* tag 'gpio-v4.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: syscon: reduce message level when direction reg offset not in dt
  gpiolib: translate pin number in GPIO ACPI callbacks
  gpio: mpc8xxx: remove __initdata annotation for mpc8xxx_gpio_ids[]
parents e42391cd c6ac19da

drivers/gpio/gpio-mpc8xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static struct irq_domain_ops mpc8xxx_gpio_irq_ops = { 
	.xlate	= irq_domain_xlate_twocell,

};



static struct of_device_id mpc8xxx_gpio_ids[] __initdata = {

static struct of_device_id mpc8xxx_gpio_ids[] = {

	{ .compatible = "fsl,mpc8349-gpio", },

	{ .compatible = "fsl,mpc8572-gpio", },

	{ .compatible = "fsl,mpc8610-gpio", },

drivers/gpio/gpio-syscon.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static int syscon_gpio_probe(struct platform_device *pdev) 
		ret = of_property_read_u32_index(np, "gpio,syscon-dev", 2,

						 &priv->dir_reg_offset);

		if (ret)

			dev_err(dev, "can't read the dir register offset!\n");

			dev_dbg(dev, "can't read the dir register offset!\n");



		priv->dir_reg_offset <<= 3;

	}

drivers/gpio/gpiolib-acpi.c

+10 −0
Original line number Diff line number Diff line
@@ -201,6 +201,10 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares, 
	if (!handler)

		return AE_BAD_PARAMETER;



	pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin);

	if (pin < 0)

		return AE_BAD_PARAMETER;



	desc = gpiochip_request_own_desc(chip, pin, "ACPI:Event");

	if (IS_ERR(desc)) {

		dev_err(chip->dev, "Failed to request GPIO\n");
@@ -551,6 +555,12 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, 
		struct gpio_desc *desc;

		bool found;



		pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin);

		if (pin < 0) {

			status = AE_BAD_PARAMETER;

			goto out;

		}



		mutex_lock(&achip->conn_lock);



		found = false;