Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

Pull i2c-embedded changes from Wolfram Sang:
 "The changes for i2c-embedded include:

   - massive rework of the omap driver
   - massive rework of the at91 driver.  In fact, the old driver gets
     removed; I am okay with this approach since the old driver was
     depending on BROKEN and its limitations made it practically
     unusable, so people used bitbanging instead.  But even if there are
     users, there is no platform_data or module parameter which would
     need to be converted.  It is just another driver doing I2C
     transfers, just way better.  Modifications of arch/arm/at91 related
     files have proper acks from the maintainer.
   - new driver for R-Car I2C
   - devicetree and generic_clock conversions and fixes
   - usual driver fixes and changes.

  The rework patches have come a long way and lots of people have been
  involved in creating/testing them.  Most patches have been in
  linux-next at least since 3.6-rc5.  A few have been added in the last
  week, I have to admit.

  An unexpected (but welcome :)) peak in private life is the cause for
  that.  The "late" patches shouldn't cause any merge conflicts and I
  will have a special eye on them during the stabilization phase.  This
  is an exception and I want to have the patches in place properly in
  time again for the next kernels."

* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (44 commits)
  MXS: Implement DMA support into mxs-i2c
  i2c: add Renesas R-Car I2C driver
  i2c: s3c2410: use clk_prepare_enable and clk_disable_unprepare
  ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints
  i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
  i2c: algo: pca: Fix chip reset function for PCA9665
  i2c: mpc: Wait for STOP to hit the bus
  i2c: davinci: preparation for switch to common clock framework
  omap-i2c: fix incorrect log message when using a device tree
  i2c: omap: sanitize exit path
  i2c: omap: switch over to autosuspend API
  i2c: omap: remove unnecessary pm_runtime_suspended check
  i2c: omap: switch to threaded IRQ support
  i2c: omap: remove redundant status read
  i2c: omap: get rid of the "complete" label
  i2c: omap: resize fifos before each message
  i2c: omap: simplify IRQ exit path
  i2c: omap: always return IRQ_HANDLED
  i2c: omap: simplify errata check
  i2c: omap: bus: add a receiver flag
  ...

10 files changed, 124 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 7c95f76398de..d410581a5a85 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -28,6 +28,7 @@
                 gpio2 = &pioC;
                 tcb0 = &tcb0;
                 tcb1 = &tcb1;
+                i2c0 = &i2c0;
         };
         cpus {
                 cpu@0 {
@@ -202,6 +203,15 @@
                                 status = "disabled";
                         };
 
+                        i2c0: i2c@fffac000 {
+                                compatible = "atmel,at91sam9260-i2c";
+                                reg = <0xfffac000 0x100>;
+                                interrupts = <11 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
                         adc0: adc@fffe0000 {
                                 compatible = "atmel,at91sam9260-adc";
                                 reg = <0xfffe0000 0x100>;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 195019b7ca0e..3e6e5c1abbf3 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -24,6 +24,7 @@
                 gpio3 = &pioD;
                 gpio4 = &pioE;
                 tcb0 = &tcb0;
+                i2c0 = &i2c0;
         };
         cpus {
                 cpu@0 {
@@ -185,6 +186,15 @@
                                 interrupts = <24 4 2>;
                                 status = "disabled";
                         };
+
+                        i2c0: i2c@fff88000 {
+                                compatible = "atmel,at91sam9263-i2c";
+                                reg = <0xfff88000 0x100>;
+                                interrupts = <13 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 2a1d1ca8bd86..75ce6e760016 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -18,6 +18,10 @@
 
         ahb {
                 apb {
+                        i2c0: i2c@fffac000 {
+                                compatible = "atmel,at91sam9g20-i2c";
+                        };
+
                         adc0: adc@fffe0000 {
                                 atmel,adc-startup-time = <40>;
                         };
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index 96514c134e54..877c08f06763 100644
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -32,6 +32,18 @@
                                 phy-mode = "rmii";
                                 status = "okay";
                         };
+
+                        i2c0: i2c@f8010000 {
+                                status = "okay";
+                        };
+
+                        i2c1: i2c@f8014000 {
+                                status = "okay";
+                        };
+
+                        i2c2: i2c@f8018000 {
+                                status = "okay";
+                        };
                 };
 
                 usb0: ohci@00600000 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 63751b1e744b..3add030d61f8 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -29,6 +29,8 @@
                 gpio4 = &pioE;
                 tcb0 = &tcb0;
                 tcb1 = &tcb1;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
         };
         cpus {
                 cpu@0 {
@@ -206,6 +208,24 @@
                                 status = "disabled";
                         };
 
+                        i2c0: i2c@fff84000 {
+                                compatible = "atmel,at91sam9g10-i2c";
+                                reg = <0xfff84000 0x100>;
+                                interrupts = <12 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
+                        i2c1: i2c@fff88000 {
+                                compatible = "atmel,at91sam9g10-i2c";
+                                reg = <0xfff88000 0x100>;
+                                interrupts = <13 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
                         adc0: adc@fffb0000 {
                                 compatible = "atmel,at91sam9260-adc";
                                 reg = <0xfffb0000 0x100>;
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index a3633bd13111..15e1dd43f625 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -46,6 +46,14 @@
                                 phy-mode = "rmii";
                                 status = "okay";
                         };
+
+                        i2c0: i2c@fff84000 {
+                                status = "okay";
+                        };
+
+                        i2c1: i2c@fff88000 {
+                                status = "okay";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index ef9336ae9614..82508d68aa7e 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -26,6 +26,8 @@
                 gpio3 = &pioD;
                 tcb0 = &tcb0;
                 tcb1 = &tcb1;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
         };
         cpus {
                 cpu@0 {
@@ -182,6 +184,24 @@
                                 atmel,use-dma-tx;
                                 status = "disabled";
                         };
+
+                        i2c0: i2c@f8010000 {
+                                compatible = "atmel,at91sam9x5-i2c";
+                                reg = <0xf8010000 0x100>;
+                                interrupts = <9 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
+                        i2c1: i2c@f8014000 {
+                                compatible = "atmel,at91sam9x5-i2c";
+                                reg = <0xf8014000 0x100>;
+                                interrupts = <10 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index f4e43e38f3a1..912b2c283d6f 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -37,6 +37,14 @@
                         dbgu: serial@fffff200 {
                                 status = "okay";
                         };
+
+                        i2c0: i2c@f8010000 {
+                                status = "okay";
+                        };
+
+                        i2c1: i2c@f8014000 {
+                                status = "okay";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 8a387a8d61b7..03fc136421c5 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -27,6 +27,9 @@
                 gpio3 = &pioD;
                 tcb0 = &tcb0;
                 tcb1 = &tcb1;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                i2c2 = &i2c2;
         };
         cpus {
                 cpu@0 {
@@ -196,6 +199,33 @@
                                 status = "disabled";
                         };
 
+                        i2c0: i2c@f8010000 {
+                                compatible = "atmel,at91sam9x5-i2c";
+                                reg = <0xf8010000 0x100>;
+                                interrupts = <9 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
+                        i2c1: i2c@f8014000 {
+                                compatible = "atmel,at91sam9x5-i2c";
+                                reg = <0xf8014000 0x100>;
+                                interrupts = <10 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
+                        i2c2: i2c@f8018000 {
+                                compatible = "atmel,at91sam9x5-i2c";
+                                reg = <0xf8018000 0x100>;
+                                interrupts = <11 4 6>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
                         adc0: adc@f804c000 {
                                 compatible = "atmel,at91sam9260-adc";
                                 reg = <0xf804c000 0x100>;
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 59fbfba23df8..e16d63155480 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -764,6 +764,7 @@
                                 reg = <0x80058000 0x2000>;
                                 interrupts = <111 68>;
                                 clock-frequency = <100000>;
+                                fsl,i2c-dma-channel = <6>;
                                 status = "disabled";
                         };
 
@@ -774,6 +775,7 @@
                                 reg = <0x8005a000 0x2000>;
                                 interrupts = <110 69>;
                                 clock-frequency = <100000>;
+                                fsl,i2c-dma-channel = <7>;
                                 status = "disabled";
                         };