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

Commit 19c0a539 authored by Weifeng Voon's avatar Weifeng Voon Committed by Wolfram Sang
Browse files

i2c: designware: Move clk_freq into struct dw_i2c_dev 



I2c designware controller operate speed is configured in the register
IC_CON. Previously the operate speed is determined by a local variable
clk_freq. This patch will move the local variable clk_freq into struct
dw_i2c_dev. This change will ease the set and get of the clk_freq.

Signed-off-by: default avatarWeifeng Voon <weifeng.voon@intel.com>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent f9484852

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ 
 * @tx_fifo_depth: depth of the hardware tx fifo

 * @tx_fifo_depth: depth of the hardware tx fifo

 * @rx_fifo_depth: depth of the hardware rx fifo

 * @rx_fifo_depth: depth of the hardware rx fifo

 * @rx_outstanding: current master-rx elements in tx fifo

 * @rx_outstanding: current master-rx elements in tx fifo

 * @clk_freq: bus clock frequency

 * @ss_hcnt: standard speed HCNT value

 * @ss_hcnt: standard speed HCNT value

 * @ss_lcnt: standard speed LCNT value

 * @ss_lcnt: standard speed LCNT value

 * @fs_hcnt: fast speed HCNT value

 * @fs_hcnt: fast speed HCNT value
@@ -96,6 +97,7 @@ struct dw_i2c_dev { 
	unsigned int		tx_fifo_depth;

	unsigned int		tx_fifo_depth;

	unsigned int		rx_fifo_depth;

	unsigned int		rx_fifo_depth;

	int			rx_outstanding;

	int			rx_outstanding;

	u32			clk_freq;

	u32			sda_hold_time;

	u32			sda_hold_time;

	u32			sda_falling_time;

	u32			sda_falling_time;

	u32			scl_falling_time;

	u32			scl_falling_time;

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -155,7 +155,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 
	struct i2c_adapter *adap;

	struct i2c_adapter *adap;

	struct resource *mem;

	struct resource *mem;

	int irq, r;

	int irq, r;

	u32 clk_freq, ht = 0;

	u32 ht = 0;





	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

	if (irq < 0)
@@ -175,10 +175,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, dev);

	platform_set_drvdata(pdev, dev);





	/* fast mode by default because of legacy reasons */

	/* fast mode by default because of legacy reasons */

	clk_freq = 400000;

	dev->clk_freq = 400000;





	if (pdata) {

	if (pdata) {

		clk_freq = pdata->i2c_scl_freq;

		dev->clk_freq = pdata->i2c_scl_freq;

	} else {

	} else {

		device_property_read_u32(&pdev->dev, "i2c-sda-hold-time-ns",

		device_property_read_u32(&pdev->dev, "i2c-sda-hold-time-ns",

					 &ht);

					 &ht);
@@ -187,7 +187,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 
		device_property_read_u32(&pdev->dev, "i2c-scl-falling-time-ns",

		device_property_read_u32(&pdev->dev, "i2c-scl-falling-time-ns",

					 &dev->scl_falling_time);

					 &dev->scl_falling_time);

		device_property_read_u32(&pdev->dev, "clock-frequency",

		device_property_read_u32(&pdev->dev, "clock-frequency",

					 &clk_freq);

					 &dev->clk_freq);

	}

	}





	if (has_acpi_companion(&pdev->dev))

	if (has_acpi_companion(&pdev->dev))
@@ -196,7 +196,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 
	/*

	/*

	 * Only standard mode at 100kHz and fast mode at 400kHz are supported.

	 * Only standard mode at 100kHz and fast mode at 400kHz are supported.

	 */

	 */

	if (clk_freq != 100000 && clk_freq != 400000) {

	if (dev->clk_freq != 100000 && dev->clk_freq != 400000) {

		dev_err(&pdev->dev, "Only 100kHz and 400kHz supported");

		dev_err(&pdev->dev, "Only 100kHz and 400kHz supported");

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -212,7 +212,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 
		I2C_FUNC_SMBUS_BYTE_DATA |

		I2C_FUNC_SMBUS_BYTE_DATA |

		I2C_FUNC_SMBUS_WORD_DATA |

		I2C_FUNC_SMBUS_WORD_DATA |

		I2C_FUNC_SMBUS_I2C_BLOCK;

		I2C_FUNC_SMBUS_I2C_BLOCK;

	if (clk_freq == 100000)

	if (dev->clk_freq == 100000)

		dev->master_cfg =  DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE |

		dev->master_cfg =  DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE |

			DW_IC_CON_RESTART_EN | DW_IC_CON_SPEED_STD;

			DW_IC_CON_RESTART_EN | DW_IC_CON_SPEED_STD;

	else

	else