Merge branch 'mmp/fixes' into arm/fixes

These three fixes should make it into linux-5.7 and
also into the branch for other mmp dt changes for v5.8,
so I created a branch for them.

* mmp/fixes:
  ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy
  ARM: dts: mmp3-dell-ariel: Fix the SPI devices
  ARM: dts: mmp3: Use the MMP3 compatible string for /clocks

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index 15449c7..b0ec14c 100644 (file)
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -98,19 +98,19 @@
        status = "okay";
 };
 
-&ssp3 {
+&ssp1 {
        status = "okay";
-       cs-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
+       cs-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 
        firmware-flash@0 {
-               compatible = "st,m25p80", "jedec,spi-nor";
+               compatible = "winbond,w25q32", "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <40000000>;
+               spi-max-frequency = <104000000>;
                m25p,fast-read;
        };
 };
 
-&ssp4 {
-       cs-gpios = <&gpio 56 GPIO_ACTIVE_HIGH>;
+&ssp2 {
+       cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 9b5087a..826f0a5 100644 (file)
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -202,8 +202,7 @@
                        };
 
                        hsic_phy0: hsic-phy@f0001800 {
-                               compatible = "marvell,mmp3-hsic-phy",
-                                            "usb-nop-xceiv";
+                               compatible = "marvell,mmp3-hsic-phy";
                                reg = <0xf0001800 0x40>;
                                #phy-cells = <0>;
                                status = "disabled";
@@ -224,8 +223,7 @@
                        };
 
                        hsic_phy1: hsic-phy@f0002800 {
-                               compatible = "marvell,mmp3-hsic-phy",
-                                            "usb-nop-xceiv";
+                               compatible = "marvell,mmp3-hsic-phy";
                                reg = <0xf0002800 0x40>;
                                #phy-cells = <0>;
                                status = "disabled";
@@ -531,7 +529,7 @@
                };
 
                soc_clocks: clocks@d4050000 {
-                       compatible = "marvell,mmp2-clock";
+                       compatible = "marvell,mmp3-clock";
                        reg = <0xd4050000 0x1000>,
                              <0xd4282800 0x400>,
                              <0xd4015000 0x1000>;