ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy

[ Upstream commit 24cf6eef79a7e85cfd2ef9dea52f769c9192fc6e ]

"usb-nop-xceiv" is good enough if we don't lose the configuration done
by the firmware, but we'd really prefer a real driver.

Unfortunately, the PHY core is odd in that when the node is compatible
with "usb-nop-xceiv", it ignores the other compatible strings. Let's
just remove it.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Cc: <stable@vger.kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 3e28f0dc9df41a9f5bee96cfa10042578b026188..1e25bf998ab50fa00170901a6e2d0f2227ac273e 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";