Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 09:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: imx_lpi2c: add uclass api support

Browse source 
Use uclass clk api to get per clk when CONFIG_CLK enabled.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Peng Fan 2018-07-17 20:38:33 +08:00 • committed by Anatolij Gustschin
parent 16f513ee78
commit 3d7690aec1
2 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/i2c/imx_lpi2c.c
View file

@ -261,8 +261,14 @@ static int bus_i2c_write(struct udevice *bus, u32 chip, u8 *buf, int len)
} }
u32 __weak imx_get_i2cclk(u32 i2c_num)
{
return 0;
}
static int bus_i2c_set_bus_speed(struct udevice *bus, int speed) static int bus_i2c_set_bus_speed(struct udevice *bus, int speed)
{ {
struct imx_lpi2c_bus *i2c_bus = dev_get_priv(bus);
struct imx_lpi2c_reg *regs; struct imx_lpi2c_reg *regs;
u32 val; u32 val;
u32 preescale = 0, best_pre = 0, clkhi = 0; u32 preescale = 0, best_pre = 0, clkhi = 0;
@ -273,9 +279,18 @@ static int bus_i2c_set_bus_speed(struct udevice *bus, int speed)
int i; int i;
regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus); regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus);
clock_rate = imx_get_i2cclk(bus->seq);
if (!clock_rate) if (IS_ENABLED(CONFIG_CLK)) {
return -EPERM; clock_rate = clk_get_rate(&i2c_bus->per_clk);
if (clock_rate <= 0) {
dev_err(bus, "Failed to get i2c clk: %d\n", clock_rate);
return clock_rate;
}
} else {
clock_rate = imx_get_i2cclk(bus->seq);
if (!clock_rate)
return -EPERM;
}
mode = (readl(&regs->mcr) & LPI2C_MCR_MEN_MASK) >> LPI2C_MCR_MEN_SHIFT; mode = (readl(&regs->mcr) & LPI2C_MCR_MEN_MASK) >> LPI2C_MCR_MEN_SHIFT;
/* disable master mode */ /* disable master mode */
@ -417,6 +432,11 @@ static int imx_lpi2c_set_bus_speed(struct udevice *bus, unsigned int speed)
return bus_i2c_set_bus_speed(bus, speed); return bus_i2c_set_bus_speed(bus, speed);
} }
__weak int enable_i2c_clk(unsigned char enable, unsigned int i2c_num)
{
return 0;
}
static int imx_lpi2c_probe(struct udevice *bus) static int imx_lpi2c_probe(struct udevice *bus)
{ {
struct imx_lpi2c_bus *i2c_bus = dev_get_priv(bus); struct imx_lpi2c_bus *i2c_bus = dev_get_priv(bus);
@ -440,10 +460,23 @@ static int imx_lpi2c_probe(struct udevice *bus)
return ret; return ret;
} }
/* To i.MX7ULP, only i2c4-7 can be handled by A7 core */ if (IS_ENABLED(CONFIG_CLK)) {
ret = enable_i2c_clk(1, bus->seq); ret = clk_get_by_name(bus, "per", &i2c_bus->per_clk);
if (ret < 0) if (ret) {
return ret; dev_err(bus, "Failed to get per clk\n");
return ret;
}
ret = clk_enable(&i2c_bus->per_clk);
if (ret) {
dev_err(bus, "Failed to enable per clk\n");
return ret;
}
} else {
/* To i.MX7ULP, only i2c4-7 can be handled by A7 core */
ret = enable_i2c_clk(1, bus->seq);
if (ret < 0)
return ret;
}
ret = bus_i2c_init(bus, 100000); ret = bus_i2c_init(bus, 100000);
if (ret < 0) if (ret < 0)

3
include/imx_lpi2c.h
View file

@ -8,6 +8,8 @@
#ifndef __IMX_LPI2C_H__ #ifndef __IMX_LPI2C_H__
#define __IMX_LPI2C_H__ #define __IMX_LPI2C_H__
#include <clk.h>
struct imx_lpi2c_bus { struct imx_lpi2c_bus {
int index; int index;
ulong base; ulong base;
@ -15,6 +17,7 @@ struct imx_lpi2c_bus {
int speed; int speed;
struct i2c_pads_info *pads_info; struct i2c_pads_info *pads_info;
struct udevice *bus; struct udevice *bus;
struct clk per_clk;
}; };
struct imx_lpi2c_reg { struct imx_lpi2c_reg {