Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (b1400276) · Commits · 戴 / test

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,9 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
		*/
		dw_writel(dev, msgs[dev->msg_write_idx].addr \| ic_tar, DW_IC_TAR);

		/* enforce disabled interrupts (due to HW issues) */
		i2c_dw_disable_int(dev);

		/* Enable the adapter */
		__i2c_dw_enable(dev, true);

+1 −1

Original line number	Diff line number	Diff line
		@@ -999,7 +999,7 @@ static int nmk_i2c_probe(struct amba_device adev, const struct amba_id id)

		dev->virtbase = devm_ioremap(&adev->dev, adev->res.start,
		resource_size(&adev->res));
		if (IS_ERR(dev->virtbase)) {
		if (!dev->virtbase) {
		ret = -ENOMEM;
		goto err_no_mem;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -479,7 +479,7 @@ static int qup_i2c_xfer(struct i2c_adapter *adap,
		int ret, idx;

		ret = pm_runtime_get_sync(qup->dev);
		if (ret)
		if (ret < 0)
		goto out;

		writel(1, qup->base + QUP_SW_RESET);

+8 −1

Original line number	Diff line number	Diff line
		@@ -561,6 +561,12 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,

		ret = -EINVAL;
		for (i = 0; i < num; i++) {
		/* This HW can't send STOP after address phase */
		if (msgs[i].len == 0) {
		ret = -EOPNOTSUPP;
		break;
		}

		/-------------- spin lock -----------------/
		spin_lock_irqsave(&priv->lock, flags);

		@@ -625,7 +631,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,

		static u32 rcar_i2c_func(struct i2c_adapter *adap)
		{
		return I2C_FUNC_I2C \| I2C_FUNC_SMBUS_EMUL;
		/* This HW can't do SMBUS_QUICK and NOSTART */
		return I2C_FUNC_I2C \| (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK);
		}

		static const struct i2c_algorithm rcar_i2c_algo = {

+1 −1

Original line number	Diff line number	Diff line
		@@ -1276,10 +1276,10 @@ static int s3c24xx_i2c_resume(struct device *dev)
		struct platform_device *pdev = to_platform_device(dev);
		struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);

		i2c->suspended = 0;
		clk_prepare_enable(i2c->clk);
		s3c24xx_i2c_init(i2c);
		clk_disable_unprepare(i2c->clk);
		i2c->suspended = 0;

		return 0;
		}