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

Commit cbd668d7 authored by Houston Hoffman's avatar Houston Hoffman
Browse files

NFC: don't reparse device tree 



probe function parses device tree at the begginning. device tree should not
be reparsed in the middle of the probe.  use the first parse value.

Change-Id: I6695d76c9b05ec9ba2d8f73ee0815ab86078da31
Signed-off-by: default avatarHouston Hoffman <hhoffman@codeaurora.org>
parent bfaea932

drivers/nfc/nfc-nci.c

+2 −8
Original line number Diff line number Diff line
@@ -1216,10 +1216,7 @@ static int nfc_parse_dt(struct device *dev, struct qca199x_platform_data *pdata) 
	r = of_property_read_string(np, "qcom,clk-src", &pdata->clk_src_name);



	if (strcmp(pdata->clk_src_name, "GPCLK2")) {

		r = of_property_read_u32(np, "qcom,clk-gpio",

					&pdata->clkreq_gpio);

		if (r)

			return -EINVAL;

		pdata->clkreq_gpio = of_get_named_gpio(np, "qcom,clk-gpio", 0);

	}



	if ((!strcmp(pdata->clk_src_name, "GPCLK")) ||
@@ -1233,6 +1230,7 @@ static int nfc_parse_dt(struct device *dev, struct qca199x_platform_data *pdata) 
			if ((!gpio_is_valid(pdata->irq_gpio_clk_req)))

				return -EINVAL;

	}



	if (r)

		return -EINVAL;

	return r;
@@ -1243,7 +1241,6 @@ static int qca199x_probe(struct i2c_client *client, 
{

	int r = 0;

	int irqn = 0;

	struct device_node *node = client->dev.of_node;

	struct qca199x_platform_data *platform_data;

	struct qca199x_dev *qca199x_dev;
@@ -1402,9 +1399,6 @@ static int qca199x_probe(struct i2c_client *client, 
	}



	if (strcmp(platform_data->clk_src_name, "GPCLK2")) {

		platform_data->clkreq_gpio =

			of_get_named_gpio(node, "qcom,clk-gpio", 0);



		if (gpio_is_valid(platform_data->clkreq_gpio)) {

			r = gpio_request(platform_data->clkreq_gpio,

				"nfc_clkreq_gpio");