Looking at the linux kernel the clock-frequency property of
the device tree is used to set the bus speed and not the
fclk_rate. Adapted this to be compliant with linux kernel.
Signed-off-by: Teresa Gámez <t.ga...@phytec.de>
---
drivers/i2c/busses/i2c-omap.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index adc952b..48bdfbe 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -151,7 +151,6 @@ struct omap_i2c_struct {
u8 reg_shift;
struct omap_i2c_driver_data *data;
struct resource *ioarea;
- u32 fclk_rate;
u32 speed; /* Speed of bus in Khz */
u16 scheme;
u16 cmd_err;
@@ -421,7 +420,7 @@ static int omap_i2c_init(struct omap_i2c_struct *i2c_omap)
internal_clk = 4000;
/* Compute prescaler divisor */
- psc = i2c_omap->fclk_rate / internal_clk;
+ psc = i2c_data->fclk_rate / internal_clk;
psc = psc - 1;
/* If configured for High Speed */
@@ -1016,9 +1015,16 @@ i2c_omap_probe(struct device_d *pdev)
i2c_omap->reg_shift = (i2c_data->flags >>
OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3;
- if (pdev->platform_data != NULL)
+ if (pdev->platform_data != NULL) {
speed = *(u32 *)pdev->platform_data;
- else
+ } else {
+ of_property_read_u32(pdev->device_node, "clock-frequency",
+ &speed);
+ /* convert DT freq value in Hz into kHz for speed */
+ speed /= 1000;
+ }
+
+ if (!speed)
speed = 100; /* Default speed */
i2c_omap->speed = speed;
@@ -1080,12 +1086,6 @@ i2c_omap_probe(struct device_d *pdev)
i2c_omap->b_hw = 1; /* Enable hardware fixes */
}
- i2c_omap->fclk_rate = i2c_data->fclk_rate;
-
- if (!i2c_omap->fclk_rate)
- of_property_read_u32(pdev->device_node, "clock-frequency",
- &i2c_omap->fclk_rate);
-
/* reset ASAP, clearing any IRQs */
omap_i2c_init(i2c_omap);
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
