diff options
| author |   Chris Packham <chris.packham@alliedtelesis.co.nz> | 2017-07-05 22:13:57 +1200 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2018-03-24 13:26:04 +0100 |
| commit | 7562dee282244aade6fa183487bf2fcecaa42a20 (patch) | |
| tree | 7b50d62155f3901502db7aab5a3cc55d0c82bc63 /drivers/i2c | |
| parent | i2c: pca-platform: unconditionally use devm_gpiod_get_optional (diff) | |
| download | linux-dev-7562dee282244aade6fa183487bf2fcecaa42a20.tar.xz linux-dev-7562dee282244aade6fa183487bf2fcecaa42a20.zip | |
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: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pca-platform.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c index b90193d09d4b..bc2707ffd409 100644 --- a/drivers/i2c/busses/i2c-pca-platform.c +++ b/drivers/i2c/busses/i2c-pca-platform.c @@ -177,16 +177,15 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) if (IS_ERR(i2c->gpio)) return PTR_ERR(i2c->gpio); + i2c->adap.timeout = HZ; + ret = device_property_read_u32(&pdev->dev, "clock-frequency", + &i2c->algo_data.i2c_clock); + if (ret) + 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; - } else if (np) { - i2c->adap.timeout = HZ; - 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->algo_data.data = i2c; |