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

i2c: pca-platform: use device_property_read_u32 



Use device_property_read_u32 instead of of_property_read_u32_index to
lookup the "clock-frequency" property.

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

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

+6 −7
Original line number Original line Diff line number Diff line
@@ -177,16 +177,15 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) 
	if (IS_ERR(i2c->gpio))

	if (IS_ERR(i2c->gpio))

		return PTR_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;

	} else if (np) {

	i2c->adap.timeout = HZ;

	i2c->adap.timeout = HZ;

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

	ret = device_property_read_u32(&pdev->dev, "clock-frequency",

				       &i2c->algo_data.i2c_clock);

				       &i2c->algo_data.i2c_clock);

	} else {

	if (ret)

		i2c->adap.timeout = HZ;

		i2c->algo_data.i2c_clock = 59000;

		i2c->algo_data.i2c_clock = 59000;



	if (platform_data) {

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

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

	}

	}





	i2c->algo_data.data = i2c;

	i2c->algo_data.data = i2c;

CRA Git | Maintained and supported by SUSTech CRA and CCSE