diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:37:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:37:22 +0200 |
| commit | 9eddc06a3bc79402f50176703237ed045ae77b16 (patch) | |
| tree | 1db5ab96288e121ce8c449d7d60926f270f04407 /arch/arm/boot/dts/mmp3.dtsi | |
| parent | ARM: dts: mmp3: Add the fifth SD HCI (diff) | |
| parent | ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy (diff) | |
| download | linux-9eddc06a3bc79402f50176703237ed045ae77b16.tar.xz linux-9eddc06a3bc79402f50176703237ed045ae77b16.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/mmp3.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/mmp3.dtsi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi index ae264af12c28..57231d49d938 100644 --- a/arch/arm/boot/dts/mmp3.dtsi +++ b/arch/arm/boot/dts/mmp3.dtsi @@ -202,8 +202,7 @@ }; 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"; @@ -224,8 +223,7 @@ }; 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"; @@ -541,7 +539,7 @@ }; soc_clocks: clocks@d4050000 { - compatible = "marvell,mmp2-clock"; + compatible = "marvell,mmp3-clock"; reg = <0xd4050000 0x1000>, <0xd4282800 0x400>, <0xd4015000 0x1000>; |