Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75dda421 authored by Robert Dolca's avatar Robert Dolca Committed by Samuel Ortiz
Browse files

NFC: PN544: GPIO access that may sleep 



gpio_set_value was replaced with gpio_set_value_cansleep in order
to allow GPIO access that may sleep. This is particularelly useful
when GPIO is accessed using busses like I2C, SPI, USB

Signed-off-by: default avatarRobert Dolca <robert.dolca@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 3b060532

drivers/nfc/pn544/i2c.c

+12 −10
Original line number Diff line number Diff line
@@ -195,18 +195,19 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy) 
	nfc_info(&phy->i2c_dev->dev, "Detecting nfc_en polarity\n");



	/* Disable fw download */

	gpio_set_value(phy->gpio_fw, 0);

	gpio_set_value_cansleep(phy->gpio_fw, 0);



	for (polarity = 0; polarity < 2; polarity++) {

		phy->en_polarity = polarity;

		retry = 3;

		while (retry--) {

			/* power off */

			gpio_set_value(phy->gpio_en, !phy->en_polarity);

			gpio_set_value_cansleep(phy->gpio_en,

						!phy->en_polarity);

			usleep_range(10000, 15000);



			/* power on */

			gpio_set_value(phy->gpio_en, phy->en_polarity);

			gpio_set_value_cansleep(phy->gpio_en, phy->en_polarity);

			usleep_range(10000, 15000);



			/* send reset */
@@ -225,13 +226,14 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy) 
		"Could not detect nfc_en polarity, fallback to active high\n");



out:

	gpio_set_value(phy->gpio_en, !phy->en_polarity);

	gpio_set_value_cansleep(phy->gpio_en, !phy->en_polarity);

}



static void pn544_hci_i2c_enable_mode(struct pn544_i2c_phy *phy, int run_mode)

{

	gpio_set_value(phy->gpio_fw, run_mode == PN544_FW_MODE ? 1 : 0);

	gpio_set_value(phy->gpio_en, phy->en_polarity);

	gpio_set_value_cansleep(phy->gpio_fw,

				run_mode == PN544_FW_MODE ? 1 : 0);

	gpio_set_value_cansleep(phy->gpio_en, phy->en_polarity);

	usleep_range(10000, 15000);



	phy->run_mode = run_mode;
@@ -254,14 +256,14 @@ static void pn544_hci_i2c_disable(void *phy_id) 
{

	struct pn544_i2c_phy *phy = phy_id;



	gpio_set_value(phy->gpio_fw, 0);

	gpio_set_value(phy->gpio_en, !phy->en_polarity);

	gpio_set_value_cansleep(phy->gpio_fw, 0);

	gpio_set_value_cansleep(phy->gpio_en, !phy->en_polarity);

	usleep_range(10000, 15000);



	gpio_set_value(phy->gpio_en, phy->en_polarity);

	gpio_set_value_cansleep(phy->gpio_en, phy->en_polarity);

	usleep_range(10000, 15000);



	gpio_set_value(phy->gpio_en, !phy->en_polarity);

	gpio_set_value_cansleep(phy->gpio_en, !phy->en_polarity);

	usleep_range(10000, 15000);



	phy->powered = 0;