Merge tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixes

From Jason Cooper:
mvebu DT fixes for v3.15

 - mvebu
    - fix NOR bus width on Armada XP boards
    - use qsgmii on Armada XP GP board
    - add i2c bus freq for Armada 370 DB board
    - add SATA interface for Armada 375 DB

 - kirkwood
    - fix double probe of audio codec for T5325

* tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: T5325: Fix double probe of Codec
  ARM: mvebu: enable the SATA interface on Armada 375 DB
  ARM: mvebu: specify I2C bus frequency on Armada 370 DB
  ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces
  ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree

Signed-off-by: Olof Johansson <olof@lixom.net>

6 files changed, 13 insertions, 12 deletions

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 82f238a9063f..3383c4b66803 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -67,6 +67,7 @@
                         i2c@11000 {
                                 pinctrl-0 = <&i2c0_pins>;
                                 pinctrl-names = "default";
+                                clock-frequency = <100000>;
                                 status = "okay";
                                 audio_codec: audio-codec@4a {
                                         compatible = "cirrus,cs42l51";
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index 9378d3136b41..0451124e8ebf 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -79,6 +79,11 @@
                                 };
                         };
 
+                        sata@a0000 {
+                                status = "okay";
+                                nr-ports = <2>;
+                        };
+
                         nand: nand@d0000 {
                                 pinctrl-0 = <&nand_pins>;
                                 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 448373c4b0e5..90f0bf6f9271 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -49,7 +49,7 @@
                         /* Device Bus parameters are required */
 
                         /* Read parameters */
-                        devbus,bus-width    = <8>;
+                        devbus,bus-width    = <16>;
                         devbus,turn-off-ps  = <60000>;
                         devbus,badr-skew-ps = <0>;
                         devbus,acc-first-ps = <124000>;
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 61bda687f782..0c756421ae6a 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -59,7 +59,7 @@
                         /* Device Bus parameters are required */
 
                         /* Read parameters */
-                        devbus,bus-width    = <8>;
+                        devbus,bus-width    = <16>;
                         devbus,turn-off-ps  = <60000>;
                         devbus,badr-skew-ps = <0>;
                         devbus,acc-first-ps = <124000>;
@@ -146,22 +146,22 @@
                         ethernet@70000 {
                                 status = "okay";
                                 phy = <&phy0>;
-                                phy-mode = "rgmii-id";
+                                phy-mode = "qsgmii";
                         };
                         ethernet@74000 {
                                 status = "okay";
                                 phy = <&phy1>;
-                                phy-mode = "rgmii-id";
+                                phy-mode = "qsgmii";
                         };
                         ethernet@30000 {
                                 status = "okay";
                                 phy = <&phy2>;
-                                phy-mode = "rgmii-id";
+                                phy-mode = "qsgmii";
                         };
                         ethernet@34000 {
                                 status = "okay";
                                 phy = <&phy3>;
-                                phy-mode = "rgmii-id";
+                                phy-mode = "qsgmii";
                         };
 
                         /* Front-side USB slot */
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 985948ce67b3..5d42feb31049 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -39,7 +39,7 @@
                         /* Device Bus parameters are required */
 
                         /* Read parameters */
-                        devbus,bus-width    = <8>;
+                        devbus,bus-width    = <16>;
                         devbus,turn-off-ps  = <60000>;
                         devbus,badr-skew-ps = <0>;
                         devbus,acc-first-ps = <124000>;
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index 7d1c7677a18f..0bd70d928c69 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -127,11 +127,6 @@
 
                 i2c@11000 {
                         status = "okay";
-
-                        alc5621: alc5621@1a {
-                                compatible = "realtek,alc5621";
-                                reg = <0x1a>;
-                        };
                 };
 
                 serial@12000 {