From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Apr 2009 15:45:12 +0000 (-0700)
Subject: Merge branch 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e26da0f2200a2fb51844aaa43e365ea9dd5a93d;hp=-c;p=linux-2.6-omap-h63xx.git

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
---

0e26da0f2200a2fb51844aaa43e365ea9dd5a93d
diff --combined arch/powerpc/boot/dts/socrates.dts
index 04c398862e0,8de65b7002d..7a6ae75a1e5
--- a/arch/powerpc/boot/dts/socrates.dts
+++ b/arch/powerpc/boot/dts/socrates.dts
@@@ -52,7 -52,6 +52,7 @@@
  	soc8544@e0000000 {
  		#address-cells = <1>;
  		#size-cells = <1>;
 +		device_type = "soc";
  
  		ranges = <0x00000000 0xe0000000 0x00100000>;
  		reg = <0xe0000000 0x00001000>;	// CCSRBAR 1M
@@@ -79,11 -78,11 +79,11 @@@
  			#address-cells = <1>;
  			#size-cells = <0>;
  			cell-index = <0>;
- 			compatible = "fsl-i2c";
+ 			compatible = "fsl,mpc8544-i2c", "fsl-i2c";
  			reg = <0x3000 0x100>;
  			interrupts = <43 2>;
  			interrupt-parent = <&mpic>;
- 			dfsrr;
+ 			fsl,preserve-clocking;
  
  			dtt@28 {
  				compatible = "winbond,w83782d";
@@@ -111,11 -110,11 +111,11 @@@
  			#address-cells = <1>;
  			#size-cells = <0>;
  			cell-index = <1>;
- 			compatible = "fsl-i2c";
+ 			compatible = "fsl,mpc8544-i2c", "fsl-i2c";
  			reg = <0x3100 0x100>;
  			interrupts = <43 2>;
  			interrupt-parent = <&mpic>;
- 			dfsrr;
+ 			fsl,preserve-clocking;
  		};
  
  		enet0: ethernet@24000 {