diff mbox series

[2/2] NFC: nxp-nci: Add pad supply voltage pvdd-supply

Message ID 20230606072454.145106-1-raymondhackley@protonmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series NFC: nxp-nci: Add pad supply voltage pvdd-supply | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 9 this patch: 9
netdev/cc_maintainers warning 1 maintainers not CCed: luca.ceresoli@bootlin.com
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 9 this patch: 9
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 71 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Raymond Hackley June 6, 2023, 7:25 a.m. UTC 
PN547/553, QN310/330 chips on some devices require a pad supply voltage
(PVDD). Otherwise, the NFC won't power up.

Implement support for pad supply voltage pvdd-supply that is enabled by
the nxp-nci driver so that the regulator gets enabled when needed.

Signed-off-by: Raymond Hackley <raymondhackley@protonmail.com>
---
 drivers/nfc/nxp-nci/i2c.c | 47 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

Comments

Jakub Kicinski June 8, 2023, 4:36 a.m. UTC | #1 
On Tue, 06 Jun 2023 07:25:55 +0000 Raymond Hackley wrote:
> +			if (r != -EPROBE_DEFER)
> +				dev_err(dev,
> +					"Failed to get regulator pvdd: %d\n",
> +					r);
> +			return r;

dev_err_probe() ?

> +	r = devm_add_action_or_reset(dev, nxp_nci_i2c_poweroff, phy);
> +	if (r < 0) {
> +		nfc_err(dev, "Failed to install poweroff handler: %d\n",
> +			r);
> +		nxp_nci_i2c_poweroff(phy);

The _or_reset() stands for "we'll call the action for you if we can't
add it". Don't call poweroff again.
diff mbox series

Patch

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index d4c299be7949..e2d16111daa4 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -35,6 +35,7 @@  struct nxp_nci_i2c_phy {
 
 	struct gpio_desc *gpiod_en;
 	struct gpio_desc *gpiod_fw;
+	struct regulator *pvdd;
 
 	int hard_fault; /*
 			 * < 0 if hardware error occurred (e.g. i2c err)
@@ -263,6 +264,22 @@  static const struct acpi_gpio_mapping acpi_nxp_nci_gpios[] = {
 	{ }
 };
 
+static void nxp_nci_i2c_poweroff(void *data)
+{
+	struct nxp_nci_i2c_phy *phy = data;
+	struct device *dev = &phy->i2c_dev->dev;
+	struct regulator *pvdd = phy->pvdd;
+	int r;
+
+	if (!IS_ERR(pvdd) && regulator_is_enabled(pvdd)) {
+		r = regulator_disable(pvdd);
+		if (r < 0)
+			dev_warn(dev,
+				 "Failed to disable regulator pvdd: %d\n",
+				 r);
+	}
+}
+
 static int nxp_nci_i2c_probe(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;
@@ -298,6 +315,34 @@  static int nxp_nci_i2c_probe(struct i2c_client *client)
 		return PTR_ERR(phy->gpiod_fw);
 	}
 
+	phy->pvdd = devm_regulator_get_optional(dev, "pvdd");
+	if (IS_ERR(phy->pvdd)) {
+		r = PTR_ERR(phy->pvdd);
+		if (r != -ENODEV) {
+			if (r != -EPROBE_DEFER)
+				dev_err(dev,
+					"Failed to get regulator pvdd: %d\n",
+					r);
+			return r;
+		}
+	} else {
+		r = regulator_enable(phy->pvdd);
+		if (r < 0) {
+			nfc_err(dev,
+				"Failed to enable regulator pvdd: %d\n",
+				r);
+			return r;
+		}
+	}
+
+	r = devm_add_action_or_reset(dev, nxp_nci_i2c_poweroff, phy);
+	if (r < 0) {
+		nfc_err(dev, "Failed to install poweroff handler: %d\n",
+			r);
+		nxp_nci_i2c_poweroff(phy);
+		return r;
+	}
+
 	r = nxp_nci_probe(phy, &client->dev, &i2c_phy_ops,
 			  NXP_NCI_I2C_MAX_PAYLOAD, &phy->ndev);
 	if (r < 0)
@@ -319,6 +364,8 @@  static void nxp_nci_i2c_remove(struct i2c_client *client)
 
 	nxp_nci_remove(phy->ndev);
 	free_irq(client->irq, phy);
+
+	nxp_nci_i2c_poweroff(phy);
 }
 
 static const struct i2c_device_id nxp_nci_i2c_id_table[] = {