Unverified Commit d0b5886b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.5-rockchip-dts64-1' of... 

Merge tag 'v6.5-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

New boards are
- Indiedroid Nova (rk3588)
- Add Edgeble Neural Compute Module 6B (rk3588)
- FriendlyARM NanoPi R2C Plus (rk3328)
- Anbernic RG353PS (rk3566)
- Lunzn Fastrhino R66S / R68S (rk3568)

The rk3588 got a lot of attention and gained support for the GIC ITS
(needed an errata from Rockchip), timers, otp memory, saradc and sdio.
The rk356x got support for its RGA block

With all the core improvements to rk3588 support, the Rock5b got a lot
improvements from that too, namely support for its PMIC, sd-card and
saradc, as well as a clock-rate fix for its es8316 codec.
Similarly the rk3588-evb1 also got support for its PMIC.

The Anberic RGxx3 series got a better bluetooth compatible and updates
to its LEDs to make them use the PWM blocks they're connected to.

* tag 'v6.5-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (29 commits)
  arm64: dts: rockchip: Add saradc node to rock5b
  arm64: dts: rockchip: Fix compatible for Bluetooth on rk3566-anbernic
  arm64: dts: rockchip: Add SD card support to rock-5b
  arm64: dts: rockchip: add PMIC to rock-5b
  arm64: dts: rockchip: Assign ES8316 MCLK rate on rk3588-rock-5b
  arm64: dts: rockchip: Add Indiedroid Nova board
  dt-bindings: arm: rockchip: Add Indiedroid Nova
  dt-bindings: vendor-prefixes: add Indiedroid
  arm64: dts: rockchip: Add sdio node to rk3588
  arm64: dts: rockchip: add default pinctrl for rk3588 emmc
  arm64: dts: rockchip: Add DT node for ADC support in RK3588
  arm64: dts: rockchip: add PMIC to rk3588-evb1
  arm64: dts: rockchip: Add rk3588 Edgeble Neu6 Model B IO
  arm64: dts: rockchip: Add rk3588 Edgeble Neu6 Model B SoM
  arm64: dts: rockchip: Add Rockchip RK3588J
  dt-bindings: arm: rockchip: Add Edgeble Neural Compute Module 6B
  arm64: dts: rockchip: Add RGA2 support to rk356x
  media: dt-bindings: media: rockchip-rga: add rockchip,rk3568-rga
  arm64: dts: rockchip: Add rk3588 OTP node
  arm64: dts: rockchip: Add FriendlyARM NanoPi R2C Plus
  ...

Link: https://lore.kernel.org/r/3239799.44csPzL39Z@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6db92533 a68e1aec

Documentation/devicetree/bindings/arm/rockchip.yaml

+24 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ properties: 
          - const: anbernic,rg353p

          - const: rockchip,rk3566



      - description: Anbernic RG353PS

        items:

          - const: anbernic,rg353ps

          - const: rockchip,rk3566



      - description: Anbernic RG353V

        items:

          - const: anbernic,rg353v
@@ -102,6 +107,12 @@ properties: 
          - const: edgeble,neural-compute-module-6a     # Edgeble Neural Compute Module 6A SoM

          - const: rockchip,rk3588



      - description: Edgeble Neural Compute Module 6(Neu6) Model B SoM based boards

        items:

          - const: edgeble,neural-compute-module-6b-io  # Edgeble Neural Compute Module 6B IO Board

          - const: edgeble,neural-compute-module-6b     # Edgeble Neural Compute Module 6B SoM

          - const: rockchip,rk3588



      - description: Elgin RV1108 R1

        items:

          - const: elgin,rv1108-r1
@@ -189,6 +200,7 @@ properties: 
        items:

          - enum:

              - friendlyarm,nanopi-r2c

              - friendlyarm,nanopi-r2c-plus

              - friendlyarm,nanopi-r2s

          - const: rockchip,rk3328
@@ -534,6 +546,11 @@ properties: 
          - const: hugsun,x99

          - const: rockchip,rk3399



      - description: Indiedroid Nova SBC

        items:

          - const: indiedroid,nova

          - const: rockchip,rk3588s



      - description: Khadas Edge series boards

        items:

          - enum:
@@ -562,6 +579,13 @@ properties: 
          - const: leez,p710

          - const: rockchip,rk3399



      - description: Lunzn FastRhino R66S / R68S

        items:

          - enum:

              - lunzn,fastrhino-r66s

              - lunzn,fastrhino-r68s

          - const: rockchip,rk3568



      - description: mqmaker MiQi

        items:

          - const: mqmaker,miqi

Documentation/devicetree/bindings/media/rockchip-rga.yaml

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ properties: 
      - const: rockchip,rk3288-rga

      - const: rockchip,rk3399-rga

      - items:

          - const: rockchip,rk3228-rga

          - enum:

              - rockchip,rk3228-rga

              - rockchip,rk3568-rga

          - const: rockchip,rk3288-rga



  reg:

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -619,6 +619,8 @@ patternProperties: 
    description: Integrated Micro-Electronics Inc.

  "^incircuit,.*":

    description: In-Circuit GmbH

  "^indiedroid,.*":

    description: Indiedroid

  "^inet-tek,.*":

    description: Shenzhen iNet Mobile Internet Technology Co., Ltd

  "^infineon,.*":
@@ -783,6 +785,8 @@ patternProperties: 
    description: Nanjing Loongmasses Ltd.

  "^lsi,.*":

    description: LSI Corp. (LSI Logic)

  "^lunzn,.*":

    description: Shenzhen Lunzn Technology Co., Ltd.

  "^lwn,.*":

    description: Liebherr-Werk Nenzing GmbH

  "^lxa,.*":

arch/arm64/boot/dts/rockchip/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go3.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb
@@ -69,6 +70,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353p.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353ps.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353v.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
@@ -85,6 +87,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-box-demo.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r68s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat-2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5c.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
@@ -92,7 +96,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts

0 → 100644
+33 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.

 * (http://www.friendlyarm.com)

 *

 * Copyright (c) 2023 Tianling Shen <cnsztl@gmail.com>

 */



/dts-v1/;

#include "rk3328-nanopi-r2c.dts"



/ {

	model = "FriendlyElec NanoPi R2C Plus";

	compatible = "friendlyarm,nanopi-r2c-plus", "rockchip,rk3328";



	aliases {

		mmc1 = &emmc;

	};

};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	max-frequency = <150000000>;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;

	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

	vmmc-supply = <&vcc_io_33>;

	vqmmc-supply = <&vcc18_emmc>;

	status = "okay";

};