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

Commit 4b3c31c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "I2C has one core and one driver bugfix for you"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: tegra: Fix Maximum transfer size
  i2c: dev: prevent adapter retries and timeout being set as minus value
parents c3405d68 b67d4530

drivers/i2c/busses/i2c-tegra.c

+14 −1
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ enum msg_end_type { 
 * @has_mst_fifo: The I2C controller contains the new MST FIFO interface that

 *		provides additional features and allows for longer messages to

 *		be transferred in one go.

 * @quirks: i2c adapter quirks for limiting write/read transfer size and not

 *		allowing 0 length transfers.

 */

struct tegra_i2c_hw_feature {

	bool has_continue_xfer_support;
@@ -167,6 +169,7 @@ struct tegra_i2c_hw_feature { 
	bool has_multi_master_mode;

	bool has_slcg_override_reg;

	bool has_mst_fifo;

	const struct i2c_adapter_quirks *quirks;

};



/**
@@ -837,6 +840,10 @@ static const struct i2c_adapter_quirks tegra_i2c_quirks = { 
	.max_write_len = 4096,

};



static const struct i2c_adapter_quirks tegra194_i2c_quirks = {

	.flags = I2C_AQ_NO_ZERO_LEN,

};



static const struct tegra_i2c_hw_feature tegra20_i2c_hw = {

	.has_continue_xfer_support = false,

	.has_per_pkt_xfer_complete_irq = false,
@@ -848,6 +855,7 @@ static const struct tegra_i2c_hw_feature tegra20_i2c_hw = { 
	.has_multi_master_mode = false,

	.has_slcg_override_reg = false,

	.has_mst_fifo = false,

	.quirks = &tegra_i2c_quirks,

};



static const struct tegra_i2c_hw_feature tegra30_i2c_hw = {
@@ -861,6 +869,7 @@ static const struct tegra_i2c_hw_feature tegra30_i2c_hw = { 
	.has_multi_master_mode = false,

	.has_slcg_override_reg = false,

	.has_mst_fifo = false,

	.quirks = &tegra_i2c_quirks,

};



static const struct tegra_i2c_hw_feature tegra114_i2c_hw = {
@@ -874,6 +883,7 @@ static const struct tegra_i2c_hw_feature tegra114_i2c_hw = { 
	.has_multi_master_mode = false,

	.has_slcg_override_reg = false,

	.has_mst_fifo = false,

	.quirks = &tegra_i2c_quirks,

};



static const struct tegra_i2c_hw_feature tegra124_i2c_hw = {
@@ -887,6 +897,7 @@ static const struct tegra_i2c_hw_feature tegra124_i2c_hw = { 
	.has_multi_master_mode = false,

	.has_slcg_override_reg = true,

	.has_mst_fifo = false,

	.quirks = &tegra_i2c_quirks,

};



static const struct tegra_i2c_hw_feature tegra210_i2c_hw = {
@@ -900,6 +911,7 @@ static const struct tegra_i2c_hw_feature tegra210_i2c_hw = { 
	.has_multi_master_mode = true,

	.has_slcg_override_reg = true,

	.has_mst_fifo = false,

	.quirks = &tegra_i2c_quirks,

};



static const struct tegra_i2c_hw_feature tegra194_i2c_hw = {
@@ -913,6 +925,7 @@ static const struct tegra_i2c_hw_feature tegra194_i2c_hw = { 
	.has_multi_master_mode = true,

	.has_slcg_override_reg = true,

	.has_mst_fifo = true,

	.quirks = &tegra194_i2c_quirks,

};



/* Match table for of_platform binding */
@@ -964,7 +977,6 @@ static int tegra_i2c_probe(struct platform_device *pdev) 
	i2c_dev->base = base;

	i2c_dev->div_clk = div_clk;

	i2c_dev->adapter.algo = &tegra_i2c_algo;

	i2c_dev->adapter.quirks = &tegra_i2c_quirks;

	i2c_dev->irq = irq;

	i2c_dev->cont_id = pdev->id;

	i2c_dev->dev = &pdev->dev;
@@ -980,6 +992,7 @@ static int tegra_i2c_probe(struct platform_device *pdev) 
	i2c_dev->hw = of_device_get_match_data(&pdev->dev);

	i2c_dev->is_dvc = of_device_is_compatible(pdev->dev.of_node,

						  "nvidia,tegra20-i2c-dvc");

	i2c_dev->adapter.quirks = i2c_dev->hw->quirks;

	init_completion(&i2c_dev->msg_complete);

	spin_lock_init(&i2c_dev->xfer_lock);

drivers/i2c/i2c-dev.c

+6 −0
Original line number Diff line number Diff line
@@ -470,9 +470,15 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
					  data_arg.data);

	}

	case I2C_RETRIES:

		if (arg > INT_MAX)

			return -EINVAL;



		client->adapter->retries = arg;

		break;

	case I2C_TIMEOUT:

		if (arg > INT_MAX)

			return -EINVAL;



		/* For historical reasons, user-space sets the timeout

		 * value in units of 10 ms.

		 */