Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'gpio-fixes-for-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski:
- fix interrupt support in gpio-pca953x
- fix configfs attribute locking in gpio-sim
- limit the visibility of the GPIO_GRGPIO Kconfig symbol to OF systems
only
- update MAINTAINERS
* tag 'gpio-fixes-for-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
MAINTAINERS: Use my kernel.org address for ACPI GPIO work
gpio: GPIO_GRGPIO should depend on OF
gpio: sim: lock hog configfs items if present
gpio: pca953x: Improve interrupt support
+10
-25
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
9878
9878
F: drivers/staging/gpib/
9879
9879
9880
9880
GPIO ACPI SUPPORT
9881
-
M: Mika Westerberg <mika.westerberg@linux.intel.com>
9881
+
M: Mika Westerberg <westeri@kernel.org>
9882
9882
M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
9883
9883
L: linux-gpio@vger.kernel.org
9884
9884
L: linux-acpi@vger.kernel.org
+1
drivers/gpio/Kconfig
+1
drivers/gpio/Kconfig
-19
drivers/gpio/gpio-pca953x.c
-19
drivers/gpio/gpio-pca953x.c
···
841
841
DECLARE_BITMAP(trigger, MAX_LINE);
842
842
int ret;
843
843
844
-
if (chip->driver_data & PCA_PCAL) {
845
-
/* Read the current interrupt status from the device */
846
-
ret = pca953x_read_regs(chip, PCAL953X_INT_STAT, trigger);
847
-
if (ret)
848
-
return false;
849
-
850
-
/* Check latched inputs and clear interrupt status */
851
-
ret = pca953x_read_regs(chip, chip->regs->input, cur_stat);
852
-
if (ret)
853
-
return false;
854
-
855
-
/* Apply filter for rising/falling edge selection */
856
-
bitmap_replace(new_stat, chip->irq_trig_fall, chip->irq_trig_raise, cur_stat, gc->ngpio);
857
-
858
-
bitmap_and(pending, new_stat, trigger, gc->ngpio);
859
-
860
-
return !bitmap_empty(pending, gc->ngpio);
861
-
}
862
-
863
844
ret = pca953x_read_regs(chip, chip->regs->input, cur_stat);
864
845
if (ret)
865
846
return false;
+8
-5
drivers/gpio/gpio-sim.c
+8
-5
drivers/gpio/gpio-sim.c
···
1028
1028
struct configfs_subsystem *subsys = dev->group.cg_subsys;
1029
1029
struct gpio_sim_bank *bank;
1030
1030
struct gpio_sim_line *line;
1031
+
struct config_item *item;
1031
1032
1032
1033
/*
1033
-
* The device only needs to depend on leaf line entries. This is
1034
+
* The device only needs to depend on leaf entries. This is
1034
1035
* sufficient to lock up all the configfs entries that the
1035
1036
* instantiated, alive device depends on.
1036
1037
*/
1037
1038
list_for_each_entry(bank, &dev->bank_list, siblings) {
1038
1039
list_for_each_entry(line, &bank->line_list, siblings) {
1040
+
item = line->hog ? &line->hog->item
1041
+
: &line->group.cg_item;
1042
+
1039
1043
if (lock)
1040
-
WARN_ON(configfs_depend_item_unlocked(
1041
-
subsys, &line->group.cg_item));
1044
+
WARN_ON(configfs_depend_item_unlocked(subsys,
1045
+
item));
1042
1046
else
1043
-
configfs_undepend_item_unlocked(
1044
-
&line->group.cg_item);
1047
+
configfs_undepend_item_unlocked(item);
1045
1048
}
1046
1049
}
1047
1050
}