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

Commit e53111ad authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron
Browse files

iio: proximity: sx9500: Assign interrupt from GpioIo() 



The commit 0f079650

("iio: remove gpio interrupt probing from drivers that use a single interrupt")

removed custom IRQ assignment for the drivers which are enumerated via
ACPI or OF. Unfortunately, some ACPI tables have IRQ line defined as
GpioIo() resource and thus automatic IRQ allocation will fail.

Partially revert the commit 0f079650 to restore original behaviour.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 81b039ec

drivers/iio/proximity/sx9500.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -869,6 +869,7 @@ static int sx9500_init_device(struct iio_dev *indio_dev) 
static void sx9500_gpio_probe(struct i2c_client *client,

static void sx9500_gpio_probe(struct i2c_client *client,

			      struct sx9500_data *data)

			      struct sx9500_data *data)

{

{

	struct gpio_desc *gpiod_int;

	struct device *dev;

	struct device *dev;





	if (!client)

	if (!client)
@@ -876,6 +877,14 @@ static void sx9500_gpio_probe(struct i2c_client *client, 




	dev = &client->dev;

	dev = &client->dev;





	if (client->irq <= 0) {

		gpiod_int = devm_gpiod_get(dev, SX9500_GPIO_INT, GPIOD_IN);

		if (IS_ERR(gpiod_int))

			dev_err(dev, "gpio get irq failed\n");

		else

			client->irq = gpiod_to_irq(gpiod_int);

	}



	data->gpiod_rst = devm_gpiod_get(dev, SX9500_GPIO_RESET, GPIOD_OUT_HIGH);

	data->gpiod_rst = devm_gpiod_get(dev, SX9500_GPIO_RESET, GPIOD_OUT_HIGH);

	if (IS_ERR(data->gpiod_rst)) {

	if (IS_ERR(data->gpiod_rst)) {

		dev_warn(dev, "gpio get reset pin failed\n");

		dev_warn(dev, "gpio get reset pin failed\n");