Commit 06783261 authored by Chris Packham's avatar Chris Packham Committed by Wolfram Sang
Browse files

i2c: pca-platform: unconditionally use devm_gpiod_get_optional 



Allow for the reset-gpios property to be defined in the device tree
or via a GPIO lookup table.

Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent df0d3234

drivers/i2c/busses/i2c-pca-platform.c

+4 −17
Original line number Diff line number Diff line
@@ -173,33 +173,20 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) 
	i2c->adap.dev.parent = &pdev->dev;

	i2c->adap.dev.of_node = np;



	i2c->gpio = devm_gpiod_get_optional(&pdev->dev, "reset-gpios", GPIOD_OUT_LOW);

	if (IS_ERR(i2c->gpio))

		return PTR_ERR(i2c->gpio);



	if (platform_data) {

		i2c->adap.timeout = platform_data->timeout;

		i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed;

		if (gpio_is_valid(platform_data->gpio)) {

			ret = devm_gpio_request_one(&pdev->dev,

						    platform_data->gpio,

						    GPIOF_ACTIVE_LOW,

						    i2c->adap.name);

			if (ret == 0) {

				i2c->gpio = gpio_to_desc(platform_data->gpio);

				gpiod_direction_output(i2c->gpio, 0);

			} else {

				dev_warn(&pdev->dev, "Registering gpio failed!\n");

				i2c->gpio = NULL;

			}

		}

	} else if (np) {

		i2c->adap.timeout = HZ;

		i2c->gpio = devm_gpiod_get_optional(&pdev->dev, "reset-gpios", GPIOD_OUT_LOW);

		if (IS_ERR(i2c->gpio))

			return PTR_ERR(i2c->gpio);

		of_property_read_u32_index(np, "clock-frequency", 0,

					   &i2c->algo_data.i2c_clock);

	} else {

		i2c->adap.timeout = HZ;

		i2c->algo_data.i2c_clock = 59000;

		i2c->gpio = NULL;

	}



	i2c->algo_data.data = i2c;

CRA Git | Maintained and supported by SUSTech CRA and CCSE