iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: nfcmrvl: allow gpio 0 for reset signalling

Browse Source 
Allow gpio 0 to be used for reset signalling, and instead use negative
errnos to disable the reset functionality.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Johan Hovold 2017-03-30 12:15:42 +02:00 committed by Samuel Ortiz
parent 0d1ca88bbf
commit e33a3f84f8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/nfc/nfcmrvl/main.c
View File

@ -123,12 +123,12 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
memcpy(&priv->config, pdata, sizeof(*pdata)); memcpy(&priv->config, pdata, sizeof(*pdata));
if (priv->config.reset_n_io) { if (gpio_is_valid(priv->config.reset_n_io)) {
rc = gpio_request_one(priv->config.reset_n_io, rc = gpio_request_one(priv->config.reset_n_io,
GPIOF_OUT_INIT_LOW, GPIOF_OUT_INIT_LOW,
"nfcmrvl_reset_n"); "nfcmrvl_reset_n");
if (rc < 0) { if (rc < 0) {
priv->config.reset_n_io = 0; priv->config.reset_n_io = -EINVAL;
nfc_err(dev, "failed to request reset_n io\n"); nfc_err(dev, "failed to request reset_n io\n");
} }
} }
@ -183,7 +183,7 @@ error_fw_dnld_deinit:
error_free_dev: error_free_dev:
nci_free_device(priv->ndev); nci_free_device(priv->ndev);
error_free_gpio: error_free_gpio:
if (priv->config.reset_n_io) if (gpio_is_valid(priv->config.reset_n_io))
gpio_free(priv->config.reset_n_io); gpio_free(priv->config.reset_n_io);
kfree(priv); kfree(priv);
return ERR_PTR(rc); return ERR_PTR(rc);
@ -199,7 +199,7 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv)
nfcmrvl_fw_dnld_deinit(priv); nfcmrvl_fw_dnld_deinit(priv);
if (priv->config.reset_n_io) if (gpio_is_valid(priv->config.reset_n_io))
gpio_free(priv->config.reset_n_io); gpio_free(priv->config.reset_n_io);
nci_unregister_device(ndev); nci_unregister_device(ndev);
@ -267,7 +267,6 @@ int nfcmrvl_parse_dt(struct device_node *node,
reset_n_io = of_get_named_gpio(node, "reset-n-io", 0); reset_n_io = of_get_named_gpio(node, "reset-n-io", 0);
if (reset_n_io < 0) { if (reset_n_io < 0) {
pr_info("no reset-n-io config\n"); pr_info("no reset-n-io config\n");
reset_n_io = 0;
} else if (!gpio_is_valid(reset_n_io)) { } else if (!gpio_is_valid(reset_n_io)) {
pr_err("invalid reset-n-io GPIO\n"); pr_err("invalid reset-n-io GPIO\n");
return reset_n_io; return reset_n_io;

2
include/linux/platform_data/nfcmrvl.h
View File

@ -23,7 +23,7 @@ struct nfcmrvl_platform_data {
*/ */
/* GPIO that is wired to RESET_N signal */ /* GPIO that is wired to RESET_N signal */
unsigned int reset_n_io; int reset_n_io;
/* Tell if transport is muxed in HCI one */ /* Tell if transport is muxed in HCI one */
unsigned int hci_muxed; unsigned int hci_muxed;