Commit 5f91b9ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - add a quirk to GPIO ACPI handling to ignore touchpad wakeups on GPD
   G1619-04

 - clear interrupt status bits (that may have been set before enabling
   the interrupts) after setting the interrupt type in gpio-eic-sprd

* tag 'gpio-fixes-for-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: eic-sprd: Clear interrupt after set the interrupt type
  gpiolib: acpi: Ignore touchpad wakeup on GPD G1619-04
parents 4aeb0837 84aef4ed

drivers/gpio/gpio-eic-sprd.c

+28 −4
Original line number Diff line number Diff line
@@ -330,20 +330,27 @@ static int sprd_eic_irq_set_type(struct irq_data *data, unsigned int flow_type) 
		switch (flow_type) {

		case IRQ_TYPE_LEVEL_HIGH:

			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IEV, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IC, 1);

			break;

		case IRQ_TYPE_LEVEL_LOW:

			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IEV, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IC, 1);

			break;

		case IRQ_TYPE_EDGE_RISING:

		case IRQ_TYPE_EDGE_FALLING:

		case IRQ_TYPE_EDGE_BOTH:

			state = sprd_eic_get(chip, offset);

			if (state)

			if (state) {

				sprd_eic_update(chip, offset,

						SPRD_EIC_DBNC_IEV, 0);

			else

				sprd_eic_update(chip, offset,

						SPRD_EIC_DBNC_IC, 1);

			} else {

				sprd_eic_update(chip, offset,

						SPRD_EIC_DBNC_IEV, 1);

				sprd_eic_update(chip, offset,

						SPRD_EIC_DBNC_IC, 1);

			}

			break;

		default:

			return -ENOTSUPP;
@@ -355,20 +362,27 @@ static int sprd_eic_irq_set_type(struct irq_data *data, unsigned int flow_type) 
		switch (flow_type) {

		case IRQ_TYPE_LEVEL_HIGH:

			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTPOL, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTCLR, 1);

			break;

		case IRQ_TYPE_LEVEL_LOW:

			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTPOL, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTCLR, 1);

			break;

		case IRQ_TYPE_EDGE_RISING:

		case IRQ_TYPE_EDGE_FALLING:

		case IRQ_TYPE_EDGE_BOTH:

			state = sprd_eic_get(chip, offset);

			if (state)

			if (state) {

				sprd_eic_update(chip, offset,

						SPRD_EIC_LATCH_INTPOL, 0);

			else

				sprd_eic_update(chip, offset,

						SPRD_EIC_LATCH_INTCLR, 1);

			} else {

				sprd_eic_update(chip, offset,

						SPRD_EIC_LATCH_INTPOL, 1);

				sprd_eic_update(chip, offset,

						SPRD_EIC_LATCH_INTCLR, 1);

			}

			break;

		default:

			return -ENOTSUPP;
@@ -382,29 +396,34 @@ static int sprd_eic_irq_set_type(struct irq_data *data, unsigned int flow_type) 
			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_edge_irq);

			break;

		case IRQ_TYPE_EDGE_FALLING:

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_edge_irq);

			break;

		case IRQ_TYPE_EDGE_BOTH:

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_edge_irq);

			break;

		case IRQ_TYPE_LEVEL_HIGH:

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_level_irq);

			break;

		case IRQ_TYPE_LEVEL_LOW:

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_level_irq);

			break;

		default:
@@ -417,29 +436,34 @@ static int sprd_eic_irq_set_type(struct irq_data *data, unsigned int flow_type) 
			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_edge_irq);

			break;

		case IRQ_TYPE_EDGE_FALLING:

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_edge_irq);

			break;

		case IRQ_TYPE_EDGE_BOTH:

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_edge_irq);

			break;

		case IRQ_TYPE_LEVEL_HIGH:

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_level_irq);

			break;

		case IRQ_TYPE_LEVEL_LOW:

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 1);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);

			irq_set_handler_locked(data, handle_level_irq);

			break;

		default:

drivers/gpio/gpiolib-acpi.c

+14 −0
Original line number Diff line number Diff line
@@ -1651,6 +1651,20 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = { 
			.ignore_interrupt = "INT33FC:00@3",

		},

	},

	{

		/*

		 * Spurious wakeups from TP_ATTN# pin

		 * Found in BIOS 0.35

		 * https://gitlab.freedesktop.org/drm/amd/-/issues/3073

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "GPD"),

			DMI_MATCH(DMI_PRODUCT_NAME, "G1619-04"),

		},

		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {

			.ignore_wake = "PNP0C50:00@8",

		},

	},

	{} /* Terminating entry */

};