Commit cd2428c3 authored by Phil Reid's avatar Phil Reid Committed by Wolfram Sang
Browse files

i2c: davinci: switch to using gpiod for bus recovery gpios 



Change the driver to use the gpio descriptors for the bus recovery
information instead of the deprecated integer interface.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPhil Reid <preid@electromag.com.au>
Reviewed-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent ad36a279

drivers/i2c/busses/i2c-davinci.c

+15 −5
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int i2c_davinci_init(struct davinci_i2c_dev *dev) 
}



/*

 * This routine does i2c bus recovery by using i2c_generic_gpio_recovery

 * This routine does i2c bus recovery by using i2c_generic_scl_recovery

 * which is provided by I2C Bus recovery infrastructure.

 */

static void davinci_i2c_prepare_recovery(struct i2c_adapter *adap)
@@ -316,7 +316,7 @@ static void davinci_i2c_unprepare_recovery(struct i2c_adapter *adap) 
}



static struct i2c_bus_recovery_info davinci_i2c_gpio_recovery_info = {

	.recover_bus = i2c_generic_gpio_recovery,

	.recover_bus = i2c_generic_scl_recovery,

	.prepare_recovery = davinci_i2c_prepare_recovery,

	.unprepare_recovery = davinci_i2c_unprepare_recovery,

};
@@ -769,6 +769,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
	struct davinci_i2c_dev *dev;

	struct i2c_adapter *adap;

	struct resource *mem;

	struct i2c_bus_recovery_info *rinfo;

	int r, irq;



	irq = platform_get_irq(pdev, 0);
@@ -869,9 +870,18 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
	if (dev->pdata->has_pfunc)

		adap->bus_recovery_info = &davinci_i2c_scl_recovery_info;

	else if (dev->pdata->scl_pin) {

		adap->bus_recovery_info = &davinci_i2c_gpio_recovery_info;

		adap->bus_recovery_info->scl_gpio = dev->pdata->scl_pin;

		adap->bus_recovery_info->sda_gpio = dev->pdata->sda_pin;

		rinfo =  &davinci_i2c_gpio_recovery_info;

		adap->bus_recovery_info = rinfo;

		r = gpio_request_one(dev->pdata->scl_pin, GPIOF_OPEN_DRAIN |

				     GPIOF_OUT_INIT_HIGH, "i2c-scl");

		if (r)

			goto err_unuse_clocks;

		rinfo->scl_gpiod = gpio_to_desc(dev->pdata->scl_pin);



		r = gpio_request_one(dev->pdata->sda_pin, GPIOF_IN, "i2c-sda");

		if (r)

			goto err_unuse_clocks;

		rinfo->sda_gpiod = gpio_to_desc(dev->pdata->scl_pin);

	}



	adap->nr = pdev->id;

CRA Git | Maintained and supported by SUSTech CRA and CCSE