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

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

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

New boards are the NanoPC T6, Firefly Station P2, Radxa Rock 4SE.

Many new peripherals for the still only basic supported rk3588 soc
(PCIe2, PCIe3, USB2, SATA, Combo-Phys).

Improvements to the Rock-5a development board based on this soc (saradc,
i2c on dsi and csi, fan, eeprom, analog audio, leds, sd-card,
some regulators, pmic).

Improvements for the edgeble-neu6b (rs485, rs232, pwm-fan, rtc, sata,
sata, sd-card, pmic)

RK3399 got the PCIe endpoint node when used as a PCIe-client.

And some minor changes for some boards: spi-flash for RockPi 4,
SATA and fixed PCIe regulators for Radxa E25 and using enable-gpios
on engicam and gru boards.

* tag 'v6.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (46 commits)
  arm64: dts: rockchip: Add NanoPC T6 PCIe Ethernet support
  arm64: dts: rockchip: add rk3588 PCIe2 support
  arm64: dts: rockchip: Enable internal SPI flash for ROCK Pi 4A/B/C
  arm64: dts: rockchip: Add NanoPC T6
  dt-bindings: arm: rockchip: Add NanoPC T6
  arm64: dts: rockchip: Enable SATA on Radxa E25
  arm64: dts: rockchip: Fix PCIe regulators on Radxa E25
  arm64: dts: rockchip: switch px30-engicam to enable-gpios
  arm64: dts: rockchip: switch rk3399-gru boards to enable-gpios
  arm64: dts: rockchip: add PCIe3 support for rk3588
  arm64: dts: rockchip: fix/update sdmmc properties for rock-5a and -5b
  arm64: dts: rockchip: add USB2 to rk3588s-rock5a
  arm64: dts: rockchip: add USB2 to rk3588-rock5b
  arm64: dts: rockchip: add USB2 to rk3588-evb1
  arm64: dts: rockchip: add USB2 support for rk3588
  arm64: dts: rockchip: Enable RS485 for edgeble-neu6b
  arm64: dts: rockchip: Enable RS232 for edgeble-neu6b
  arm64: dts: rockchip: Enable PWM FAN for edgeble-neu6b
  arm64: dts: rockchip: Enable RTC for edgeble-neu6b
  arm64: dts: rockchip: Enable SATA for edgeble-neu6b
  ...

Link: https://lore.kernel.org/r/7414564.rnE6jSC6OK@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aa2951a8 a721e28d

Documentation/devicetree/bindings/arm/rockchip.yaml

+15 −0
Original line number Diff line number Diff line
@@ -196,6 +196,11 @@ properties: 
          - const: firefly,rk3566-roc-pc

          - const: rockchip,rk3566



      - description: Firefly Station P2

        items:

          - const: firefly,rk3568-roc-pc

          - const: rockchip,rk3568



      - description: FriendlyElec NanoPi R2 series boards

        items:

          - enum:
@@ -222,6 +227,11 @@ properties: 
              - friendlyarm,nanopi-r5s

          - const: rockchip,rk3568



      - description: FriendlyElec NanoPC T6

        items:

          - const: friendlyarm,nanopc-t6

          - const: rockchip,rk3588



      - description: GeekBuying GeekBox

        items:

          - const: geekbuying,geekbox
@@ -694,6 +704,11 @@ properties: 
          - const: radxa,rock-4c-plus

          - const: rockchip,rk3399



      - description: Radxa ROCK 4SE

        items:

          - const: radxa,rock-4se

          - const: rockchip,rk3399



      - description: Radxa ROCK Pi E

        items:

          - const: radxa,rockpi-e

Documentation/devicetree/bindings/eeprom/at24.yaml

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ properties: 
                  pattern: spd$

      # These are special cases that don't conform to the above pattern.

      # Each requires a standard at24 model as fallback.

      - items:

          - const: belling,bl24c16a

          - const: atmel,24c16

      - items:

          - enum:

              - rohm,br24g01

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ patternProperties: 
    description: Compass Electronics Group, LLC

  "^beagle,.*":

    description: BeagleBoard.org Foundation

  "^belling,.*":

    description: Shanghai Belling Co., Ltd.

  "^bhf,.*":

    description: Beckhoff Automation GmbH & Co. KG

  "^bitmain,.*":

arch/arm64/boot/dts/rockchip/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-4c-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-4se.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
@@ -94,10 +95,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5c.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-roc-pc.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-nanopc-t6.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

arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -26,5 +26,5 @@ 
};



&vcc3v3_btreg {

	enable-gpio = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;

	enable-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;

};