diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:45:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:45:12 -0400 |
| commit | 0e26da0f2200a2fb51844aaa43e365ea9dd5a93d (patch) | |
| tree | 73409a696901934da5f6df976c6521d3e50e8749 /arch/powerpc | |
| parent | 10a0d912898ac2fe49094acf2c1339d0fb4c2bc6 (diff) | |
| parent | 65de394df21f8ccc61525f77b0e4ee6940a0932e (diff) | |
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
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/boot/dts/socrates.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/socrates.dts b/arch/powerpc/boot/dts/socrates.dts index 04c398862e03..7a6ae75a1e57 100644 --- a/arch/powerpc/boot/dts/socrates.dts +++ b/arch/powerpc/boot/dts/socrates.dts | |||
| @@ -79,11 +79,11 @@ | |||
| 79 | #address-cells = <1>; | 79 | #address-cells = <1>; |
| 80 | #size-cells = <0>; | 80 | #size-cells = <0>; |
| 81 | cell-index = <0>; | 81 | cell-index = <0>; |
| 82 | compatible = "fsl-i2c"; | 82 | compatible = "fsl,mpc8544-i2c", "fsl-i2c"; |
| 83 | reg = <0x3000 0x100>; | 83 | reg = <0x3000 0x100>; |
| 84 | interrupts = <43 2>; | 84 | interrupts = <43 2>; |
| 85 | interrupt-parent = <&mpic>; | 85 | interrupt-parent = <&mpic>; |
| 86 | dfsrr; | 86 | fsl,preserve-clocking; |
| 87 | 87 | ||
| 88 | dtt@28 { | 88 | dtt@28 { |
| 89 | compatible = "winbond,w83782d"; | 89 | compatible = "winbond,w83782d"; |
| @@ -111,11 +111,11 @@ | |||
| 111 | #address-cells = <1>; | 111 | #address-cells = <1>; |
| 112 | #size-cells = <0>; | 112 | #size-cells = <0>; |
| 113 | cell-index = <1>; | 113 | cell-index = <1>; |
| 114 | compatible = "fsl-i2c"; | 114 | compatible = "fsl,mpc8544-i2c", "fsl-i2c"; |
| 115 | reg = <0x3100 0x100>; | 115 | reg = <0x3100 0x100>; |
| 116 | interrupts = <43 2>; | 116 | interrupts = <43 2>; |
| 117 | interrupt-parent = <&mpic>; | 117 | interrupt-parent = <&mpic>; |
| 118 | dfsrr; | 118 | fsl,preserve-clocking; |
| 119 | }; | 119 | }; |
| 120 | 120 | ||
| 121 | enet0: ethernet@24000 { | 121 | enet0: ethernet@24000 { |