Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ANDROID: Fix kernelci build-break for arm32

Browse source 
Fixes recent build-break for arm32 builds:

drivers/gpio/gpiolib.c:1925:26: error: implicit declaration of
function ‘irq_domain_add_hierarchy’; did you mean
‘irq_domain_is_hierarchy’?

Fixes: 4fd4604c8b ("ANDROID: GKI: gpio: Add support for hierarchical
IRQ domains")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I972e8bc000a203dac30ce860a7f29c7309556602
This commit is contained in:
Todd Kjos 2020-03-10 11:03:58 -07:00
parent 3d86bc0840
commit 6b7c9207cb
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpio/gpiolib.c
View file

@ -1909,7 +1909,9 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
type = IRQ_TYPE_NONE;
}
#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
if (!gpiochip->to_irq)
#endif
gpiochip->to_irq = gpiochip_to_irq;
gpiochip->irq.default_type = type;
@ -1921,11 +1923,13 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
else
ops = &gpiochip_domain_ops;
#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
if (gpiochip->irq.parent_domain)
gpiochip->irq.domain = irq_domain_add_hierarchy(gpiochip->irq.parent_domain,
0, gpiochip->ngpio,
np, ops, gpiochip);
else
#endif
gpiochip->irq.domain = irq_domain_add_simple(np, gpiochip->ngpio,
gpiochip->irq.first,
ops, gpiochip);

2
include/linux/gpio/driver.h
View file

@ -47,11 +47,13 @@ struct gpio_irq_chip {
*/
const struct irq_domain_ops *domain_ops;
#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
/**
* @parent_domain:
*
*/
struct irq_domain *parent_domain;
#endif
/**
* @handler: