projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed365a4 24cf6ee)
Merge branch 'mmp/fixes' into arm/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 May 2020 21:37:22 +0000 (23:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 21 May 2020 21:37:22 +0000 (23:37 +0200)
commit9eddc06a3bc79402f50176703237ed045ae77b16
tree1db5ab96288e121ce8c449d7d60926f270f04407tree | snapshot
parented365a4a84a016077d4c07796c75971e45edbbb8commit | diff
parent24cf6eef79a7e85cfd2ef9dea52f769c9192fc6ecommit | diff
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>
arch/arm/boot/dts/mmp3.dtsi diff1 | diff2 | blob | history
Domain: System / Kernel;