Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d31b58f authored by Dirk Brandewie's avatar Dirk Brandewie Committed by Ben Dooks
Browse files

i2c-designware: Move retriveving the clock speed out of core code. 



The clock frequecy supplied to the IP core is specific to a single
instance of the driver.  This patch makes it possible to have multiple
Designware I2C cores in the system possibly running at different core
frequencies.

Signed-off-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 2373f6b9

drivers/i2c/busses/i2c-designware-core.c

+3 −1
Original line number Diff line number Diff line
@@ -142,10 +142,12 @@ static u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset) 
 */

int i2c_dw_init(struct dw_i2c_dev *dev)

{

	u32 input_clock_khz = clk_get_rate(dev->clk) / 1000;

	u32 input_clock_khz;

	u32 ic_con, hcnt, lcnt;

	u32 reg;



	input_clock_khz = dev->get_clk_rate_khz(dev);



	/* Configure register endianess access */

	reg = dw_readl(dev, DW_IC_COMP_TYPE);

	if (reg == ___constant_swab32(DW_IC_COMP_TYPE_VALUE)) {

drivers/i2c/busses/i2c-designware-core.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ struct dw_i2c_dev { 
	struct completion	cmd_complete;

	struct mutex		lock;

	struct clk		*clk;

	u32			(*get_clk_rate_khz) (struct dw_i2c_dev *dev);

	int			cmd_err;

	struct i2c_msg		*msgs;

	int			msgs_num;

drivers/i2c/busses/i2c-designware-platdrv.c

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ static struct i2c_algorithm i2c_dw_algo = { 
	.master_xfer	= i2c_dw_xfer,

	.functionality	= i2c_dw_func,

};

static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)

{

	return clk_get_rate(dev->clk)/1000;

}



static int __devinit dw_i2c_probe(struct platform_device *pdev)

{
@@ -84,6 +88,8 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, dev);



	dev->clk = clk_get(&pdev->dev, NULL);

	dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;



	if (IS_ERR(dev->clk)) {

		r = -ENODEV;

		goto err_free_mem;