Merge branch 'mmp/fixes' into arm/dt

Browse source

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>

...

This commit is contained in:

Arnd Bergmann 2020-05-21 23:37:22 +02:00

parent ed365a4a84 24cf6eef79

commit 9eddc06a3b

2 changed files with 9 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

arch/arm/boot/dts/mmp3-dell-ariel.dts

View file

8

arch/arm/boot/dts/mmp3.dtsi

View file