Commit 1995c4cc authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by David S. Miller
Browse files

nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs 



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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a9f89aa

drivers/nfc/s3fwrn5/i2c.c

+14 −6
Original line number Diff line number Diff line
@@ -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, "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, "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;

}