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

Commit 65795efb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux 

* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-stu300: Make driver depend on MACH_U300
  i2c-s3c2410: use resource_size()
  i2c: Use resource_size macro
  i2c: ST DDC I2C U300 bus driver v3
  i2c-bfin-twi: pull in io.h for ioremap()
parents 8d15b0ec 4eaad8ad

drivers/i2c/busses/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -513,6 +513,19 @@ config I2C_SIMTEC 
	  This driver can also be built as a module. If so, the module

	  will be called i2c-simtec.



config I2C_STU300

	tristate "ST Microelectronics DDC I2C interface"

	depends on MACH_U300

	default y if MACH_U300

	help

	  If you say yes to this option, support will be included for the

	  I2C interface from ST Microelectronics simply called "DDC I2C"

	  supporting both I2C and DDC, used in e.g. the U300 series

	  mobile platforms.



	  This driver can also be built as a module. If so, the module

	  will be called i2c-stu300.



config I2C_VERSATILE

	tristate "ARM Versatile/Realview I2C bus support"

	depends on ARCH_VERSATILE || ARCH_REALVIEW

drivers/i2c/busses/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ obj-$(CONFIG_I2C_S6000) += i2c-s6000.o 
obj-$(CONFIG_I2C_SH7760)	+= i2c-sh7760.o

obj-$(CONFIG_I2C_SH_MOBILE)	+= i2c-sh_mobile.o

obj-$(CONFIG_I2C_SIMTEC)	+= i2c-simtec.o

obj-$(CONFIG_I2C_STU300)	+= i2c-stu300.o

obj-$(CONFIG_I2C_VERSATILE)	+= i2c-versatile.o



# External I2C/SMBus adapter drivers

drivers/i2c/busses/i2c-at91.c

+4 −4
Original line number Diff line number Diff line
@@ -200,10 +200,10 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev) 
	if (!res)

		return -ENXIO;



	if (!request_mem_region(res->start, res->end - res->start + 1, "at91_i2c"))

	if (!request_mem_region(res->start, resource_size(res), "at91_i2c"))

		return -EBUSY;



	twi_base = ioremap(res->start, res->end - res->start + 1);

	twi_base = ioremap(res->start, resource_size(res));

	if (!twi_base) {

		rc = -ENOMEM;

		goto fail0;
@@ -252,7 +252,7 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev) 
fail1:

	iounmap(twi_base);

fail0:

	release_mem_region(res->start, res->end - res->start + 1);

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



	return rc;

}
@@ -268,7 +268,7 @@ static int __devexit at91_i2c_remove(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	iounmap(twi_base);

	release_mem_region(res->start, res->end - res->start + 1);

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



	clk_disable(twi_clk);		/* disable peripheral clock */

	clk_put(twi_clk);

drivers/i2c/busses/i2c-au1550.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ i2c_au1550_probe(struct platform_device *pdev) 
		goto out;

	}



	priv->ioarea = request_mem_region(r->start, r->end - r->start + 1,

	priv->ioarea = request_mem_region(r->start, resource_size(r),

					  pdev->name);

	if (!priv->ioarea) {

		ret = -EBUSY;

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

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/mm.h>

#include <linux/timer.h>

#include <linux/spinlock.h>
@@ -651,7 +652,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) 
		goto out_error_get_res;

	}



	iface->regs_base = ioremap(res->start, res->end - res->start + 1);

	iface->regs_base = ioremap(res->start, resource_size(res));

	if (iface->regs_base == NULL) {

		dev_err(&pdev->dev, "Cannot map IO\n");

		rc = -ENXIO;