From patchwork Thu Sep 10 16:12:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768759 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E2E5139F for ; Thu, 10 Sep 2020 18:46:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E775C21941 for ; Thu, 10 Sep 2020 18:46:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599763593; bh=PjP3S+TQBC2ivVaHesCYdSbG5mKpWoLG5Xapj5DDZIM=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=s+rcdD1z0NNJ4dinT0BUfz0mRrCjkKng2NzRrGYkalinhsH72vjR0tQ7c3SkIzeLP IITiOC+pv+rmbuzIVmkFFGmASPHw6NtQJhYP2HVJVs7YAttC9Pc+D4MMTYDaU8fFpb U3KP+mUjiXTVTNV2dXRVyYWbz+Uklwe6uhrOOIU8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726675AbgIJSqU (ORCPT ); Thu, 10 Sep 2020 14:46:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:59664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726694AbgIJQNP (ORCPT ); Thu, 10 Sep 2020 12:13:15 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 6E5AF21D81; Thu, 10 Sep 2020 16:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754354; bh=PjP3S+TQBC2ivVaHesCYdSbG5mKpWoLG5Xapj5DDZIM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=I0sHF6WBSg6/5bE6EIceqBtkVPAWGUm5KHV5q5btsc15pDCax+y5pR3MQEpHOEVXT hC8+j3IrMmCf5idoSFaA+PQt1AR31qLXWV3zHc64eoaigQxn74pILEkxIsxxjuhE0B 56u3BCFDnQKVFzYfKQTFxHHNhOh3QWh9aBla75i0= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 1/8] dt-bindings: net: nfc: s3fwrn5: Convert to dtschema Date: Thu, 10 Sep 2020 18:12:12 +0200 Message-Id: <20200910161219.6237-2-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Convert the Samsung S3FWRN5 NCI NFC controller bindings to dtschema. This is conversion only so it includes properties with invalid prefixes (s3fwrn5,en-gpios) which should be addressed later. Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/net/nfc/s3fwrn5.txt | 25 -------- .../bindings/net/nfc/samsung,s3fwrn5.yaml | 61 +++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 62 insertions(+), 25 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt create mode 100644 Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt deleted file mode 100644 index f02f6fb7f81c..000000000000 --- a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt +++ /dev/null @@ -1,25 +0,0 @@ -* Samsung S3FWRN5 NCI NFC Controller - -Required properties: -- compatible: Should be "samsung,s3fwrn5-i2c". -- reg: address on the bus -- interrupts: GPIO interrupt to which the chip is connected -- s3fwrn5,en-gpios: Output GPIO pin used for enabling/disabling the chip -- s3fwrn5,fw-gpios: Output GPIO pin used to enter firmware mode and - sleep/wakeup control - -Example: - -&hsi2c_4 { - s3fwrn5@27 { - compatible = "samsung,s3fwrn5-i2c"; - - reg = <0x27>; - - interrupt-parent = <&gpa1>; - interrupts = <3 0 0>; - - s3fwrn5,en-gpios = <&gpf1 4 0>; - s3fwrn5,fw-gpios = <&gpj0 2 0>; - }; -}; diff --git a/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml b/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml new file mode 100644 index 000000000000..f43d31a2d94b --- /dev/null +++ b/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/nfc/samsung,s3fwrn5.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung S3FWRN5 NCI NFC Controller + +maintainers: + - Krzysztof Kozlowski + - Krzysztof Opasiak + +properties: + compatible: + const: samsung,s3fwrn5-i2c + + interrupts: + maxItems: 1 + + reg: + maxItems: 1 + + s3fwrn5,en-gpios: + maxItems: 1 + description: + Output GPIO pin used for enabling/disabling the chip + + s3fwrn5,fw-gpios: + maxItems: 1 + description: + Output GPIO pin used to enter firmware mode and sleep/wakeup control + +additionalProperties: false + +required: + - compatible + - interrupts + - reg + - s3fwrn5,en-gpios + - s3fwrn5,fw-gpios + +examples: + - | + #include + #include + + i2c4 { + #address-cells = <1>; + #size-cells = <0>; + + s3fwrn5@27 { + compatible = "samsung,s3fwrn5-i2c"; + reg = <0x27>; + + interrupt-parent = <&gpa1>; + interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; + + s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>; + s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index ac79fdbdf8d0..ec4f1d9cb3dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15273,6 +15273,7 @@ M: Robert Baldyga M: Krzysztof Opasiak L: linux-nfc@lists.01.org (moderated for non-subscribers) S: Supported +F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml F: drivers/nfc/s3fwrn5 SAMSUNG S5C73M3 CAMERA DRIVER From patchwork Thu Sep 10 16:12:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768757 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A55659D for ; Thu, 10 Sep 2020 18:46:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F203021D7E for ; Thu, 10 Sep 2020 18:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599763583; bh=4BDeDZK996n/Vh4H0ckJIlmceQtTA38A19o30K70hSY=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=ToP2Pp3CoOLDbWNxMAnxKOTxcm7i3BJkXKjBpKWbe8FeoPmiEA9Wxq+SCIiP0Ok/M Q/cHDwstwuxepDVktU6snZamQ55vAwpMmEkFo7KQbBwnaT8lq8N+JgH+0qV/4Eg2Hf 37wACImFOwN62EzZFluyLZpAVVt2MPwCH5IcP7Uc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727095AbgIJSqR (ORCPT ); Thu, 10 Sep 2020 14:46:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:59708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726639AbgIJQN0 (ORCPT ); Thu, 10 Sep 2020 12:13:26 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 CB9B121D91; Thu, 10 Sep 2020 16:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754357; bh=4BDeDZK996n/Vh4H0ckJIlmceQtTA38A19o30K70hSY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=P+dpOwouw9W8ptrls/F7JGMUkPFTYFzDnueo5mMPnroDoY8BpUNfoD1JwbnzahIvC xGGxnEaSBxjbewiujbeG7eeBIJlqTnf+TIybcpsS6a1SLAR/0uVeND30tmqgMkzxLj BEODxoO3/Kn5F9Oal6M6tLn2BF6Y7fOAqYtT2a+4= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 2/8] dt-bindings: net: nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs Date: Thu, 10 Sep 2020 18:12:13 +0200 Message-Id: <20200910161219.6237-3-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@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 and rename the fw-gpios" to "wake-gpios" to better describe its purpose. Signed-off-by: Krzysztof Kozlowski --- .../bindings/net/nfc/samsung,s3fwrn5.yaml | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml b/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml index f43d31a2d94b..cb0b8a560282 100644 --- a/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml +++ b/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml @@ -14,30 +14,42 @@ properties: compatible: const: samsung,s3fwrn5-i2c + en-gpios: + maxItems: 1 + description: + Output GPIO pin used for enabling/disabling the chip + interrupts: maxItems: 1 reg: maxItems: 1 + wake-gpios: + maxItems: 1 + description: + Output GPIO pin used to enter firmware mode and sleep/wakeup control + s3fwrn5,en-gpios: maxItems: 1 + deprecated: true description: - Output GPIO pin used for enabling/disabling the chip + Use en-gpios s3fwrn5,fw-gpios: maxItems: 1 + deprecated: true description: - Output GPIO pin used to enter firmware mode and sleep/wakeup control + Use wake-gpios additionalProperties: false required: - compatible + - en-gpios - interrupts - reg - - s3fwrn5,en-gpios - - s3fwrn5,fw-gpios + - wake-gpios examples: - | @@ -55,7 +67,7 @@ examples: interrupt-parent = <&gpa1>; interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; - s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>; - s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>; + en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>; + wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>; }; }; From patchwork Thu Sep 10 16:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768755 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E785C139F for ; Thu, 10 Sep 2020 18:46:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C1AB721D7E for ; Thu, 10 Sep 2020 18:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599763579; bh=ipXNcf/TRHvf+ZR7u/TpP2y/IWKhoPj+ksZzOBS6oeY=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=E36AxIcYvwk8xLxqceOVC4yy+9qdi8DJYTohl6WdabKRfRxYE57U7SOvG9R1Ij4K0 6wdVJ5wjtEZL3sS1AvSebdaoklG7PugdghRMkpPa1DjDEAdAvFr6BZO2ARse3Ue9gR RrnAUz6RKMhW4tIB7qW1tgicD01PhblmvU3Bj2Zc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbgIJSqO (ORCPT ); Thu, 10 Sep 2020 14:46:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:59750 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726731AbgIJQN0 (ORCPT ); Thu, 10 Sep 2020 12:13:26 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 1AD9320C09; Thu, 10 Sep 2020 16:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754361; bh=ipXNcf/TRHvf+ZR7u/TpP2y/IWKhoPj+ksZzOBS6oeY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LYXD5L1KnSWu9wrTfZpVm7D0GGZfWKqF4E7VDT6pnjMpouWEamKmpdlvM9ijAK/eK QWcRPcCAl9HaufFaAOA6s3msHheRw5l3FQYUlnMKmaZaNs/xUcfX8EabfcmDlIgnvl s8xz2tBfAXi54roPdCqIGRGBbxzRoAttSWCNarjA= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 3/8] nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs Date: Thu, 10 Sep 2020 18:12:14 +0200 Message-Id: <20200910161219.6237-4-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@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 Tested-by: Marek Szyprowski --- 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; } From patchwork Thu Sep 10 16:12:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768751 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B17C159D for ; Thu, 10 Sep 2020 18:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9713D20855 for ; Thu, 10 Sep 2020 18:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599763560; bh=zplVVIgMQojsbwVzaG1n4QTE3TMlBcAZb0xfKeub8eE=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=sw6zNtZWxAdROQ7mN3yvg7Y0Fa0G+KqXcs98K+iW1SkweV919iOxIdHwQlgEIojUr tsDm0mL+sDKKhrQWV/tpkiCU7DrmnawNl3r7hOZFDMIPuDmthfls2KOt2qHqepYzbq KQcrKCx3a4npoBmikZN5k+nWRTzq6H+Wn2MHRrCk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726781AbgIJSom (ORCPT ); Thu, 10 Sep 2020 14:44:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:59816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726741AbgIJQNa (ORCPT ); Thu, 10 Sep 2020 12:13:30 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 8744221D90; Thu, 10 Sep 2020 16:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754364; bh=zplVVIgMQojsbwVzaG1n4QTE3TMlBcAZb0xfKeub8eE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=p9Aps4ONeROFriwJ9u8H2cjA/DUEGWRKzoNnFEhQRzm20lKlg1F4hg8ZODe4lfyvA hSobjF/nxCveprXcdjdJCZMp/51Xv7pRgUjZPxTwi0ZFYXc7udvs3NWsCssjExJ0pB KFQLwO9iAu60t1Y4VrlazrSz2f2NIfyXSgQxCeM8= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 4/8] nfc: s3fwrn5: Remove unneeded 'ret' variable Date: Thu, 10 Sep 2020 18:12:15 +0200 Message-Id: <20200910161219.6237-5-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org The local variable 'ret' can be removed: drivers/nfc/s3fwrn5/i2c.c:167:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/s3fwrn5/i2c.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c index 557279492503..dc995286be84 100644 --- a/drivers/nfc/s3fwrn5/i2c.c +++ b/drivers/nfc/s3fwrn5/i2c.c @@ -164,7 +164,6 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy *phy) static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int irq, void *phy_id) { struct s3fwrn5_i2c_phy *phy = phy_id; - int ret = 0; if (!phy || !phy->ndev) { WARN_ON_ONCE(1); @@ -179,10 +178,9 @@ static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int irq, void *phy_id) switch (phy->mode) { case S3FWRN5_MODE_NCI: case S3FWRN5_MODE_FW: - ret = s3fwrn5_i2c_read(phy); + s3fwrn5_i2c_read(phy); break; case S3FWRN5_MODE_COLD: - ret = -EREMOTEIO; break; } From patchwork Thu Sep 10 16:12:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768481 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31F7F13B1 for ; Thu, 10 Sep 2020 17:58:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1425D221E5 for ; Thu, 10 Sep 2020 17:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599760712; bh=q4PfSN/iGfvSKBF5OqA0xnoo0M75rGDiILB3JNyi3Sc=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=KbAtqY+k7ttTan20UwlC2XjaZNnpQ5JUho+mPv6ZbLWbc48lhKHQWzTyLRLQCHg21 26By9DRlkpezvwAEELjiyC3mJVCUbJHFRGOh+1Lz1Lz+XiKS/wphsSbxyD4l3IH6+C GbJND0uAtZBOQ094lQIypM97UKsmAWxYzAmWrgHY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725992AbgIJR5A (ORCPT ); Thu, 10 Sep 2020 13:57:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:33412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726216AbgIJQPN (ORCPT ); Thu, 10 Sep 2020 12:15:13 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 7C81E20BED; Thu, 10 Sep 2020 16:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754367; bh=q4PfSN/iGfvSKBF5OqA0xnoo0M75rGDiILB3JNyi3Sc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=DZLIVNDF3f/+Zb8igN7FHQTHTiyncQABGWe6n7i8pQ0p8yF5+sEd6nVCPwBng9eUX qK9fkl2lh5OsLE75J0gWVdfHa1jteXtCVZ417b83Qw+CFXF9C5dvRC74HfLtSs0OhT FYDhSgoGTQZrDE56CAThmMnbqWSjhbEPZUQoyUg4= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 5/8] nfc: s3fwrn5: Add missing CRYPTO_HASH dependency Date: Thu, 10 Sep 2020 18:12:16 +0200 Message-Id: <20200910161219.6237-6-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org The driver uses crypto hash functions so it needs to select CRYPTO_HASH. This fixes build errors: arc-linux-ld: drivers/nfc/s3fwrn5/firmware.o: in function `s3fwrn5_fw_download': firmware.c:(.text+0x152): undefined reference to `crypto_alloc_shash' Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/s3fwrn5/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nfc/s3fwrn5/Kconfig b/drivers/nfc/s3fwrn5/Kconfig index af9d18690afe..3f8b6da58280 100644 --- a/drivers/nfc/s3fwrn5/Kconfig +++ b/drivers/nfc/s3fwrn5/Kconfig @@ -2,6 +2,7 @@ config NFC_S3FWRN5 tristate select CRYPTO + select CRYPTO_HASH help Core driver for Samsung S3FWRN5 NFC chip. Contains core utilities of chip. It's intended to be used by PHYs to avoid duplicating lots From patchwork Thu Sep 10 16:12:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768463 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 89D75139F for ; Thu, 10 Sep 2020 17:57:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BD0820BED for ; Thu, 10 Sep 2020 17:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599760620; bh=jHH/wPFyXijfn4qbxAJDIqeZ9sIT7sZEqBqRbDpc3/A=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=U/2w/bZS5AwyM+kK3PIzRJ2Az1CxQjPAsp09sY50ONjkgxByt1KKdywx6v/NolVQL 9r1RhoB4Mgp4Cm3kPp3baGftiW+VDwgGAs4nI270+gjvzoFMTjHS5BA303vKkc5ufn eqQyLkncVUwER35RKeLygOHSuNWUl76YODLcz8R8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726176AbgIJRwq (ORCPT ); Thu, 10 Sep 2020 13:52:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:33414 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbgIJQPO (ORCPT ); Thu, 10 Sep 2020 12:15:14 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 B991A21D79; Thu, 10 Sep 2020 16:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754370; bh=jHH/wPFyXijfn4qbxAJDIqeZ9sIT7sZEqBqRbDpc3/A=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Qk1/iZx66lsXxLsmC2V4WzgjUe+CyIlaK9/HXYcgdgQ/TbuzMlIM73Ba66GLi5CTy 9Ggn5FVeGNBHmi1mMqhxN0bJiIfBLFllDWQHgfSk/caOcqo8cZ/HftJE/uhlSjGR7y fg9WOHc2MIk/LadzvUOQf66mFYQiXkSIcQ6vqqMY= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 6/8] nfc: s3fwrn5: Constify s3fwrn5_fw_info when not modified Date: Thu, 10 Sep 2020 18:12:17 +0200 Message-Id: <20200910161219.6237-7-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Two functions accept pointer to struct s3fwrn5_fw_info but do not modify the contents. Make them const so the code is a little bit safer. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/s3fwrn5/firmware.c | 4 ++-- drivers/nfc/s3fwrn5/firmware.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c index 69857f080704..ec930ee2c847 100644 --- a/drivers/nfc/s3fwrn5/firmware.c +++ b/drivers/nfc/s3fwrn5/firmware.c @@ -348,7 +348,7 @@ static int s3fwrn5_fw_get_base_addr( } static inline bool -s3fwrn5_fw_is_custom(struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) +s3fwrn5_fw_is_custom(const struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) { return !!bootinfo->hw_version[2]; } @@ -399,7 +399,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) return ret; } -bool s3fwrn5_fw_check_version(struct s3fwrn5_fw_info *fw_info, u32 version) +bool s3fwrn5_fw_check_version(const struct s3fwrn5_fw_info *fw_info, u32 version) { struct s3fwrn5_fw_version *new = (void *) &fw_info->fw.version; struct s3fwrn5_fw_version *old = (void *) &version; diff --git a/drivers/nfc/s3fwrn5/firmware.h b/drivers/nfc/s3fwrn5/firmware.h index cf1a83a5a525..3c83e6730d30 100644 --- a/drivers/nfc/s3fwrn5/firmware.h +++ b/drivers/nfc/s3fwrn5/firmware.h @@ -91,7 +91,7 @@ struct s3fwrn5_fw_info { void s3fwrn5_fw_init(struct s3fwrn5_fw_info *fw_info, const char *fw_name); int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info); -bool s3fwrn5_fw_check_version(struct s3fwrn5_fw_info *fw_info, u32 version); +bool s3fwrn5_fw_check_version(const struct s3fwrn5_fw_info *fw_info, u32 version); int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info); void s3fwrn5_fw_cleanup(struct s3fwrn5_fw_info *fw_info); From patchwork Thu Sep 10 16:12:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768459 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43738139F for ; Thu, 10 Sep 2020 17:53:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2458220C09 for ; Thu, 10 Sep 2020 17:53:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599760391; bh=LSW0uymH0OeH2QEOskyhHoNpO0V0yrS0w9bNxI5XbcU=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=v1MtQPS1UhttVryXX9U0Ftpk5Rdb7ZdhgbZbwAqloA/W7KdMBg7R/d/m3/RN3IRtB T5dHleT4gJtMbXI+5zJrk2wna7gCGJqZT1+qpEG12wvom6gl7QOR2YZZjp9OszAgmW Yfd/k3e52ekDxfGivaOF9dVONmWNHZON5N6pG/LU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727860AbgIJRwr (ORCPT ); Thu, 10 Sep 2020 13:52:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:33418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbgIJQPO (ORCPT ); Thu, 10 Sep 2020 12:15:14 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 1291C221E3; Thu, 10 Sep 2020 16:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754373; bh=LSW0uymH0OeH2QEOskyhHoNpO0V0yrS0w9bNxI5XbcU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=N3A2HH9u3+u9lRw+0UfmuLrQq9cxqa3DlrDeQRcS7m/Y+QeSqTpYwu6Fq3iLvxNCC OPmNpNhelk+caKCa9tuFeHJCH8U9nyFe052Z3ZPvpJiOLpH+4vKRvWpwwWRcA615YV VC1u+klljK+gGnC2C9UsOtej+1AgHU+hpTHSuJfU= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 7/8] MAINTAINERS: Add Krzysztof Kozlowski to Samsung S3FWRN5 and remove Robert Date: Thu, 10 Sep 2020 18:12:18 +0200 Message-Id: <20200910161219.6237-8-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> MIME-Version: 1.0 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Robert Bałdyga's email does not work (bounces) since 2016 so remove it. Additionally there are no review/ack/tested tags from Krzysztof Opasiak so it looks like the driver is not supported. As a maintainer of Samsung ARM/ARM64 SoC, I can take care about this driver and provide some review. However clearly driver is not in supported mode as I do not work in Samsung anymore. Signed-off-by: Krzysztof Kozlowski --- CREDITS | 4 ++++ MAINTAINERS | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CREDITS b/CREDITS index 32ee70a7562e..1df63cdf71df 100644 --- a/CREDITS +++ b/CREDITS @@ -191,6 +191,10 @@ N: Krishna Balasubramanian E: balasub@cis.ohio-state.edu D: Wrote SYS V IPC (part of standard kernel since 0.99.10) +B: Robert Baldyga +E: r.baldyga@hackerion.com +D: Samsung S3FWRN5 NCI NFC Controller + N: Chris Ball E: chris@printf.net D: Former maintainer of the MMC/SD/SDIO subsystem. diff --git a/MAINTAINERS b/MAINTAINERS index ec4f1d9cb3dc..6888bd851caf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15269,10 +15269,10 @@ F: drivers/media/platform/s3c-camif/ F: include/media/drv-intf/s3c_camif.h SAMSUNG S3FWRN5 NFC DRIVER -M: Robert Baldyga +M: Krzysztof Kozlowski M: Krzysztof Opasiak L: linux-nfc@lists.01.org (moderated for non-subscribers) -S: Supported +S: Maintained F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml F: drivers/nfc/s3fwrn5 From patchwork Thu Sep 10 16:12:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11768457 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9FF1C13B1 for ; Thu, 10 Sep 2020 17:52:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7718C20BED for ; Thu, 10 Sep 2020 17:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599760376; bh=y7UdK9SwiWPgD8tbpf2MGHg1kLY8LPM78Jur53+Y3P4=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=gFDRx+Ws9bD+NyidzgXb580ChL02Aq2/RinogrH+lvANcIrmkI8R0ZimP9xDEBCBT 04izMB4ZlnZKZQ//ZgVS7JtQscTd6G6Zf+juFM1/e4G9xpEVZGoTm61dEfJgQv6Gpf WsF8qMHoVMeIctaJ7z4eW3glzxIOoXrmcP47KJ4Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727852AbgIJRwq (ORCPT ); Thu, 10 Sep 2020 13:52:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:33416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726410AbgIJQPN (ORCPT ); Thu, 10 Sep 2020 12:15:13 -0400 Received: from localhost.localdomain (unknown [194.230.155.174]) (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 36BA5221E5; Thu, 10 Sep 2020 16:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599754376; bh=y7UdK9SwiWPgD8tbpf2MGHg1kLY8LPM78Jur53+Y3P4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Sr4FnyB9BYBSj8kmwpB4EpjwU5VGFhjVrUID+26oBvfocjhfEWs/f75LJDNXM87Hk 5/7YEEEEh5AdIuhx35bhG+sWRiDRTtX3c3ZfUJbUJKEoBW/lFUQn38x/wHu9EyLXIj PwRfrhKMqwOji3pE3Gk/SdbTnaphFIcV2KLPpv8c= From: Krzysztof Kozlowski To: "David S. Miller" , Jakub Kicinski , Rob Herring , Krzysztof Kozlowski , Krzysztof Opasiak , Kukjin Kim , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-nfc@lists.01.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 8/8] arm64: dts: exynos: Use newer S3FWRN5 GPIO properties in Exynos5433 TM2 Date: Thu, 10 Sep 2020 18:12:19 +0200 Message-Id: <20200910161219.6237-9-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910161219.6237-1-krzk@kernel.org> References: <20200910161219.6237-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Since "s3fwrn5" is not a valid vendor prefix, use new GPIO properties instead of the deprecated. Signed-off-by: Krzysztof Kozlowski Tested-by: Marek Szyprowski --- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index 250fc01de78d..24aab3ea3f52 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -795,8 +795,8 @@ reg = <0x27>; interrupt-parent = <&gpa1>; interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; - s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>; - s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>; + en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>; + wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>; }; };