diff options
author | Chris Packham <chris.packham@alliedtelesis.co.nz> | 2017-07-05 06:13:57 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2018-03-24 08:26:04 -0400 |
commit | 7562dee282244aade6fa183487bf2fcecaa42a20 (patch) | |
tree | 7b50d62155f3901502db7aab5a3cc55d0c82bc63 | |
parent | 06783261751a44c63680e94005a4763151bc1134 (diff) |
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>
-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) | |||
177 | if (IS_ERR(i2c->gpio)) | 177 | if (IS_ERR(i2c->gpio)) |
178 | return PTR_ERR(i2c->gpio); | 178 | return PTR_ERR(i2c->gpio); |
179 | 179 | ||
180 | i2c->adap.timeout = HZ; | ||
181 | ret = device_property_read_u32(&pdev->dev, "clock-frequency", | ||
182 | &i2c->algo_data.i2c_clock); | ||
183 | if (ret) | ||
184 | i2c->algo_data.i2c_clock = 59000; | ||
185 | |||
180 | if (platform_data) { | 186 | if (platform_data) { |
181 | i2c->adap.timeout = platform_data->timeout; | 187 | i2c->adap.timeout = platform_data->timeout; |
182 | i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed; | 188 | i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed; |
183 | } else if (np) { | ||
184 | i2c->adap.timeout = HZ; | ||
185 | of_property_read_u32_index(np, "clock-frequency", 0, | ||
186 | &i2c->algo_data.i2c_clock); | ||
187 | } else { | ||
188 | i2c->adap.timeout = HZ; | ||
189 | i2c->algo_data.i2c_clock = 59000; | ||
190 | } | 189 | } |
191 | 190 | ||
192 | i2c->algo_data.data = i2c; | 191 | i2c->algo_data.data = i2c; |