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

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

bcma: 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.

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

drivers/bcma/driver_gpio.c

+11 −0
Original line number Diff line number Diff line
@@ -73,6 +73,16 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio) 
	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);

}



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

{

	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);



	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)

		return bcma_core_irq(cc->core);

	else

		return -EINVAL;

}



int bcma_gpio_init(struct bcma_drv_cc *cc)

{

	struct gpio_chip *chip = &cc->gpio;
@@ -85,6 +95,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	chip->set		= bcma_gpio_set_value;

	chip->direction_input	= bcma_gpio_direction_input;

	chip->direction_output	= bcma_gpio_direction_output;

	chip->to_irq		= bcma_gpio_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

include/linux/bcma/bcma_driver_mips.h

+7 −2
Original line number Diff line number Diff line
@@ -42,13 +42,18 @@ struct bcma_drv_mips { 
#ifdef CONFIG_BCMA_DRIVER_MIPS

extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);

extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);



extern unsigned int bcma_core_irq(struct bcma_device *core);

#else

static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }

static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }



static inline unsigned int bcma_core_irq(struct bcma_device *core)

{

	return 0;

}

#endif



extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);



extern unsigned int bcma_core_irq(struct bcma_device *core);



#endif /* LINUX_BCMA_DRIVER_MIPS_H_ */