sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

i2c: omap: fix fclk_rate for ti,omap4-i2c 

The compatible "ti,omap4-i2c" don't help to get fclk_rate. So set it acording to
cpu compatible: "ti,am33xx" and "ti,omap4"

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jan Weitzel 2014-12-11 10:47:59 +01:00 committed by Sascha Hauer
parent 013247989b
commit c5151cae17
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/i2c/busses/i2c-omap.c
View File

@ -271,11 +271,6 @@ static struct omap_i2c_driver_data am33xx_data = {
.fclk_rate = 48000,
};
static struct omap_i2c_driver_data omap4_of_data = {
.flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE,
.fclk_rate = 0,
};
static inline void omap_i2c_write_reg(struct omap_i2c_struct *i2c_omap,
int reg, u16 val)
{
@ -1011,6 +1006,11 @@ i2c_omap_probe(struct device_d *pdev)
if (r)
return r;
if (of_machine_is_compatible("ti,am33xx"))
i2c_data = &am33xx_data;
if (of_machine_is_compatible("ti,omap4"))
i2c_data = &omap4_data;
i2c_omap->data = i2c_data;
i2c_omap->reg_shift = (i2c_data->flags >>
OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3;
@ -1140,7 +1140,6 @@ static __maybe_unused struct of_device_id omap_i2c_dt_ids[] = {
.data = (unsigned long)&omap3_data,
}, {
.compatible = "ti,omap4-i2c",
.data = (unsigned long)&omap4_of_data,
}, {
/* sentinel */
}