Unverified Commit 835c0d93 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.19-rockchip-dts64-1' of... 

Merge tag 'v5.19-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

New peripherals supported on rk356x: sfc, usb3, sata and
the video-decoder on rk3328.
RK3399 received some improvements and nodes for the memory controller.
Additional peripherals for PineNote, Gru and BananaPi-R2-Pro.
New boards are the Firefly Station M2, Pine64 SoQuartz SOM and
Quartz64 model B as well as the Radxa Rock3 model A.

* tag 'v5.19-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (32 commits)
  arm64: dts: rockchip: enable otg/drd operation of usb_host0_xhci in rk356x
  arm64: dts: rockchip: rename HDMI ref clock to 'ref' on rk3399
  arm64: dts: rockchip: add dts for Firefly Station M2 rk3566
  arm64: dts: rockchip: add SoQuartz CM4IO dts
  arm64: dts: rockchip: add Pine64 Quartz64-B device tree
  dt-bindings: arm: rockchip: Add Firefly Station M2
  dt-bindings: arm: rockchip: Add Pine64 SoQuartz SoM
  dt-bindings: arm: rockchip: Add Pine64 Quartz64 Model B
  arm64: dts: rockchip: enable usb hub on the radxa rock3 model a
  arm64: dts: rockchip: add usb3 support to the radxa rock3 model a
  arm64: dts: rockchip: add rk356x sfc support
  arm64: dts: rockchip: Add USB and TCPC to rk3566-pinenote
  arm64: dts: rockchip: Add accelerometer to rk3566-pinenote
  arm64: dts: rockchip: add an input enable pinconf to rk3399
  arm64: dts: rockchip: Add vdec support for RK3328
  arm64: dts: rockchip: Rename vdec_mmu node for RK3328
  arm64: dts: rockchip: Enable dmc and dfi nodes on gru
  arm64: dts: rockchip: Add dfi and dmc nodes to rk3399
  arm64: dts: rockchip: add clocks property to cru nodes rk3399
  arm64: dts: rockchip: use generic node name for pmucru on rk3399
  ...

Link: https://lore.kernel.org/r/7748558.DvuYhMxLoT@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 18176b9d bc405bb3

Documentation/devicetree/bindings/arm/rockchip.yaml

+21 −2
Original line number Diff line number Diff line
@@ -133,6 +133,11 @@ properties: 
              - firefly,roc-rk3399-pc-plus

          - const: rockchip,rk3399



      - description: Firefly Station M2

        items:

          - const: firefly,rk3566-roc-pc

          - const: rockchip,rk3566



      - description: FriendlyElec NanoPi R2S

        items:

          - const: friendlyarm,nanopi-r2s
@@ -502,9 +507,18 @@ properties: 
          - const: pine64,rockpro64

          - const: rockchip,rk3399



      - description: Pine64 Quartz64 Model A

      - description: Pine64 Quartz64 Model A/B

        items:

          - const: pine64,quartz64-a

          - enum:

              - pine64,quartz64-a

              - pine64,quartz64-b

          - const: rockchip,rk3566



      - description: Pine64 SoQuartz SoM

        items:

          - enum:

              - pine64,soquartz-cm4io

          - const: pine64,soquartz

          - const: rockchip,rk3566



      - description: Radxa Rock
@@ -545,6 +559,11 @@ properties: 
          - const: radxa,rock2-square

          - const: rockchip,rk3288



      - description: Radxa ROCK3 Model A

        items:

          - const: radxa,rock3a

          - const: rockchip,rk3568



      - description: Rikomagic MK808 v1

        items:

          - const: rikomagic,mk808

arch/arm64/boot/dts/rockchip/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -59,5 +59,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb

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

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

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

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

+20 −2
Original line number Diff line number Diff line
@@ -306,6 +306,10 @@ 
			};

			power-domain@RK3328_PD_VIDEO {

				reg = <RK3328_PD_VIDEO>;

				clocks = <&cru ACLK_RKVDEC>,

					 <&cru HCLK_RKVDEC>,

					 <&cru SCLK_VDEC_CABAC>,

					 <&cru SCLK_VDEC_CORE>;

				#power-domain-cells = <0>;

			};

			power-domain@RK3328_PD_VPU {
@@ -660,14 +664,28 @@ 
		power-domains = <&power RK3328_PD_VPU>;

	};



	rkvdec_mmu: iommu@ff360480 {

	vdec: video-codec@ff360000 {

		compatible = "rockchip,rk3328-vdec", "rockchip,rk3399-vdec";

		reg = <0x0 0xff360000 0x0 0x400>;

		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>,

			 <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;

		clock-names = "axi", "ahb", "cabac", "core";

		assigned-clocks = <&cru ACLK_RKVDEC>, <&cru SCLK_VDEC_CABAC>,

				  <&cru SCLK_VDEC_CORE>;

		assigned-clock-rates = <400000000>, <400000000>, <300000000>;

		iommus = <&vdec_mmu>;

		power-domains = <&power RK3328_PD_VIDEO>;

	};



	vdec_mmu: iommu@ff360480 {

		compatible = "rockchip,iommu";

		reg = <0x0 0xff360480 0x0 0x40>, <0x0 0xff3604c0 0x0 0x40>;

		interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;

		clock-names = "aclk", "iface";

		#iommu-cells = <0>;

		status = "disabled";

		power-domains = <&power RK3328_PD_VIDEO>;

	};



	vop: vop@ff370000 {

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


/dts-v1/;

#include <dt-bindings/input/linux-event-codes.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/pwm/pwm.h>

#include <dt-bindings/usb/pd.h>

#include "rk3399.dtsi"
@@ -786,7 +787,7 @@ 
		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&gpio0>;

		interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;

		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wake";

		brcm,drive-strength = <5>;

		pinctrl-names = "default";

arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -234,6 +234,13 @@ 
	extcon = <&usbc_extcon0>, <&usbc_extcon1>;

};



&dmc {

	center-supply = <&ppvar_centerlogic>;

	rockchip,pd-idle-dis-freq-hz = <800000000>;

	rockchip,sr-idle-dis-freq-hz = <800000000>;

	rockchip,sr-mc-gate-idle-dis-freq-hz = <800000000>;

};



&edp {

	status = "okay";