mbox series

[GIT,PULL,RESEND] Rockchip dts64 changes for 5.12

Message ID 12699743.uLZWGnKmhe@phil (mailing list archive)
State Queued
Headers show
Series [GIT,PULL,RESEND] Rockchip dts64 changes for 5.12 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v5.12-rockchip-dts64-1

Message

Heiko Stübner Feb. 6, 2021, 10:18 a.m. UTC
Hi Arnd, Kevin, Olof,

sorry I mixed up the versioning in the pull's subject.
The changes are of course meant for 5.12.

Thanks
Heiko


The following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e:

  Linux 5.11-rc1 (2020-12-27 15:30:22 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v5.12-rockchip-dts64-1

for you to fetch changes up to 7582ad63c9bd09a8f0988c46074481ddd4f92e04:

  arm64: dts: rockchip: more user friendly name of sound nodes (2021-02-01 19:00:31 +0100)

----------------------------------------------------------------
New boards: Radxa Rock Pi E, NanoPi M4B
More fixed indices for mmc nodes; removal of obsolete amba bus nodes;
nand-flash-controller nodes for px30 and rk3308; rk3399 pcie ranges fix;
board-level fixes for Helios64, NanoPi and Rock960; more sound support
for rock64 and rockpro64 and cleanups to make dt-bindings happier.

----------------------------------------------------------------
Chen-Yu Tsai (5):
      arm64: dts: rockchip: rk3328: Add clock_in_out property to gmac2phy node
      dt-bindings: arm: rockchip: Add Radxa ROCK Pi E
      arm64: dts: rockchip: rk3328: Add Radxa ROCK Pi E
      arm64: dts: rockchip: Move ep-gpios property to nanopc-t4 from nanopi4
      arm64: dts: rockchip: Add NanoPi M4B board

Johan Jonker (11):
      arm64: dts: rockchip: assign a fixed index to mmc devices on rk3328 boards
      arm64: dts: rockchip: add QoS register compatibles for rk3399
      arm64: dts: rockchip: add QoS register compatibles for px30
      arm64: dts: rockchip: rename thermal subnodes for rk3368
      arm64: dts: rockchip: rename thermal subnodes for rk3399
      arm64: dts: rockchip: fix ranges property format for rk3399 pcie node
      arm64: dts: rockchip: cleanup cpu_thermal node of rk3399-rock960.dts
      arm64: dts: rockchip: assign a fixed index to mmc devices on px30 boards
      arm64: dts: rockchip: assign a fixed index to mmc devices on rk3308 boards
      arm64: dts: rockchip: assign a fixed index to mmc devices on rk3368 boards
      arm64: dts: rockchip: rename pinctrl nodename to gmac2io for nanopi-r2s board

Katsuhiro Suzuki (3):
      arm64: dts: rockchip: enable HDMI sound nodes for rk3328-rock64
      arm64: dts: rockchip: add SPDIF node for rk3399-rockpro64
      arm64: dts: rockchip: more user friendly name of sound nodes

Robin Murphy (2):
      arm64: dts: rockchip: Light "sys" LED on NanoPi R2S
      arm64: dts: rockchip: Remove bogus "amba" bus nodes

Uwe Kleine-König (1):
      arm64: dts: rockchip: Rely on SoC external pull up on pmic-int-l on Helios64

Yifeng Zhao (2):
      arm64: dts: rockchip: Add NFC node for RK3308 SoC
      arm64: dts: rockchip: Add NFC node for PX30 SoC

 .../devicetree/bindings/arm/rockchip.yaml          |   5 +
 arch/arm64/boot/dts/rockchip/Makefile              |   2 +
 arch/arm64/boot/dts/rockchip/px30.dtsi             |  83 +++--
 arch/arm64/boot/dts/rockchip/rk3308.dtsi           |  63 ++--
 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts |   3 +-
 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts  | 382 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |  56 ++-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |  33 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           |  62 ++--
 .../boot/dts/rockchip/rk3399-kobol-helios64.dts    |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts  |   1 +
 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts |  52 +++
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi   |   1 -
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dts    |  53 +--
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |  29 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           | 109 +++---
 16 files changed, 690 insertions(+), 246 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts

Comments

Arnd Bergmann Feb. 9, 2021, 11:06 p.m. UTC | #1
From: Arnd Bergmann <arnd@arndb.de>

On Sat, 06 Feb 2021 11:18:18 +0100, Heiko Stuebner wrote:
> sorry I mixed up the versioning in the pull's subject.
> The changes are of course meant for 5.12.
> 
> Thanks
> Heiko
> 
> 
> The following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e:
> 
> [...]

Merged into arm/dt, thanks!

merge commit: 889231c6c80113ad0929eea01e8272048be38552

       Arnd