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

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

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

One new board the Turing RK1 system on module.
Support for DFI (DDR performance monitoring) for rk3588, rk3568 and an
enable-fix for rk3399 as well as some small fixups for the RGB30 handheld
(non-existent uart and better vpll frequency).

* tag 'v6.7-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add Turing RK1 SoM support
  dt-bindings: arm: rockchip: Add Turing RK1
  dt-bindings: vendor-prefixes: add turing
  arm64: dts: rockchip: Add DFI to rk3588s
  arm64: dts: rockchip: Add DFI to rk356x
  arm64: dts: rockchip: Always enable DFI on rk3399
  arm64: dts: rockchip: Remove UART2 from RGB30
  arm64: dts: rockchip: Update VPLL Frequency for RGB30

Link: https://lore.kernel.org/r/2777623.BEx9A2HvPv@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f652f84a 2806a69f

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0
Original line number Diff line number Diff line
@@ -880,6 +880,11 @@ properties: 
          - const: tronsmart,orion-r68-meta

          - const: rockchip,rk3368



      - description: Turing RK1

        items:

          - const: turing,rk1

          - const: rockchip,rk3588



      - description: Xunlong Orange Pi 5 Plus

        items:

          - const: xunlong,orangepi-5-plus

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1438,6 +1438,8 @@ patternProperties: 
    description: Truly Semiconductors Limited

  "^tsd,.*":

    description: Theobroma Systems Design und Consulting GmbH

  "^turing,.*":

    description: Turing Machines, Inc.

  "^tyan,.*":

    description: Tyan Computer Corporation

  "^u-blox,.*":

arch/arm64/boot/dts/rockchip/Makefile

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

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-turing-rk1.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/rk3399.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,6 @@ dfi: dfi@ff630000 { 
		interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>;

		clocks = <&cru PCLK_DDR_MON>;

		clock-names = "pclk_ddr_mon";

		status = "disabled";

	};



	vpu: video-codec@ff650000 {

arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30.dts

+10 −1
Original line number Diff line number Diff line
@@ -64,11 +64,15 @@ simple-audio-card,cpu { 


/delete-node/ &adc_keys;



&chosen {

	/delete-property/ stdout-path;

};



&cru {

	assigned-clocks = <&pmucru CLK_RTC_32K>, <&cru PLL_GPLL>,

			  <&pmucru PLL_PPLL>, <&cru PLL_VPLL>;

	assigned-clock-rates = <32768>, <1200000000>,

			       <200000000>, <108000000>;

			       <200000000>, <292500000>;

};



&gpio_keys_control {
@@ -149,4 +153,9 @@ rk817_charger: charger { 
	};

};



/* There is no UART header visible on the board for this device. */

&uart2 {

	status = "disabled";

};



/delete-node/ &vibrator;