Merge branch 'mmp/fixes' into arm/dt

These were queued for v5.7 as bugfixes, merge them
here as well to resolve the conflicts.

* 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 --cc arch/arm/boot/dts/mmp3.dtsi
index ae264af,826f0a5..57231d4
--- 1/arch/arm/boot/dts/mmp3.dtsi
--- 2/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@@ -201,9 -201,8 +201,8 @@@
                                status = "disabled";
                        };
  
 -                      hsic_phy0: hsic-phy@f0001800 {
 +                      hsic_phy0: usb-phy@f0001800 {
-                               compatible = "marvell,mmp3-hsic-phy",
-                                            "usb-nop-xceiv";
+                               compatible = "marvell,mmp3-hsic-phy";
                                reg = <0xf0001800 0x40>;
                                #phy-cells = <0>;
                                status = "disabled";
@@@ -223,9 -222,8 +222,8 @@@
                                status = "disabled";
                        };
  
 -                      hsic_phy1: hsic-phy@f0002800 {
 +                      hsic_phy1: usb-phy@f0002800 {
-                               compatible = "marvell,mmp3-hsic-phy",
-                                            "usb-nop-xceiv";
+                               compatible = "marvell,mmp3-hsic-phy";
                                reg = <0xf0002800 0x40>;
                                #phy-cells = <0>;
                                status = "disabled";