Skip to content

Commit 68a25c3

Browse files
author
Bartosz Golaszewski
committed
Merge tag 'intel-gpio-v6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next
intel-gpio for v6.10-1 * New driver for vGPIO controller on Intel Granite Rapids-D * Update ACPI GPIO library to unify the IRQ code path * Better GPIO IRQ line labeling for ACPI * Switched Intel SCH driver to use "mapped" I/O accessors The following is an automated git shortlog grouped by driver: Add Intel Granite Rapids-D vGPIO driver: - Add Intel Granite Rapids-D vGPIO driver crystalcove: - Use -ENOTSUPP consistently gpiolib: - acpi: Set label for IRQ only lines - acpi: Add fwnode name to the GPIO interrupt label - acpi: Pass con_id instead of property into acpi_dev_gpio_irq_get_by() - acpi: Move acpi_can_fallback_to_crs() out of __acpi_find_gpio() - acpi: Simplify error handling in __acpi_find_gpio() - acpi: Extract __acpi_find_gpio() helper - acpi: Check for errors first in acpi_find_gpio() - acpi: Remove never true check in acpi_get_gpiod_by_index() sch: - Utilise temporary variable for struct device - Switch to memory mapped IO accessors wcove: - Use -ENOTSUPP consistently
2 parents 5539287 + ecc4b14 commit 68a25c3

File tree

12 files changed

+470
-51
lines changed

12 files changed

+470
-51
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10895,6 +10895,7 @@ L: [email protected]
1089510895
S: Supported
1089610896
T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
1089710897
F: drivers/gpio/gpio-elkhartlake.c
10898+
F: drivers/gpio/gpio-graniterapids.c
1089810899
F: drivers/gpio/gpio-ich.c
1089910900
F: drivers/gpio/gpio-merrifield.c
1090010901
F: drivers/gpio/gpio-ml-ioh.c

drivers/gpio/Kconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,24 @@ config GPIO_GENERIC_PLATFORM
312312
help
313313
Say yes here to support basic platform_device memory-mapped GPIO controllers.
314314

315+
config GPIO_GRANITERAPIDS
316+
tristate "Intel Granite Rapids-D vGPIO support"
317+
depends on X86 || COMPILE_TEST
318+
select GPIOLIB_IRQCHIP
319+
help
320+
Select this to enable virtual GPIO support on platforms with the
321+
following SoCs:
322+
323+
- Intel Granite Rapids-D
324+
325+
The driver enables basic GPIO functionality and implements interrupt
326+
support. The virtual GPIO driver controls GPIO lines via a firmware
327+
interface. The physical GPIO pins reside on device that is external
328+
from the main SoC package, such as a BMC or a CPLD.
329+
330+
To compile this driver as a module, choose M here: the module will
331+
be called gpio-graniterapids.
332+
315333
config GPIO_GRGPIO
316334
tristate "Aeroflex Gaisler GRGPIO support"
317335
depends on OF_GPIO

drivers/gpio/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ obj-$(CONFIG_GPIO_FTGPIO010) += gpio-ftgpio010.o
6666
obj-$(CONFIG_GPIO_FXL6408) += gpio-fxl6408.o
6767
obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o
6868
obj-$(CONFIG_GPIO_GPIO_MM) += gpio-gpio-mm.o
69+
obj-$(CONFIG_GPIO_GRANITERAPIDS) += gpio-graniterapids.o
6970
obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o
7071
obj-$(CONFIG_GPIO_GW_PLD) += gpio-gw-pld.o
7172
obj-$(CONFIG_GPIO_HISI) += gpio-hisi.o

drivers/gpio/gpio-crystalcove.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static inline int to_reg(int gpio, enum ctrl_register reg_type)
9292
case 0x5e:
9393
return GPIOPANELCTL;
9494
default:
95-
return -EOPNOTSUPP;
95+
return -ENOTSUPP;
9696
}
9797
}
9898

0 commit comments

Comments
 (0)