Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'gpio-v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij:
"Just a smallish OF fix and a driver fix:
- OF flag fix for special regulator flags
- fix up the Uniphier IRQ callback"
* tag 'gpio-v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio: uniphier: set legitimate irq trigger type in .to_irq hook
gpio: of: Handle fixed regulator flags properly
+7
-2
+5
-1
drivers/gpio/gpio-uniphier.c
+5
-1
drivers/gpio/gpio-uniphier.c
···
181
181
fwspec.fwnode = of_node_to_fwnode(chip->parent->of_node);
182
182
fwspec.param_count = 2;
183
183
fwspec.param[0] = offset - UNIPHIER_GPIO_IRQ_OFFSET;
184
-
fwspec.param[1] = IRQ_TYPE_NONE;
184
+
/*
185
+
* IRQ_TYPE_NONE is rejected by the parent irq domain. Set LEVEL_HIGH
186
+
* temporarily. Anyway, ->irq_set_type() will override it later.
187
+
*/
188
+
fwspec.param[1] = IRQ_TYPE_LEVEL_HIGH;
185
189
186
190
return irq_create_fwspec_mapping(&fwspec);
187
191
}
+2
-1
drivers/gpio/gpiolib-of.c
+2
-1
drivers/gpio/gpiolib-of.c
···
64
64
* Note that active low is the default.
65
65
*/
66
66
if (IS_ENABLED(CONFIG_REGULATOR) &&
67
-
(of_device_is_compatible(np, "reg-fixed-voltage") ||
67
+
(of_device_is_compatible(np, "regulator-fixed") ||
68
+
of_device_is_compatible(np, "reg-fixed-voltage") ||
68
69
of_device_is_compatible(np, "regulator-gpio"))) {
69
70
/*
70
71
* The regulator GPIO handles are specified such that the