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

Pull i2c updates from Wolfram Sang:
 - new drivers: Kontron PLD, Wondermedia VT
 - mv64xxx driver gained sun4i support and a bigger cleanup
 - duplicate driver 'intel-mid' removed
 - added generic device tree binding for sda holding time (and
   designware driver already uses it)
 - we tried to allow driver probing with only device tree and no i2c
   ids, but I had to revert it because of side effects.  Needs some
   rethinking.
 - driver bugfixes, cleanups...

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (34 commits)
  i2c-designware: use div_u64 to fix link
  i2c: Kontron PLD i2c bus driver
  i2c: iop3xxx: fix build failure after waitqueue changes
  i2c-designware: make SDA hold time configurable
  i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided
  i2c: imx: allow autoloading on dt ids
  i2c: mv64xxx: Fix transfer error code
  i2c: i801: SMBus patch for Intel Coleto Creek DeviceIDs
  i2c: omap: correct usage of the interrupt enable register
  i2c-pxa: prepare clock before use
  Revert "i2c: core: make it possible to match a pure device tree driver"
  i2c: nomadik: allocate adapter number dynamically
  i2c: nomadik: support elder Nomadiks
  i2c: mv64xxx: Add Allwinner sun4i compatible
  i2c: mv64xxx: make the registers offset configurable
  i2c: mv64xxx: Add macros to access parts of registers
  i2c: vt8500: Add support for I2C bus on Wondermedia SoCs
  i2c: designware: fix race between subsequent xfers
  i2c: bfin-twi: Read and write the FIFO in loop
  i2c: core: make it possible to match a pure device tree driver
  ...

2 files changed, 10 insertions, 10 deletions

diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts
index 0fa0d4abe795..ebc313a9f5b2 100644
--- a/arch/arc/boot/dts/abilis_tb100_dvk.dts
+++ b/arch/arc/boot/dts/abilis_tb100_dvk.dts
@@ -45,19 +45,19 @@
                 };
 
                 i2c0: i2c@FF120000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c1: i2c@FF121000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c2: i2c@FF122000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c3: i2c@FF123000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c4: i2c@FF124000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
 
                 leds {
diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts
index a4d80ce283ae..b204657993aa 100644
--- a/arch/arc/boot/dts/abilis_tb101_dvk.dts
+++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts
@@ -45,19 +45,19 @@
                 };
 
                 i2c0: i2c@FF120000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c1: i2c@FF121000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c2: i2c@FF122000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c3: i2c@FF123000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
                 i2c4: i2c@FF124000 {
-                        sda-hold-time = <432>;
+                        i2c-sda-hold-time-ns = <432>;
                 };
 
                 leds {