Received: by 2002:a05:6a10:6006:0:0:0:0 with SMTP id w6csp1910969pxa; Sat, 29 Aug 2020 07:31:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfYHuywWzog6svns+BoSJbDNrWpuyN3TKjLtIs4ks7HOAtjzlVW2YbqWpXSx19vluUmFxI X-Received: by 2002:a05:6402:1593:: with SMTP id c19mr654495edv.33.1598711479019; Sat, 29 Aug 2020 07:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598711479; cv=none; d=google.com; s=arc-20160816; b=anpAoBNaZTGBiF3hr6wdlbQsTIbVKFAW5Pw+BeU7Kc6ARzKYArAadVRcTFIn47oZxh N8lW2OB5+72r1Jbnlj21Lu7Gah670imzfhfcwS/wYPol5adL3yUgaeICMxTYo1jP2D75 /PP2vys2+kCUQOfhw6AgA1y8FApUkHx5JC/wGi+63I7jdYsOo0wFKdLuwbLUQEwG+6o3 +xNeMyZM9oKScdUfs6iWNq/hglo730K6riojE2HXkAEMEZN1OkNGzQu4zvuDdZb1DGKs ONIevMuhw1CgpfKmaxfOp/jR057BJU8OBYpipt/nnzPldQFma6mDnYg0Dx4uf8nJCdRt LyZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=b0uzqqcDzINlzT+aA630YvxvAPu8Z4/16XRS0GmAA+w=; b=TqY1WmOBxY88isIW1bx0VFtoB8yOFv3P86ylYItRvWU+CSOk7v/BwdNiXSVhM2nB31 3x87amcHOa7lJWlrqeUo0Nnk9YMeNI7+lBMWl8a+J62CpF28UWUtB8A7yluYIVOuyPOv tg6VkthKaoUymRO9bURNWvwBYojeb+0OY+/IFv8UIyh4GIlC5bMYZwqQofrD/S6tcQSF raNnliKjgYJt0LjF2epa+pY+Nc86J5rTSr4lS2wbXvsDmxXtXpKF75YIrzQ7AklgAMkD aAG8fBUHW6sa24bTes5Bcf6L2anyA6yp2EultEfC4tiJBrCvydoPLv6jWoMpKFyZLdco V7TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iWFH41dw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn24si1644743edb.307.2020.08.29.07.30.56; Sat, 29 Aug 2020 07:31:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iWFH41dw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728282AbgH2OaJ (ORCPT + 99 others); Sat, 29 Aug 2020 10:30:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:56374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728234AbgH2OaF (ORCPT ); Sat, 29 Aug 2020 10:30:05 -0400 Received: from localhost.localdomain (unknown [194.230.155.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 15CEA2145D; Sat, 29 Aug 2020 14:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598711404; bh=hqxOstCnIoNKDrJ+bAx6KqDpcFo8rUnfZrqeID5wT9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iWFH41dwQbo4aGO8QE8tMY3Lx+UEYhq+gPPZdyRLMwJqzjuu0SHeXVEmf2/ni7sYm 0dlk3hJLGoaw19UVDhv7tqiQrnNvlkWeGaFzfCV5ArszmQSC5bdV+moMhnQdtOFQIG JLFhpV5zsMJzpFKp2WLTVOXk/eA3vEf0NZjDKPh8= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Opasiak , Kukjin Kim , Krzysztof Kozlowski , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Bartlomiej Zolnierkiewicz , Sylwester Nawrocki , Chanwoo Choi , Inki Dae Subject: [RFT 3/4] nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs Date: Sat, 29 Aug 2020 16:29:47 +0200 Message-Id: <20200829142948.32365-3-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200829142948.32365-1-krzk@kernel.org> References: <20200829142948.32365-1-krzk@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The device tree property prefix describes the vendor, which in case of S3FWRN5 chip is Samsung. Therefore the "s3fwrn5" prefix for "en-gpios" and "fw-gpios" is not correct and should be deprecated. Introduce properly named properties for these GPIOs but still support deprecated ones. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/s3fwrn5/i2c.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c index b4eb926d220a..557279492503 100644 --- a/drivers/nfc/s3fwrn5/i2c.c +++ b/drivers/nfc/s3fwrn5/i2c.c @@ -200,13 +200,21 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_client *client) if (!np) return -ENODEV; - phy->gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0); - if (!gpio_is_valid(phy->gpio_en)) - return -ENODEV; + phy->gpio_en = of_get_named_gpio(np, "en-gpios", 0); + if (!gpio_is_valid(phy->gpio_en)) { + /* Support also deprecated property */ + phy->gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0); + if (!gpio_is_valid(phy->gpio_en)) + return -ENODEV; + } - phy->gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0); - if (!gpio_is_valid(phy->gpio_fw_wake)) - return -ENODEV; + phy->gpio_fw_wake = of_get_named_gpio(np, "wake-gpios", 0); + if (!gpio_is_valid(phy->gpio_fw_wake)) { + /* Support also deprecated property */ + phy->gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0); + if (!gpio_is_valid(phy->gpio_fw_wake)) + return -ENODEV; + } return 0; } -- 2.17.1