From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 21 May 2020 21:37:22 +0000 (+0200)
Subject: Merge branch 'mmp/fixes' into arm/dt
X-Git-Tag: v5.8-rc1~137^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9eddc06a3bc79402f50176703237ed045ae77b16;p=thirdparty%2Fkernel%2Flinux.git

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>
---

9eddc06a3bc79402f50176703237ed045ae77b16
diff --cc arch/arm/boot/dts/mmp3.dtsi
index ae264af12c287,826f0a5778598..57231d49d9386
--- a/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";