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

Commit 9ed1d862 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c/quirks' into i2c/for-4.1 



Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parents 58b59e0f bf070380

drivers/i2c/busses/i2c-at91.c

+11 −21
Original line number Diff line number Diff line
@@ -487,30 +487,10 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) 
	if (ret < 0)

		goto out;



	/*

	 * The hardware can handle at most two messages concatenated by a

	 * repeated start via it's internal address feature.

	 */

	if (num > 2) {

		dev_err(dev->dev,

			"cannot handle more than two concatenated messages.\n");

		ret = 0;

		goto out;

	} else if (num == 2) {

	if (num == 2) {

		int internal_address = 0;

		int i;



		if (msg->flags & I2C_M_RD) {

			dev_err(dev->dev, "first transfer must be write.\n");

			ret = -EINVAL;

			goto out;

		}

		if (msg->len > 3) {

			dev_err(dev->dev, "first message size must be <= 3.\n");

			ret = -EINVAL;

			goto out;

		}



		/* 1st msg is put into the internal address, start with 2nd */

		m_start = &msg[1];

		for (i = 0; i < msg->len; ++i) {
@@ -540,6 +520,15 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) 
	return ret;

}



/*

 * The hardware can handle at most two messages concatenated by a

 * repeated start via it's internal address feature.

 */

static struct i2c_adapter_quirks at91_twi_quirks = {

	.flags = I2C_AQ_COMB | I2C_AQ_COMB_WRITE_FIRST | I2C_AQ_COMB_SAME_ADDR,

	.max_comb_1st_msg_len = 3,

};



static u32 at91_twi_func(struct i2c_adapter *adapter)

{

	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL
@@ -777,6 +766,7 @@ static int at91_twi_probe(struct platform_device *pdev) 
	dev->adapter.owner = THIS_MODULE;

	dev->adapter.class = I2C_CLASS_DEPRECATED;

	dev->adapter.algo = &at91_twi_algorithm;

	dev->adapter.quirks = &at91_twi_quirks;

	dev->adapter.dev.parent = dev->dev;

	dev->adapter.nr = pdev->id;

	dev->adapter.timeout = AT91_I2C_TIMEOUT;

drivers/i2c/busses/i2c-axxia.c

+6 −5
Original line number Diff line number Diff line
@@ -336,11 +336,6 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg) 
	u32 addr_1, addr_2;

	int ret;



	if (msg->len > 255) {

		dev_warn(idev->dev, "unsupported length %u\n", msg->len);

		return -EINVAL;

	}



	idev->msg = msg;

	idev->msg_xfrd = 0;

	idev->msg_err = 0;
@@ -454,6 +449,11 @@ static const struct i2c_algorithm axxia_i2c_algo = { 
	.functionality = axxia_i2c_func,

};



static struct i2c_adapter_quirks axxia_i2c_quirks = {

	.max_read_len = 255,

	.max_write_len = 255,

};



static int axxia_i2c_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;
@@ -511,6 +511,7 @@ static int axxia_i2c_probe(struct platform_device *pdev) 
	strlcpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name));

	idev->adapter.owner = THIS_MODULE;

	idev->adapter.algo = &axxia_i2c_algo;

	idev->adapter.quirks = &axxia_i2c_quirks;

	idev->adapter.dev.parent = &pdev->dev;

	idev->adapter.dev.of_node = pdev->dev.of_node;

drivers/i2c/busses/i2c-bcm-iproc.c

+7 −8
Original line number Diff line number Diff line
@@ -160,14 +160,6 @@ static int bcm_iproc_i2c_xfer_single_msg(struct bcm_iproc_i2c_dev *iproc_i2c, 
	u32 val;

	unsigned long time_left = msecs_to_jiffies(I2C_TIMEOUT_MESC);



	/* need to reserve one byte in the FIFO for the slave address */

	if (msg->len > M_TX_RX_FIFO_SIZE - 1) {

		dev_err(iproc_i2c->device,

			"only support data length up to %u bytes\n",

			M_TX_RX_FIFO_SIZE - 1);

		return -EOPNOTSUPP;

	}



	/* check if bus is busy */

	if (!!(readl(iproc_i2c->base + M_CMD_OFFSET) &

	       BIT(M_CMD_START_BUSY_SHIFT))) {
@@ -287,6 +279,12 @@ static const struct i2c_algorithm bcm_iproc_algo = { 
	.functionality = bcm_iproc_i2c_functionality,

};



static struct i2c_adapter_quirks bcm_iproc_i2c_quirks = {

	/* need to reserve one byte in the FIFO for the slave address */

	.max_read_len = M_TX_RX_FIFO_SIZE - 1,

	.max_write_len = M_TX_RX_FIFO_SIZE - 1,

};



static int bcm_iproc_i2c_cfg_speed(struct bcm_iproc_i2c_dev *iproc_i2c)

{

	unsigned int bus_speed;
@@ -413,6 +411,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) 
	i2c_set_adapdata(adap, iproc_i2c);

	strlcpy(adap->name, "Broadcom iProc I2C adapter", sizeof(adap->name));

	adap->algo = &bcm_iproc_algo;

	adap->quirks = &bcm_iproc_i2c_quirks;

	adap->dev.parent = &pdev->dev;

	adap->dev.of_node = pdev->dev.of_node;

drivers/i2c/busses/i2c-cpm.c

+9 −11
Original line number Diff line number Diff line
@@ -308,22 +308,12 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
	struct i2c_reg __iomem *i2c_reg = cpm->i2c_reg;

	struct i2c_ram __iomem *i2c_ram = cpm->i2c_ram;

	struct i2c_msg *pmsg;

	int ret, i;

	int ret;

	int tptr;

	int rptr;

	cbd_t __iomem *tbdf;

	cbd_t __iomem *rbdf;



	if (num > CPM_MAXBD)

		return -EINVAL;



	/* Check if we have any oversized READ requests */

	for (i = 0; i < num; i++) {

		pmsg = &msgs[i];

		if (pmsg->len >= CPM_MAX_READ)

			return -EINVAL;

	}



	/* Reset to use first buffer */

	out_be16(&i2c_ram->rbptr, in_be16(&i2c_ram->rbase));

	out_be16(&i2c_ram->tbptr, in_be16(&i2c_ram->tbase));
@@ -424,10 +414,18 @@ static const struct i2c_algorithm cpm_i2c_algo = { 
	.functionality = cpm_i2c_func,

};



/* CPM_MAX_READ is also limiting writes according to the code! */

static struct i2c_adapter_quirks cpm_i2c_quirks = {

	.max_num_msgs = CPM_MAXBD,

	.max_read_len = CPM_MAX_READ,

	.max_write_len = CPM_MAX_READ,

};



static const struct i2c_adapter cpm_ops = {

	.owner		= THIS_MODULE,

	.name		= "i2c-cpm",

	.algo		= &cpm_i2c_algo,

	.quirks		= &cpm_i2c_quirks,

};



static int cpm_i2c_setup(struct cpm_i2c *cpm)

drivers/i2c/busses/i2c-dln2.c

+6 −6
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static int dln2_i2c_xfer(struct i2c_adapter *adapter, 
{

	struct dln2_i2c *dln2 = i2c_get_adapdata(adapter);

	struct i2c_msg *pmsg;

	struct device *dev = &dln2->adapter.dev;

	int i;



	for (i = 0; i < num; i++) {
@@ -152,11 +151,6 @@ static int dln2_i2c_xfer(struct i2c_adapter *adapter, 


		pmsg = &msgs[i];



		if (pmsg->len > DLN2_I2C_MAX_XFER_SIZE) {

			dev_warn(dev, "maximum transfer size exceeded\n");

			return -EOPNOTSUPP;

		}



		if (pmsg->flags & I2C_M_RD) {

			ret = dln2_i2c_read(dln2, pmsg->addr, pmsg->buf,

					    pmsg->len);
@@ -187,6 +181,11 @@ static const struct i2c_algorithm dln2_i2c_usb_algorithm = { 
	.functionality = dln2_i2c_func,

};



static struct i2c_adapter_quirks dln2_i2c_quirks = {

	.max_read_len = DLN2_I2C_MAX_XFER_SIZE,

	.max_write_len = DLN2_I2C_MAX_XFER_SIZE,

};



static int dln2_i2c_probe(struct platform_device *pdev)

{

	int ret;
@@ -209,6 +208,7 @@ static int dln2_i2c_probe(struct platform_device *pdev) 
	dln2->adapter.owner = THIS_MODULE;

	dln2->adapter.class = I2C_CLASS_HWMON;

	dln2->adapter.algo = &dln2_i2c_usb_algorithm;

	dln2->adapter.quirks = &dln2_i2c_quirks;

	dln2->adapter.dev.parent = dev;

	i2c_set_adapdata(&dln2->adapter, dln2);

	snprintf(dln2->adapter.name, sizeof(dln2->adapter.name), "%s-%s-%d",