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

Commit 5b799dde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux 

Pull i2c embedded fixes from Wolfram Sang:
 "The last bunch of (typical) i2c-embedded driver fixes for 3.6.

  Also update the MAINTAINERS file to point to my tree since people keep
  asking where to find their patches."

* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
  i2c: algo: pca: Fix mode selection for PCA9665
  MAINTAINERS: fix tree for current i2c-embedded development
  i2c: mxs: correctly setup speed for non devicetree
  i2c: pnx: Fix read transactions of >= 2 bytes
  i2c: pnx: Fix bit definitions
parents 1547cb80 5f71a3ef

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> 
L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/

T:	git git://git.fluff.org/bjdooks/linux.git

T:	git git://git.pengutronix.de/git/wsa/linux.git

S:	Maintained

F:	Documentation/i2c/

F:	drivers/i2c/

drivers/i2c/algos/i2c-algo-pca.c

+3 −3
Original line number Diff line number Diff line
@@ -476,17 +476,17 @@ static int pca_init(struct i2c_adapter *adap) 
		/* To avoid integer overflow, use clock/100 for calculations */

		clock = pca_clock(pca_data) / 100;



		if (pca_data->i2c_clock > 10000) {

		if (pca_data->i2c_clock > 1000000) {

			mode = I2C_PCA_MODE_TURBO;

			min_tlow = 14;

			min_thi  = 5;

			raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */

		} else if (pca_data->i2c_clock > 4000) {

		} else if (pca_data->i2c_clock > 400000) {

			mode = I2C_PCA_MODE_FASTP;

			min_tlow = 17;

			min_thi  = 9;

			raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */

		} else if (pca_data->i2c_clock > 1000) {

		} else if (pca_data->i2c_clock > 100000) {

			mode = I2C_PCA_MODE_FAST;

			min_tlow = 44;

			min_thi  = 20;

drivers/i2c/busses/i2c-mxs.c

+6 −7
Original line number Diff line number Diff line
@@ -365,10 +365,6 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c) 
	struct device_node *node = dev->of_node;

	int ret;



	if (!node)

		return -EINVAL;



	i2c->speed = &mxs_i2c_95kHz_config;

	ret = of_property_read_u32(node, "clock-frequency", &speed);

	if (ret)

		dev_warn(dev, "No I2C speed selected, using 100kHz\n");
@@ -419,10 +415,13 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev) 
		return err;



	i2c->dev = dev;

	i2c->speed = &mxs_i2c_95kHz_config;



	if (dev->of_node) {

		err = mxs_i2c_get_ofdata(i2c);

		if (err)

			return err;

	}



	platform_set_drvdata(pdev, i2c);

drivers/i2c/busses/i2c-pnx.c

+31 −22
Original line number Diff line number Diff line
@@ -48,8 +48,9 @@ enum { 
	mcntrl_afie = 0x00000002,

	mcntrl_naie = 0x00000004,

	mcntrl_drmie = 0x00000008,

	mcntrl_daie = 0x00000020,

	mcntrl_rffie = 0x00000040,

	mcntrl_drsie = 0x00000010,

	mcntrl_rffie = 0x00000020,

	mcntrl_daie = 0x00000040,

	mcntrl_tffie = 0x00000080,

	mcntrl_reset = 0x00000100,

	mcntrl_cdbmode = 0x00000400,
@@ -290,11 +291,16 @@ static int i2c_pnx_master_rcv(struct i2c_pnx_algo_data *alg_data) 
	 * or we didn't 'ask' for it yet.

	 */

	if (ioread32(I2C_REG_STS(alg_data)) & mstatus_rfe) {

		/* 'Asking' is done asynchronously, e.g. dummy TX of several

		 * bytes is done before the first actual RX arrives in FIFO.

		 * Therefore, ordered bytes (via TX) are counted separately.

		 */

		if (alg_data->mif.order) {

			dev_dbg(&alg_data->adapter.dev,

				"%s(): Write dummy data to fill Rx-fifo...\n",

				__func__);



		if (alg_data->mif.len == 1) {

			if (alg_data->mif.order == 1) {

				/* Last byte, do not acknowledge next rcv. */

				val |= stop_bit;
@@ -314,7 +320,8 @@ static int i2c_pnx_master_rcv(struct i2c_pnx_algo_data *alg_data) 
			 * write a (dummy) byte to the Tx-FIFO.

			 */

			iowrite32(val, I2C_REG_TX(alg_data));



			alg_data->mif.order--;

		}

		return 0;

	}
@@ -514,6 +521,7 @@ i2c_pnx_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 


		alg_data->mif.buf = pmsg->buf;

		alg_data->mif.len = pmsg->len;

		alg_data->mif.order = pmsg->len;

		alg_data->mif.mode = (pmsg->flags & I2C_M_RD) ?

			I2C_SMBUS_READ : I2C_SMBUS_WRITE;

		alg_data->mif.ret = 0;
@@ -566,6 +574,7 @@ i2c_pnx_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
	/* Cleanup to be sure... */

	alg_data->mif.buf = NULL;

	alg_data->mif.len = 0;

	alg_data->mif.order = 0;



	dev_dbg(&alg_data->adapter.dev, "%s(): exiting, stat = %x\n",

		__func__, ioread32(I2C_REG_STS(alg_data)));

include/linux/i2c-pnx.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct i2c_pnx_mif { 
	struct timer_list	timer;		/* Timeout */

	u8 *			buf;		/* Data buffer */

	int			len;		/* Length of data buffer */

	int			order;		/* RX Bytes to order via TX */

};



struct i2c_pnx_algo_data {