Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / arch / arc / boot / dts / abilis_tb101_dvk.dts

diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts
index 6f8c381f62685102891817da925d6b6b8aed9827..b204657993aab2fca0127365b74aaced843b9a2e 100644 (file)
--- a/arch/arc/boot/dts/abilis_tb101_dvk.dts
+++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts
@@ -37,7 +37,7 @@
 
        soc100 {
                uart@FF100000 {
-                       pinctrl-names = "abilis,simple-default";
+                       pinctrl-names = "default";
                        pinctrl-0 = <&pctl_uart0>;
                };
                ethernet@FE100000 {
@@ -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 {