| Message ID | 87r14xr2xc.fsf@BL-laptop (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5aef4d1ecc9758bf4b8d8749060c9b097d0100b3 |
| Headers | show |
| Series | [GIT,PULL] ARM: mvebu: dt64 for v5.19 (#1) | expand |
Hello: This pull request was applied to soc/soc.git (for-next) by Arnd Bergmann <arnd@arndb.de>: On Fri, 13 May 2022 15:13:19 +0200 you wrote: > Hi, > > Here is the first pull request for dt64 for mvebu for v5.19. > > There is a conflict with the arm-soc tree and as pointed by Stephen > Rothwell and confirmed by Krzysztof Kozlowski, the correct resolution is > to take the commit 2f00bb4a69c7 ("arm64: dts: marvell: align SPI NOR > node name with dtschema"), so the node name should be "flash", not > "spi-flash". > > [...] Here is the summary with links: - [GIT,PULL] ARM: mvebu: dt64 for v5.19 (#1) https://git.kernel.org/soc/soc/c/5aef4d1ecc97 You are awesome, thank you!
Hi, Here is the first pull request for dt64 for mvebu for v5.19. There is a conflict with the arm-soc tree and as pointed by Stephen Rothwell and confirmed by Krzysztof Kozlowski, the correct resolution is to take the commit 2f00bb4a69c7 ("arm64: dts: marvell: align SPI NOR node name with dtschema"), so the node name should be "flash", not "spi-flash". Gregory The following changes since commit 3123109284176b1532874591f7c81f3837bbdc17: Linux 5.18-rc1 (2022-04-03 14:08:21 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git tags/mvebu-dt64-5.19-1 for you to fetch changes up to 239466bddfc02f9643f64be74ba9a1d80c286f4b: arm64: dts: marvell: Update sdhci node names to match schema (2022-05-09 11:23:33 +0200) ---------------------------------------------------------------- mvebu dt64 for 5.19 (part 1) Update sdhci node names to match schema on all mvebu dt64 dtsi files Armada 3720: uDPU board: - correct temperature sensors - update partition table espressobin-ultra board: - enable front USB3 port - add PHY and switch reset pins - fix SPI-NOR config ---------------------------------------------------------------- Chris Packham (1): arm64: dts: marvell: Update sdhci node names to match schema Robert Marko (5): arm64: dts: uDPU: update partition table arm64: dts: uDPU: correct temperature sensors arm64: dts: marvell: espressobin-ultra: fix SPI-NOR config arm64: dts: marvell: espressobin-ultra: add PHY and switch reset pins arm64: dts: marvell: espressobin-ultra: enable front USB3 port .../dts/marvell/armada-3720-espressobin-ultra.dts | 9 ++++----- arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 21 +++++++++++++-------- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++-- arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-)