Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into next

Pull i2c updates from Wolfram Sang:
 "I2C has the following updates for 3.16:

   - major cleanups to the rcar and sh_mobile drivers
   - removal of nuc900 driver which had a compile error for years
   - usual bunch of driver updates, bugfixes and cleanups"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (44 commits)
  i2c: pca954x: Fix compilation without CONFIG_GPIOLIB
  i2c: mux: pca954x: Use the descriptor-based GPIO API
  i2c: mpc: insert DR read in i2c_fixup()
  i2c: bfin: turn to Resource-managed API in probe function
  i2c: Make of_device_id array const
  i2c: remove unnecessary OOM messages
  i2c: designware-pci: Add Haswell PCI IDs
  i2c: designware: Add runtime PM hooks
  i2c: designware: Disable device on system suspend
  i2c: nuc900: remove driver
  i2c: imx: update i2c clock divider for each transaction
  i2c: imx: fix the i2c bus hang issue when do repeat restart
  i2c: rcar: update copyright and license information
  i2c: rcar: janitorial cleanup after refactoring
  i2c: rcar: reuse status bits as enable bits
  i2c: rcar: remove spinlock
  i2c: rcar: refactor status bit handling
  i2c: rcar: refactor setting up msg
  i2c: rcar: check bus free before first message
  i2c: rcar: refactor irq state machine
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index aa1dd59dc34a..b64f705d9008 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -560,7 +560,7 @@
                 i2c0: i2c@01c2ac00 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        compatible = "allwinner,sun4i-i2c";
+                        compatible = "allwinner,sun5i-a10s-i2c", "allwinner,sun4i-a10-i2c";
                         reg = <0x01c2ac00 0x400>;
                         interrupts = <7>;
                         clocks = <&apb1_gates 0>;
@@ -571,7 +571,7 @@
                 i2c1: i2c@01c2b000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        compatible = "allwinner,sun4i-i2c";
+                        compatible = "allwinner,sun5i-a10s-i2c", "allwinner,sun4i-a10-i2c";
                         reg = <0x01c2b000 0x400>;
                         interrupts = <8>;
                         clocks = <&apb1_gates 1>;
@@ -582,7 +582,7 @@
                 i2c2: i2c@01c2b400 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        compatible = "allwinner,sun4i-i2c";
+                        compatible = "allwinner,sun5i-a10s-i2c", "allwinner,sun4i-a10-i2c";
                         reg = <0x01c2b400 0x400>;
                         interrupts = <9>;
                         clocks = <&apb1_gates 2>;