ARM: sunxi: dt: Convert to the new i2c compatibles

Switch the device tree to the new compatibles introduced in the i2c drivers
to have a common pattern accross all Allwinner SoCs.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 9174724571e24782a2a3ae57d40538e33890912e..e45fed7fccd44204464beb5ae4c0276eef5695a8 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -641,7 +641,7 @@
                };
 
                i2c0: i2c@01c2ac00 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2ac00 0x400>;
                        interrupts = <7>;
                        clocks = <&apb1_gates 0>;
@@ -650,7 +650,7 @@
                };
 
                i2c1: i2c@01c2b000 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2b000 0x400>;
                        interrupts = <8>;
                        clocks = <&apb1_gates 1>;
@@ -659,7 +659,7 @@
                };
 
                i2c2: i2c@01c2b400 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2b400 0x400>;
                        interrupts = <9>;
                        clocks = <&apb1_gates 2>;

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 79989ed5658d570b36626d871ba6ee2cd083db6e..e260d7da86d6bcdfb6e8a7f5fa2312966dc898d6 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -519,7 +519,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>;
@@ -530,7 +530,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>;
@@ -541,7 +541,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>;

diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index f01c315bdc4b0e1a37b34e4456ef95fb92f01352..1bfd625f020eec8eee77f60a26f034caa668adbf 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -461,7 +461,7 @@
                };
 
                i2c0: i2c@01c2ac00 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun5i-a13-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2ac00 0x400>;
                        interrupts = <7>;
                        clocks = <&apb1_gates 0>;
@@ -470,7 +470,7 @@
                };
 
                i2c1: i2c@01c2b000 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun5i-a13-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2b000 0x400>;
                        interrupts = <8>;
                        clocks = <&apb1_gates 1>;
@@ -479,7 +479,7 @@
                };
 
                i2c2: i2c@01c2b400 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun5i-a13-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2b400 0x400>;
                        interrupts = <9>;
                        clocks = <&apb1_gates 2>;

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index aba1c8a3f3883320a50b31dcac05341568e0a335..7fd44e59c09cac574f5e3ed3475587fe9740a2f6 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -778,7 +778,7 @@
                };
 
                i2c0: i2c@01c2ac00 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2ac00 0x400>;
                        interrupts = <0 7 4>;
                        clocks = <&apb1_gates 0>;
@@ -787,7 +787,7 @@
                };
 
                i2c1: i2c@01c2b000 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2b000 0x400>;
                        interrupts = <0 8 4>;
                        clocks = <&apb1_gates 1>;
@@ -796,7 +796,7 @@
                };
 
                i2c2: i2c@01c2b400 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2b400 0x400>;
                        interrupts = <0 9 4>;
                        clocks = <&apb1_gates 2>;
@@ -805,7 +805,7 @@
                };
 
                i2c3: i2c@01c2b800 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2b800 0x400>;
                        interrupts = <0 88 4>;
                        clocks = <&apb1_gates 3>;
@@ -814,7 +814,7 @@
                };
 
                i2c4: i2c@01c2c000 {
-                       compatible = "allwinner,sun4i-i2c";
+                       compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c";
                        reg = <0x01c2c000 0x400>;
                        interrupts = <0 89 4>;
                        clocks = <&apb1_gates 15>;