|
23 | 23 | #include <linux/io.h>
|
24 | 24 | #include <linux/kernel.h>
|
25 | 25 | #include <linux/module.h>
|
26 |
| -#include <linux/of.h> |
27 | 26 | #include <linux/platform_device.h>
|
28 | 27 | #include <linux/pm_runtime.h>
|
| 28 | +#include <linux/property.h> |
29 | 29 | #include <linux/sched.h>
|
30 | 30 | #include <linux/slab.h>
|
31 | 31 |
|
@@ -173,7 +173,6 @@ static void i2c_davinci_calc_clk_dividers(struct davinci_i2c_dev *dev)
|
173 | 173 | u32 clkh;
|
174 | 174 | u32 clkl;
|
175 | 175 | u32 input_clock = clk_get_rate(dev->clk);
|
176 |
| - struct device_node *of_node = dev->dev->of_node; |
177 | 176 |
|
178 | 177 | /* NOTE: I2C Clock divider programming info
|
179 | 178 | * As per I2C specs the following formulas provide prescaler
|
@@ -207,7 +206,7 @@ static void i2c_davinci_calc_clk_dividers(struct davinci_i2c_dev *dev)
|
207 | 206 | psc++; /* better to run under spec than over */
|
208 | 207 | d = (psc >= 2) ? 5 : 7 - psc;
|
209 | 208 |
|
210 |
| - if (of_node && of_device_is_compatible(of_node, "ti,keystone-i2c")) |
| 209 | + if (device_is_compatible(dev->dev, "ti,keystone-i2c")) |
211 | 210 | d = 6;
|
212 | 211 |
|
213 | 212 | clk = ((input_clock / (psc + 1)) / (dev->bus_freq * 1000));
|
@@ -811,7 +810,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
|
811 | 810 | adap->algo = &i2c_davinci_algo;
|
812 | 811 | adap->dev.parent = &pdev->dev;
|
813 | 812 | adap->timeout = DAVINCI_I2C_TIMEOUT;
|
814 |
| - adap->dev.of_node = pdev->dev.of_node; |
| 813 | + adap->dev.of_node = dev_of_node(&pdev->dev); |
815 | 814 |
|
816 | 815 | if (dev->has_pfunc)
|
817 | 816 | adap->bus_recovery_info = &davinci_i2c_scl_recovery_info;
|
|
0 commit comments