Commit 03fb681b authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

pinctrl: lynxpoint: Relax GPIO request rules 



A pin in native mode still can be requested as GPIO, though we assume
that firmware has configured it properly, which sometimes is not the case.

Here we allow turning the pin as GPIO to avoid potential issues,
but issue warning that something might be wrong.

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 76347d7a

drivers/pinctrl/intel/pinctrl-lynxpoint.c

+11 −3
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static int lp_gpio_request(struct gpio_chip *chip, unsigned offset) 
	unsigned long reg = lp_gpio_reg(chip, offset, LP_CONFIG1);

	unsigned long conf2 = lp_gpio_reg(chip, offset, LP_CONFIG2);

	unsigned long acpi_use = lp_gpio_reg(chip, offset, LP_ACPI_OWNED);

	u32 value;



	pm_runtime_get(&lg->pdev->dev); /* should we put if failed */
@@ -112,9 +113,16 @@ static int lp_gpio_request(struct gpio_chip *chip, unsigned offset) 
		dev_err(&lg->pdev->dev, "gpio %d reserved for ACPI\n", offset);

		return -EBUSY;

	}

	/* Fail if pin is in alternate function mode (not GPIO mode) */

	if ((inl(reg) & USE_SEL_MASK) != USE_SEL_GPIO)

		return -ENODEV;



	/*

	 * Reconfigure pin to GPIO mode if needed and issue a warning,

	 * since we expect firmware to configure it properly.

	 */

	value = inl(reg);

	if ((value & USE_SEL_MASK) != USE_SEL_GPIO) {

		outl((value & USE_SEL_MASK) | USE_SEL_GPIO, reg);

		dev_warn(&lg->pdev->dev, FW_BUG "pin %u forcibly reconfigured as GPIO\n", offset);

	}



	/* enable input sensing */

	outl(inl(conf2) & ~GPINDIS_BIT, conf2);

CRA Git | Maintained and supported by SUSTech CRA and CCSE