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

Commit 44234d0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux 

* 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux:
  i2c-intel-mid: Driver depends on PCI
  i2c-intel-mid: support for Moorestown and Medfield platform
  i2c-nomadik: fixup bus delays
  i2c-nomadik: support smbus emulation
  i2c-nomadik: dynamic clocking
  i2c-nomadik: documentation fixes
  i2c-s3c2410: Enable i2c clock only when doing some transfert
parents 91ab9bf7 9cc11dee

drivers/i2c/busses/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -396,6 +396,16 @@ config I2C_IMX 
	  This driver can also be built as a module.  If so, the module

	  will be called i2c-imx.



config I2C_INTEL_MID

	tristate "Intel Moorestown/Medfield Platform I2C controller"

	depends on PCI

	help

	  Say Y here if you have an Intel Moorestown/Medfield platform I2C

	  controller.



	  This support is also available as a module. If so, the module

	  will be called i2c-intel-mid.



config I2C_IOP3XX

	tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"

	depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX

drivers/i2c/busses/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o 
obj-$(CONFIG_I2C_HIGHLANDER)	+= i2c-highlander.o

obj-$(CONFIG_I2C_IBM_IIC)	+= i2c-ibm_iic.o

obj-$(CONFIG_I2C_IMX)		+= i2c-imx.o

obj-$(CONFIG_I2C_INTEL_MID)	+= i2c-intel-mid.o

obj-$(CONFIG_I2C_IOP3XX)	+= i2c-iop3xx.o

obj-$(CONFIG_I2C_IXP2000)	+= i2c-ixp2000.o

obj-$(CONFIG_I2C_MPC)		+= i2c-mpc.o

drivers/i2c/busses/i2c-intel-mid.c

0 → 100644
+1135 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/i2c/busses/i2c-nomadik.c

+21 −15
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 ST-Ericsson

 * Copyright (C) 2009 ST-Ericsson SA

 * Copyright (C) 2009 STMicroelectronics

 *

 * I2C master mode controller driver, used in Nomadik 8815
@@ -103,6 +103,9 @@ 
/* maximum threshold value */

#define MAX_I2C_FIFO_THRESHOLD	15



/* per-transfer delay, required for the hardware to stabilize */

#define I2C_DELAY		150



enum i2c_status {

	I2C_NOP,

	I2C_ON_GOING,
@@ -118,7 +121,7 @@ enum i2c_operation { 
};



/* controller response timeout in ms */

#define I2C_TIMEOUT_MS	500

#define I2C_TIMEOUT_MS	2000



/**

 * struct i2c_nmk_client - client specific data
@@ -250,6 +253,8 @@ static int init_hw(struct nmk_i2c_dev *dev) 
{

	int stat;



	clk_enable(dev->clk);



	stat = flush_i2c_fifo(dev);

	if (stat)

		return stat;
@@ -263,6 +268,9 @@ static int init_hw(struct nmk_i2c_dev *dev) 


	dev->cli.operation = I2C_NO_OPERATION;



	clk_disable(dev->clk);



	udelay(I2C_DELAY);

	return 0;

}
@@ -431,7 +439,6 @@ static int read_i2c(struct nmk_i2c_dev *dev) 
		(void) init_hw(dev);

		status = -ETIMEDOUT;

	}



	return status;

}
@@ -502,9 +509,9 @@ static int write_i2c(struct nmk_i2c_dev *dev) 


/**

 * nmk_i2c_xfer() - I2C transfer function used by kernel framework

 * @i2c_adap 	- Adapter pointer to the controller

 * @msgs[] - Pointer to data to be written.

 * @num_msgs - Number of messages to be executed

 * @i2c_adap: Adapter pointer to the controller

 * @msgs: Pointer to data to be written.

 * @num_msgs: Number of messages to be executed

 *

 * This is the function called by the generic kernel i2c_transfer()

 * or i2c_smbus...() API calls. Note that this code is protected by the
@@ -559,6 +566,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, 
	if (status)

		return status;



	clk_enable(dev->clk);



	/* setup the i2c controller */

	setup_i2c_controller(dev);
@@ -591,10 +600,13 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, 
			dev_err(&dev->pdev->dev, "%s\n",

				cause >= ARRAY_SIZE(abort_causes)

				? "unknown reason" : abort_causes[cause]);

			clk_disable(dev->clk);

			return status;

		}

		mdelay(1);

		udelay(I2C_DELAY);

	}

	clk_disable(dev->clk);



	/* return the no. messages processed */

	if (status)

		return status;
@@ -605,6 +617,7 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, 
/**

 * disable_interrupts() - disable the interrupts

 * @dev: private data of controller

 * @irq: interrupt number

 */

static int disable_interrupts(struct nmk_i2c_dev *dev, u32 irq)

{
@@ -794,10 +807,7 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg) 


static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap)

{

	return I2C_FUNC_I2C

		| I2C_FUNC_SMBUS_BYTE_DATA

		| I2C_FUNC_SMBUS_WORD_DATA

		| I2C_FUNC_SMBUS_I2C_BLOCK;

	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;

}



static const struct i2c_algorithm nmk_i2c_algo = {
@@ -857,8 +867,6 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev) 
		goto err_no_clk;

	}



	clk_enable(dev->clk);



	adap = &dev->adap;

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

	adap->owner	= THIS_MODULE;
@@ -895,7 +903,6 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev) 
	return 0;



 err_init_hw:

	clk_disable(dev->clk);

 err_add_adap:

	clk_put(dev->clk);

 err_no_clk:
@@ -928,7 +935,6 @@ static int __devexit nmk_i2c_remove(struct platform_device *pdev) 
	iounmap(dev->virtbase);

	if (res)

		release_mem_region(res->start, resource_size(res));

	clk_disable(dev->clk);

	clk_put(dev->clk);

	platform_set_drvdata(pdev, NULL);

	kfree(dev);

drivers/i2c/busses/i2c-s3c2410.c

+9 −1
Original line number Diff line number Diff line
@@ -554,18 +554,23 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, 
	int retry;

	int ret;



	clk_enable(i2c->clk);



	for (retry = 0; retry < adap->retries; retry++) {



		ret = s3c24xx_i2c_doxfer(i2c, msgs, num);



		if (ret != -EAGAIN)

		if (ret != -EAGAIN) {

			clk_disable(i2c->clk);

			return ret;

		}



		dev_dbg(i2c->dev, "Retrying transmission (%d)\n", retry);



		udelay(100);

	}



	clk_disable(i2c->clk);

	return -EREMOTEIO;

}
@@ -910,6 +915,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, i2c);



	dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev));

	clk_disable(i2c->clk);

	return 0;



 err_cpufreq:
@@ -977,7 +983,9 @@ static int s3c24xx_i2c_resume(struct device *dev) 
	struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);



	i2c->suspended = 0;

	clk_enable(i2c->clk);

	s3c24xx_i2c_init(i2c);

	clk_disable(i2c->clk);



	return 0;

}