Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ded680c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.3-rockchip-dts64-2' of... 

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

New boards the Khadas Edge family of sbcs and the Hugsun X99 TV box,
both based on rk3399. Small improvements for RockPi, Sapphire and
rk3328-roc-cc boards. Improvements for the thermal handling on rk3399
as well as the rock960 board. rk3399 dwc3 clock updates and a small
start of the dtsi for the new rk3399pro (the one with the connected
npu).

* tag 'v5.3-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: Fix USB3 Type-C on rk3399-sapphire
  arm64: dts: rockchip: Update DWC3 modules on RK3399 SoCs
  arm64: dts: rockchip: enable rk3328 watchdog clock
  arm64: dts: rockchip: Add support for Hugsun X99 TV Box
  arm64: dts: rockchip: Define values for the IPA governor for rock960
  arm64: dts: rockchip: Fix multiple thermal zones conflict in rk3399.dtsi
  arm64: dts: rockchip: add core dtsi file for RK3399Pro SoCs
  arm64: dts: rockchip: improve rk3328-roc-cc rgmii performance.
  arm64: dts: rockchip: Add support for Khadas Edge/Edge-V/Captain boards
  arm64: dts: rockchip: Enable HDMI audio on Rock Pi

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents adfbb80d e1d9149e

Documentation/devicetree/bindings/arm/rockchip.yaml

+13 −0
Original line number Diff line number Diff line
@@ -316,6 +316,19 @@ properties: 
          - const: haoyu,marsboard-rk3066

          - const: rockchip,rk3066a



      - description: Hugsun X99 TV Box

        items:

          - const: hugsun,x99

          - const: rockchip,rk3399



      - description: Khadas Edge series boards

        items:

          - enum:

              - khadas,edge

              - khadas,edge-captain

              - khadas,edge-v

          - const: rockchip,rk3399



      - description: mqmaker MiQi

        items:

          - const: mqmaker,miqi

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ patternProperties: 
    description: Hewlett Packard

  "^holtek,.*":

    description: Holtek Semiconductor, Inc.

  "^hugsun,.*":

    description: Shenzhen Hugsun Technology Co. Ltd.

  "^hwacom,.*":

    description: HwaCom Systems Inc.

  "^i2se,.*":

arch/arm64/boot/dts/rockchip/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb

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

+3 −1
Original line number Diff line number Diff line
@@ -141,10 +141,12 @@ 
	phy-mode = "rgmii";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmiim1_pins>;

	snps,force_thresh_dma_mode;

	snps,aal;

	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 50000>;

	snps,rxpbl = <0x4>;

	snps,txpbl = <0x4>;

	tx_delay = <0x24>;

	rx_delay = <0x18>;

	status = "okay";

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

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ 
		compatible = "snps,dw-wdt";

		reg = <0x0 0xff1a0000 0x0 0x100>;

		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru PCLK_WDT>;

	};



	pwm0: pwm@ff1b0000 {