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

Commit 0e26da0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c: imx: Make disable_delay a per-device variable
  i2c: xtensa s6000 i2c driver
  powerpc/85xx: i2c-mpc: use new I2C bindings for the Socates board
  i2c: i2c-mpc: make I2C bus speed configurable
  i2c: i2c-mpc: use dev based printout function
  i2c: i2c-mpc: various coding style fixes
  i2c: imx: Add missing request_mem_region in probe()
  i2c: i2c-s3c2410: Initialise Samsung I2C controller early
  i2c-s3c2410: Simplify bus frequency calculation
  i2c-s3c2410: sda_delay should be in ns, not clock ticks
  i2c: iMX/MXC support
parents 10a0d912 65de394d

arch/arm/mach-s3c2410/mach-bast.c

+1 −2
Original line number Diff line number Diff line
@@ -409,8 +409,7 @@ static struct platform_device bast_sio = { 
static struct s3c2410_platform_i2c __initdata bast_i2c_info = {

	.flags		= 0,

	.slave_addr	= 0x10,

	.bus_freq	= 100*1000,

	.max_freq	= 130*1000,

	.frequency	= 100*1000,

};



/* Asix AX88796 10/100 ethernet controller */

arch/arm/mach-s3c2410/mach-n30.c

+1 −2
Original line number Diff line number Diff line
@@ -340,8 +340,7 @@ static struct platform_device *n35_devices[] __initdata = { 
static struct s3c2410_platform_i2c n30_i2ccfg = {

	.flags		= 0,

	.slave_addr	= 0x10,

	.bus_freq	= 10*1000,

	.max_freq	= 10*1000,

	.frequency	= 10*1000,

};



/* Lots of hardcoded stuff, but it sets up the hardware in a useful

arch/arm/mach-s3c2412/mach-jive.c

+1 −2
Original line number Diff line number Diff line
@@ -453,8 +453,7 @@ static struct spi_board_info __initdata jive_spi_devs[] = { 
/* I2C bus and device configuration. */



static struct s3c2410_platform_i2c jive_i2c_cfg __initdata = {

	.max_freq	= 80 * 1000,

	.bus_freq	= 50 * 1000,

	.frequency	= 80 * 1000,

	.flags		= S3C_IICFLG_FILTER,

	.sda_delay	= 2,

};

arch/arm/plat-mxc/include/mach/i2c.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * i2c.h - i.MX I2C driver header file

 *

 * Copyright (c) 2008, Darius Augulis <augulis.darius@gmail.com>

 *

 * This file is released under the GPLv2

 */



#ifndef __ASM_ARCH_I2C_H_

#define __ASM_ARCH_I2C_H_



/**

 * struct imxi2c_platform_data - structure of platform data for MXC I2C driver

 * @init:	Initialise gpio's and other board specific things

 * @exit:	Free everything initialised by @init

 * @bitrate:	Bus speed measured in Hz

 *

 **/

struct imxi2c_platform_data {

	int (*init)(struct device *dev);

	void (*exit)(struct device *dev);

	int bitrate;

};



#endif /* __ASM_ARCH_I2C_H_ */

arch/arm/plat-s3c/dev-i2c0.c

+3 −4
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c/dev-i2c0.c

 *

 * Copyright 2008 Simtec Electronics

 * Copyright 2008,2009 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *
@@ -50,9 +50,8 @@ struct platform_device s3c_device_i2c0 = { 
static struct s3c2410_platform_i2c default_i2c_data0 __initdata = {

	.flags		= 0,

	.slave_addr	= 0x10,

	.bus_freq	= 100*1000,

	.max_freq	= 400*1000,

	.sda_delay	= S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON,

	.frequency	= 100*1000,

	.sda_delay	= 100,

};



void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd)