ARM: mvebu: use improved armada spi device tree compatible name for each SoC

Use the new compatible introduced in order to benefit of a wider and
more accurate range of baud rates to be used.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index ec96f0b3634653a5976739688eca9fd791eaba0b..7f0252c580e4bd0b32a2e2eb5de440bacbfd3b98 100644 (file)
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -149,7 +149,6 @@
                        };
 
                        spi0: spi@10600 {
-                               compatible = "marvell,armada-370-spi", "marvell,orion-spi";
                                reg = <0x10600 0x28>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -160,7 +159,6 @@
                        };
 
                        spi1: spi@10680 {
-                               compatible = "marvell,armada-370-spi", "marvell,orion-spi";
                                reg = <0x10680 0x28>;
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 00b50db57c9c0f7ab4111bbdba06d3fd0bdc93ad..3f036bd635f4207ac2ffe87e809155a51debaa64 100644 (file)
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -139,11 +139,15 @@
                         * board level if a different configuration is used.
                         */
                        spi0: spi@10600 {
+                               compatible = "marvell,armada-370-spi",
+                                               "marvell,orion-spi";
                                pinctrl-0 = <&spi0_pins1>;
                                pinctrl-names = "default";
                        };
 
                        spi1: spi@10680 {
+                               compatible = "marvell,armada-370-spi",
+                                               "marvell,orion-spi";
                                pinctrl-0 = <&spi1_pins>;
                                pinctrl-names = "default";
                        };

diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index c675257f2377f8797565871e38e77ba50fe7678b..b4ee2e5deb5f05ec6198514957bbcad86f314218 100644 (file)
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -238,7 +238,8 @@
                        };
 
                        spi0: spi@10600 {
-                               compatible = "marvell,orion-spi";
+                               compatible = "marvell,armada-375-spi",
+                                               "marvell,orion-spi";
                                reg = <0x10600 0x50>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -249,7 +250,8 @@
                        };
 
                        spi1: spi@10680 {
-                               compatible = "marvell,orion-spi";
+                               compatible = "marvell,armada-375-spi",
+                                               "marvell,orion-spi";
                                reg = <0x10680 0x50>;
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 839e5bfc13c3f1130da6fa623b96117998f61277..26bbcc55dcfe8f2849e94d0e389da66cc24e473a 100644 (file)
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -167,7 +167,8 @@
                        };
 
                        spi0: spi@10600 {
-                               compatible = "marvell,orion-spi";
+                               compatible = "marvell,armada-380-spi",
+                                               "marvell,orion-spi";
                                reg = <0x10600 0x50>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -178,7 +179,8 @@
                        };
 
                        spi1: spi@10680 {
-                               compatible = "marvell,orion-spi";
+                               compatible = "marvell,armada-380-spi",
+                                               "marvell,orion-spi";
                                reg = <0x10680 0x50>;
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 0e85fc15cedad84c1ea5ebea6db033a2ace60703..7daf2c2a17937f210fef9594ead0a52577b00073 100644 (file)
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -128,7 +128,8 @@
                        };
 
                        spi0: spi@10600 {
-                               compatible = "marvell,orion-spi";
+                               compatible = "marvell,armada-390-spi",
+                                               "marvell,orion-spi";
                                reg = <0x10600 0x50>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -139,7 +140,8 @@
                        };
 
                        spi1: spi@10680 {
-                               compatible = "marvell,orion-spi";
+                               compatible = "marvell,armada-390-spi",
+                                               "marvell,orion-spi";
                                reg = <0x10680 0x50>;
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 013d63f69e361e60bbe96466bec1883388155889..e78ce4ab6b75b03d4fd0785388b1d4d47c4ef1cd 100644 (file)
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -85,10 +85,18 @@
                        };
 
                        spi0: spi@10600 {
+                               compatible = "marvell,armada-xp-spi",
+                                               "marvell,orion-spi";
                                pinctrl-0 = <&spi0_pins>;
                                pinctrl-names = "default";
                        };
 
+                       spi1: spi@10680 {
+                               compatible = "marvell,armada-xp-spi",
+                                               "marvell,orion-spi";
+                       };
+
+
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
                                reg = <0x11000 0x100>;