[PATCH] fixup! i2c: port Linux i2c_parse_fw_timings

[Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>]

I forgot to add <linux/property.h> in the patch series. After discussion
with Sascha, we could do away with it and just use the of_* helper
directly. Do this and fix the build error caused...
---
 drivers/i2c/i2c.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 35ea63ab0729..9df5ee70c7f1 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -24,7 +24,6 @@
 #include <init.h>
 #include <of.h>
 #include <gpio.h>
-#include <linux/property.h>
 
 #include <i2c/i2c.h>
 
@@ -579,11 +578,13 @@ void i2c_parse_fw_timings(struct device_d *dev, struct i2c_timings *t, bool use_
 
 	memset(t, 0, sizeof(*t));
 
-	ret = device_property_read_u32(dev, "clock-frequency", &t->bus_freq_hz);
+	ret = of_property_read_u32(dev->device_node, "clock-frequency",
+				   &t->bus_freq_hz);
 	if (ret && use_defaults)
 		t->bus_freq_hz = 100000;
 
-	ret = device_property_read_u32(dev, "i2c-scl-rising-time-ns", &t->scl_rise_ns);
+	ret = of_property_read_u32(dev->device_node, "i2c-scl-rising-time-ns",
+				   &t->scl_rise_ns);
 	if (ret && use_defaults) {
 		if (t->bus_freq_hz <= 100000)
 			t->scl_rise_ns = 1000;
@@ -593,7 +594,8 @@ void i2c_parse_fw_timings(struct device_d *dev, struct i2c_timings *t, bool use_
 			t->scl_rise_ns = 120;
 	}
 
-	ret = device_property_read_u32(dev, "i2c-scl-falling-time-ns", &t->scl_fall_ns);
+	ret = of_property_read_u32(dev->device_node, "i2c-scl-falling-time-ns",
+				   &t->scl_fall_ns);
 	if (ret && use_defaults) {
 		if (t->bus_freq_hz <= 400000)
 			t->scl_fall_ns = 300;
@@ -601,13 +603,16 @@ void i2c_parse_fw_timings(struct device_d *dev, struct i2c_timings *t, bool use_
 			t->scl_fall_ns = 120;
 	}
 
-	device_property_read_u32(dev, "i2c-scl-internal-delay-ns", &t->scl_int_delay_ns);
+	of_property_read_u32(dev->device_node, "i2c-scl-internal-delay-ns",
+			     &t->scl_int_delay_ns);
 
-	ret = device_property_read_u32(dev, "i2c-sda-falling-time-ns", &t->sda_fall_ns);
+	ret = of_property_read_u32(dev->device_node, "i2c-sda-falling-time-ns",
+				   &t->sda_fall_ns);
 	if (ret && use_defaults)
 		t->sda_fall_ns = t->scl_fall_ns;
 
-	device_property_read_u32(dev, "i2c-sda-hold-time-ns", &t->sda_hold_ns);
+	of_property_read_u32(dev->device_node, "i2c-sda-hold-time-ns",
+			     &t->sda_hold_ns);
 }
 EXPORT_SYMBOL_GPL(i2c_parse_fw_timings);
 
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox