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

Merge tag 'v6.18-rockchip-dts64-2' of... 

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

One new board the ROC-RK3588-RT, gpu improvements for RK3328, frequency
scaling for the RK3528 and the very first small steps for camera
support on the RK3588 - with the CSI-DPHY support, with more hopefully
to come soon'ish :-) .

And apart from those bigger points, some more individual peripheral work
on some boards.

* tag 'v6.18-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add devicetree for the ROC-RK3588-RT
  dt-bindings: arm: rockchip: Add Firefly ROC-RK3588-RT
  arm64: dts: rockchip: update pinctrl names for Radxa E52C
  arm64: dts: rockchip: remove vcc_3v3_pmu regulator for Radxa E52C
  arm64: dts: rockchip: Add USB and charger to Gameforce Ace
  arm64: dts: rockchip: enable the Mali GPU on RK3328 boards
  arm64: dts: rockchip: add GPU powerdomain, opps, and cooling to rk3328
  arm64: dts: rockchip: Fix network on rk3576 evb1 board
  arm64: dts: rockchip: add mipi csi-2 dphy nodes to rk3588
  dt-bindings: soc: rockchip: add rk3588 csidphy grf syscon
  arm64: dts: rockchip: Add rk3528 CPU frequency scaling support
  arm64: dts: rockchip: enable HDMI Receiver on NanoPC T6

Link: https://lore.kernel.org/r/2079092.kXSN5OTJKJ@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5ab67bad 93781211

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0
Original line number Diff line number Diff line
@@ -258,6 +258,11 @@ properties: 
          - const: firefly,roc-rk3576-pc

          - const: rockchip,rk3576



      - description: Firefly ROC-RK3588-RT

        items:

          - const: firefly,roc-rk3588-rt

          - const: rockchip,rk3588



      - description: Firefly Station M2

        items:

          - const: firefly,rk3566-roc-pc

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ properties: 
              - rockchip,rk3576-vop-grf

              - rockchip,rk3588-bigcore0-grf

              - rockchip,rk3588-bigcore1-grf

              - rockchip,rk3588-csidphy-grf

              - rockchip,rk3588-dcphy-grf

              - rockchip,rk3588-hdptxphy-grf

              - rockchip,rk3588-ioc

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-max.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-ultra.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-roc-rt.dtb

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

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

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

arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts

+0 −4
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ &codec { 
	mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>;

};



&gpu {

	mali-supply = <&vdd_logic>;

};



&pinctrl {

	ir {

		ir_int: ir-int {

arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ &gmac2io { 
	status = "okay";

};



&gpu {

	mali-supply = <&vdd_logic>;

};



&hdmi {

	status = "okay";

};