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

Commit a6ca2e10 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

ssb: add gpio_to_irq 



The old bcm47xx gpio code had support for gpio_to_irq, but the new
code did not provide this function, but returned -ENXIO all the time.
This patch adds the missing function.

arch/mips/bcm47xx/wgt634u.c calls gpio_to_irq() and got the correct irq
number with the old gpio handling code. With this patch the code in
wgt634u.c should work again. I do not have a wgt634u to test this.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5b2e2ecc

drivers/ssb/driver_gpio.c

+22 −0
Original line number Diff line number Diff line
@@ -74,6 +74,16 @@ static void ssb_gpio_chipco_free(struct gpio_chip *chip, unsigned gpio) 
	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);

}



static int ssb_gpio_chipco_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	struct ssb_bus *bus = ssb_gpio_get_bus(chip);



	if (bus->bustype == SSB_BUSTYPE_SSB)

		return ssb_mips_irq(bus->chipco.dev) + 2;

	else

		return -EINVAL;

}



static int ssb_gpio_chipco_init(struct ssb_bus *bus)

{

	struct gpio_chip *chip = &bus->gpio;
@@ -86,6 +96,7 @@ static int ssb_gpio_chipco_init(struct ssb_bus *bus) 
	chip->set		= ssb_gpio_chipco_set_value;

	chip->direction_input	= ssb_gpio_chipco_direction_input;

	chip->direction_output	= ssb_gpio_chipco_direction_output;

	chip->to_irq		= ssb_gpio_chipco_to_irq;

	chip->ngpio		= 16;

	/* There is just one SoC in one device and its GPIO addresses should be

	 * deterministic to address them more easily. The other buses could get
@@ -134,6 +145,16 @@ static int ssb_gpio_extif_direction_output(struct gpio_chip *chip, 
	return 0;

}



static int ssb_gpio_extif_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	struct ssb_bus *bus = ssb_gpio_get_bus(chip);



	if (bus->bustype == SSB_BUSTYPE_SSB)

		return ssb_mips_irq(bus->extif.dev) + 2;

	else

		return -EINVAL;

}



static int ssb_gpio_extif_init(struct ssb_bus *bus)

{

	struct gpio_chip *chip = &bus->gpio;
@@ -144,6 +165,7 @@ static int ssb_gpio_extif_init(struct ssb_bus *bus) 
	chip->set		= ssb_gpio_extif_set_value;

	chip->direction_input	= ssb_gpio_extif_direction_input;

	chip->direction_output	= ssb_gpio_extif_direction_output;

	chip->to_irq		= ssb_gpio_extif_to_irq;

	chip->ngpio		= 5;

	/* There is just one SoC in one device and its GPIO addresses should be

	 * deterministic to address them more easily. The other buses could get

include/linux/ssb/ssb_driver_mips.h

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore) 
{

}



static inline unsigned int ssb_mips_irq(struct ssb_device *dev)

{

	return 0;

}



#endif /* CONFIG_SSB_DRIVER_MIPS */



#endif /* LINUX_SSB_MIPSCORE_H_ */