Received: by 10.223.185.116 with SMTP id b49csp1070586wrg; Fri, 23 Feb 2018 11:22:48 -0800 (PST) X-Google-Smtp-Source: AH8x227JMS2O8fzmrggAeH9ExkLVXwwRWYYE9kvqsMjZBxb2mywuUwJmozFNGfU+FOdqjl0gFXjX X-Received: by 2002:a17:902:424:: with SMTP id 33-v6mr2601890ple.57.1519413768735; Fri, 23 Feb 2018 11:22:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413768; cv=none; d=google.com; s=arc-20160816; b=pN5InH8ubiMjyNtrmQPB280hPttKMwxtPpXCtBThkEk5kUCF5Y0cRraUn+tc9KO9Md fiHVcNEgKMq/rz9Aie3y36irsyT+GTP2aELLjOPyV9TIzyjUufH45wQ7DwKQH+JyX8sy 21wTKgk9jwZlJe7aerzkr5IvGkURdR2LoK0Es6MPIHUuzV4XxeeTvWJoiP+Sf8BRxWvL 4a3xSPVJvJl9bLLFG4FReSlOEuggCcp2zdTVWuEx5D3Qj0pyNhhpG7a4ovvyOvn2AoXE IgwUBr/gxR9VqHaTqVX2M76RUXRISYEKvv1LCVwVct2nlPiutz3UXGLNSl3IjWuOFkuj IJcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=kon5cSl75H23CWQW1emW8TLloRdZdcXZCjbRAZV4uPQ=; b=ypA89uu5AHF5jeHezRUuenadmG9viimJ9yoT3+sluG8J/2HDIHdpJOAVH3kAB+mitQ nbb6GEHwsH7y2DuLbZoYr399FLyrYTtb2ceJhrjKUgx9wTXPSnCzufT+21C9hbb6iwr+ P3U3SaaEJwf91Ig7vDwd9FnQFRE/G3Nl2zB1X/u7FHBECG070dFvPIAhEpQkg9UqGsNK z0jQ1haAU5st2eSNWpfRfXKvFZjm3wNPsNvVv3+cKFlDIOwPZOcT1CXuPVFJLTeDqwZ6 BVNjcpiAi3Jh88v/I/2zyTLUaJpGiNYJYo6p+44tmOPlKs7vqjMoH6O4KGHQJY1EcMn7 gFfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c6si1862926pgn.681.2018.02.23.11.22.34; Fri, 23 Feb 2018 11:22:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935442AbeBWSxt (ORCPT + 99 others); Fri, 23 Feb 2018 13:53:49 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47494 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935140AbeBWSxq (ORCPT ); Fri, 23 Feb 2018 13:53:46 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 1A9741055; Fri, 23 Feb 2018 18:53:45 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Shevchenko , Mika Westerberg , Jonathan Cameron , Sasha Levin Subject: [PATCH 4.14 099/159] iio: proximity: sx9500: Assign interrupt from GpioIo() Date: Fri, 23 Feb 2018 19:26:47 +0100 Message-Id: <20180223170755.443076295@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Shevchenko [ Upstream commit e53111ad5deaef98d8c18a9933ef1f5624c5979d ] The commit 0f0796509c07 ("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 0f0796509c07 to restore original behaviour. Signed-off-by: Andy Shevchenko Acked-by: Mika Westerberg Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/iio/proximity/sx9500.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/drivers/iio/proximity/sx9500.c +++ b/drivers/iio/proximity/sx9500.c @@ -871,6 +871,7 @@ static int sx9500_init_device(struct iio static void sx9500_gpio_probe(struct i2c_client *client, struct sx9500_data *data) { + struct gpio_desc *gpiod_int; struct device *dev; if (!client) @@ -878,6 +879,14 @@ static void sx9500_gpio_probe(struct i2c 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); if (IS_ERR(data->gpiod_rst)) { dev_warn(dev, "gpio get reset pin failed\n");