2020-11-30 11:10:45

by Frieder Schrempf

Subject: [PATCH] NFC: nxp-nci: Make firmware GPIO pin optional

From: Frieder Schrempf <[email protected]>

There are other NXP NCI compatible NFC controllers such as the PN7150
that use an integrated firmware and therefore do not have a GPIO to
select firmware downloading mode. To support these kind of chips,
let's make the firmware GPIO optional.

Signed-off-by: Frieder Schrempf <[email protected]>
---
Documentation/devicetree/bindings/net/nfc/nxp-nci.txt | 2 +-
drivers/nfc/nxp-nci/i2c.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt b/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt
index cfaf88998918..cb2385c277d0 100644
--- a/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt
+++ b/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt
@@ -6,11 +6,11 @@ Required properties:
- reg: address on the bus
- interrupts: GPIO interrupt to which the chip is connected
- enable-gpios: Output GPIO pin used for enabling/disabling the chip
-- firmware-gpios: Output GPIO pin used to enter firmware download mode

Optional SoC Specific Properties:
- pinctrl-names: Contains only one value - "default".
- pintctrl-0: Specifies the pin control groups used for this controller.
+- firmware-gpios: Output GPIO pin used to enter firmware download mode

Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2):

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index 9f60e4dc5a90..528893686e18 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -47,7 +47,8 @@ static int nxp_nci_i2c_set_mode(void *phy_id,
{
struct nxp_nci_i2c_phy *phy = (struct nxp_nci_i2c_phy *) phy_id;

- gpiod_set_value(phy->gpiod_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);
+ if (phy->gpiod_fw)
+ gpiod_set_value(phy->gpiod_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);
gpiod_set_value(phy->gpiod_en, (mode != NXP_NCI_MODE_COLD) ? 1 : 0);
usleep_range(10000, 15000);

@@ -286,7 +287,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,
return PTR_ERR(phy->gpiod_en);
}

- phy->gpiod_fw = devm_gpiod_get(dev, "firmware", GPIOD_OUT_LOW);
+ phy->gpiod_fw = devm_gpiod_get_optional(dev, "firmware", GPIOD_OUT_LOW);
if (IS_ERR(phy->gpiod_fw)) {
nfc_err(dev, "Failed to get FW gpio\n");
return PTR_ERR(phy->gpiod_fw);
--
2.17.1

2020-11-30 11:47:33

by Andy Shevchenko

Subject: Re: [PATCH] NFC: nxp-nci: Make firmware GPIO pin optional

On Mon, Nov 30, 2020 at 1:06 PM Schrempf Frieder
<[email protected]> wrote:
>
> From: Frieder Schrempf <[email protected]>
>
> There are other NXP NCI compatible NFC controllers such as the PN7150
> that use an integrated firmware and therefore do not have a GPIO to
> select firmware downloading mode. To support these kind of chips,
> let's make the firmware GPIO optional.

...

> - gpiod_set_value(phy->gpiod_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);
> + if (phy->gpiod_fw)
> + gpiod_set_value(phy->gpiod_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);

This change is not needed.

--
With Best Regards,
Andy Shevchenko

2020-11-30 11:52:42

by Frieder Schrempf

Subject: Re: [PATCH] NFC: nxp-nci: Make firmware GPIO pin optional

On 30.11.20 12:44, Andy Shevchenko wrote:
> On Mon, Nov 30, 2020 at 1:06 PM Schrempf Frieder
> <[email protected]> wrote:
>>
>> From: Frieder Schrempf <[email protected]>
>>
>> There are other NXP NCI compatible NFC controllers such as the PN7150
>> that use an integrated firmware and therefore do not have a GPIO to
>> select firmware downloading mode. To support these kind of chips,
>> let's make the firmware GPIO optional.
>
> ...
>
>> - gpiod_set_value(phy->gpiod_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);
>> + if (phy->gpiod_fw)
>> + gpiod_set_value(phy->gpiod_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);
>
> This change is not needed.

Indeed, thanks!