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

Commit fe3c560b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux:
  i2c-bfin-twi: move setup to the earlier subsys initcall
  i2c-bfin-twi: handle faulty slave devices better
  i2c-mv64xxx: send repeated START between messages in xfer
  i2c-nomadik: fix regression on adapter name
  i2c-omap: Set latency requirements only once for several messages
  i2c-eg20t: add driver for Intel EG20T
  i2c-ocores: add some device tree documentation
  i2c-ocores: Use devres for resource allocation
  i2c-ocores: Adapt for device tree
  i2c-iop3xx: add iomem annotation
parents d2005603 dad92924

drivers/i2c/busses/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -638,6 +638,14 @@ config I2C_XILINX 
	  This driver can also be built as a module.  If so, the module

	  will be called xilinx_i2c.



config I2C_EG20T

        tristate "PCH I2C of Intel EG20T"

        depends on PCI

        help

          This driver is for PCH(Platform controller Hub) I2C of EG20T which

          is an IOH(Input/Output Hub) for x86 embedded processor.

          This driver can access PCH I2C bus device.



comment "External I2C/SMBus adapter drivers"



config I2C_PARPORT

drivers/i2c/busses/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ obj-$(CONFIG_I2C_STU300) += i2c-stu300.o 
obj-$(CONFIG_I2C_VERSATILE)	+= i2c-versatile.o

obj-$(CONFIG_I2C_OCTEON)	+= i2c-octeon.o

obj-$(CONFIG_I2C_XILINX)	+= i2c-xiic.o

obj-$(CONFIG_I2C_EG20T)         += i2c-eg20t.o



# External I2C/SMBus adapter drivers

obj-$(CONFIG_I2C_PARPORT)	+= i2c-parport.o

drivers/i2c/busses/i2c-bfin-twi.c

+23 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/completion.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/delay.h>



#include <asm/blackfin.h>

#include <asm/portmux.h>
@@ -159,6 +160,27 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface, 
		if (mast_stat & BUFWRERR)

			dev_dbg(&iface->adap.dev, "Buffer Write Error\n");



		/* Faulty slave devices, may drive SDA low after a transfer

		 * finishes. To release the bus this code generates up to 9

		 * extra clocks until SDA is released.

		 */



		if (read_MASTER_STAT(iface) & SDASEN) {

			int cnt = 9;

			do {

				write_MASTER_CTL(iface, SCLOVR);

				udelay(6);

				write_MASTER_CTL(iface, 0);

				udelay(6);

			} while ((read_MASTER_STAT(iface) & SDASEN) && cnt--);



			write_MASTER_CTL(iface, SDAOVR | SCLOVR);

			udelay(6);

			write_MASTER_CTL(iface, SDAOVR);

			udelay(6);

			write_MASTER_CTL(iface, 0);

		}



		/* If it is a quick transfer, only address without data,

		 * not an err, return 1.

		 */
@@ -760,7 +782,7 @@ static void __exit i2c_bfin_twi_exit(void) 
	platform_driver_unregister(&i2c_bfin_twi_driver);

}



module_init(i2c_bfin_twi_init);

subsys_initcall(i2c_bfin_twi_init);

module_exit(i2c_bfin_twi_exit);



MODULE_AUTHOR("Bryan Wu, Sonic Zhang");

drivers/i2c/busses/i2c-eg20t.c

0 → 100644
+900 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/i2c/busses/i2c-iop3xx.c

+3 −3
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev) 
		IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE);

	__raw_writel(cr, adapter_data->ioaddr + CR_OFFSET);



	iounmap((void __iomem*)adapter_data->ioaddr);

	iounmap(adapter_data->ioaddr);

	release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);

	kfree(adapter_data);

	kfree(padapter);
@@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) 
	/* set the adapter enumeration # */

	adapter_data->id = i2c_id++;



	adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE);

	adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE);

	if (!adapter_data->ioaddr) {

		ret = -ENOMEM;

		goto release_region;
@@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) 
	return 0;



unmap:

	iounmap((void __iomem*)adapter_data->ioaddr);

	iounmap(adapter_data->ioaddr);



release_region:

	release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);