Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed16756 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fix from Linus Walleij:
 "A single pin control fix for Intel machines, affecting a bunch of
  Chromebooks. Nothing else collected up amazingly"

* tag 'pinctrl-v4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: cherryview: Mask all interrupts on Intel_Strago based systems
parents e7ae59cb d2b3c353

drivers/pinctrl/intel/pinctrl-cherryview.c

+16 −0
Original line number Diff line number Diff line
@@ -1620,6 +1620,22 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) 
			clear_bit(i, chip->irq.valid_mask);

	}



	/*

	 * The same set of machines in chv_no_valid_mask[] have incorrectly

	 * configured GPIOs that generate spurious interrupts so we use

	 * this same list to apply another quirk for them.

	 *

	 * See also https://bugzilla.kernel.org/show_bug.cgi?id=197953.

	 */

	if (!need_valid_mask) {

		/*

		 * Mask all interrupts the community is able to generate

		 * but leave the ones that can only generate GPEs unmasked.

		 */

		chv_writel(GENMASK(31, pctrl->community->nirqs),

			   pctrl->regs + CHV_INTMASK);

	}



	/* Clear all interrupts */

	chv_writel(0xffff, pctrl->regs + CHV_INTSTAT);