From patchwork Tue Feb 28 14:08:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 9595721 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DD20C60453 for ; Tue, 28 Feb 2017 14:08:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFC31284D0 for ; Tue, 28 Feb 2017 14:08:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C45F928524; Tue, 28 Feb 2017 14:08:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96F9E2852E for ; Tue, 28 Feb 2017 14:08:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752060AbdB1OIP (ORCPT ); Tue, 28 Feb 2017 09:08:15 -0500 Received: from mga07.intel.com ([134.134.136.100]:18598 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751431AbdB1OIO (ORCPT ); Tue, 28 Feb 2017 09:08:14 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 28 Feb 2017 06:08:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,219,1484035200"; d="scan'208";a="53962950" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 28 Feb 2017 06:08:10 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id DE26C17D; Tue, 28 Feb 2017 16:08:09 +0200 (EET) From: Andy Shevchenko To: Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz , linux-wireless@vger.kernel.org, Mika Westerberg Cc: Andy Shevchenko Subject: [PATCH v1 1/2] NFC: pn544: Request GPIOs with proper connection IDs Date: Tue, 28 Feb 2017 16:08:08 +0200 Message-Id: <20170228140809.84921-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since ACPI does support _DSD we might have a firmware that provides a GPIO mapping in DSDT. When GPIO is requested the core will check for property with given name. That's why we have to follow the standard names which are already in use in DT case. Request GPIOs with proper connection IDs, i.e. use same names as used for DT case. In the future ACPI and DT cases might be unified. Signed-off-by: Andy Shevchenko --- drivers/nfc/pn544/i2c.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index f837c39a8017..2df3176205c4 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -881,8 +881,7 @@ static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client) struct device *dev = &client->dev; /* Get EN GPIO from ACPI */ - gpiod_en = devm_gpiod_get_index(dev, PN544_GPIO_NAME_EN, 1, - GPIOD_OUT_LOW); + gpiod_en = devm_gpiod_get_index(dev, "enable", 1, GPIOD_OUT_LOW); if (IS_ERR(gpiod_en)) { nfc_err(dev, "Unable to get EN GPIO\n"); return -ENODEV; @@ -891,8 +890,7 @@ static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client) phy->gpio_en = desc_to_gpio(gpiod_en); /* Get FW GPIO from ACPI */ - gpiod_fw = devm_gpiod_get_index(dev, PN544_GPIO_NAME_FW, 2, - GPIOD_OUT_LOW); + gpiod_fw = devm_gpiod_get_index(dev, "firmware", 2, GPIOD_OUT_LOW); if (IS_ERR(gpiod_fw)) { nfc_err(dev, "Unable to get FW GPIO\n"); return -ENODEV;