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

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

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

New boards: OrangePi R1 Plus, NanoPi R2C + R5C + R5S, Khadas Edge2.
General RK3588 additions: audio, thermal management, sdmmc, clock fixes,
watchdog; RK3588-Rock5b: rtc, pwm, audio.
Display support for Odroid Go Super and PinephonePro.
And some misc adaptions for recently merged yaml binding conversions.

* tag 'v6.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (35 commits)
  arm64: dts: rockchip: correct panel supplies on Odroid Go Super
  arm64: dts: rockchip: Add rk3588-rock-5b analog audio
  arm64: dts: rockchip: Add I2S rk3588 nodes
  arm64: dts: rockchip: Add rk3588s I2S nodes
  arm64: dts: rockchip: Assign PLL_PPLL clock rate to 1.1 GHz on rk3588s
  arm64: dts: rockchip: Fix SCMI assigned clocks on rk3588s
  arm64: dts: rockchip: add rk3588 thermal sensor
  arm64: dts: rockchip: Add pwm-fan to rk3588-rock-5b
  arm64: dts: rockchip: Enable RTC support for Rock 5B
  arm64: dts: rockchip: Add Xunlong OrangePi R1 Plus LTS
  dt-bindings: Add doc for Xunlong OrangePi R1 Plus LTS
  arm64: dts: rockchip: Add FriendlyARM NanoPi R2C
  dt-bindings: Add doc for FriendlyARM NanoPi R2C
  arm64: dts: rockchip: Add touchscreen support to rk3399-pinephone-pro
  arm64: dts: rockchip: Add internal display support to rk3399-pinephone-pro
  dt-bindings: watchdog: rockchip: Add rockchip,rk3588-wdt string
  arm64: dts: rockchip: Enable watchdog support for RK3588
  arm64: dts: rockchip: remove hclk from dsi node on rk356x
  arm64: dts: rockchip: rename vbus-supply to phy-supply in rk3566-box-demo.dts
  arm64: dts: rockchip: fix rk3399 dp node
  ...

Link: https://lore.kernel.org/r/7289562.MhkbZ0Pkbq@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8f09b5ec 07099a55

Documentation/devicetree/bindings/arm/rockchip.yaml

+20 −4
Original line number Diff line number Diff line
@@ -185,9 +185,11 @@ properties: 
          - const: firefly,rk3566-roc-pc

          - const: rockchip,rk3566



      - description: FriendlyElec NanoPi R2S

      - description: FriendlyElec NanoPi R2 series boards

        items:

          - const: friendlyarm,nanopi-r2s

          - enum:

              - friendlyarm,nanopi-r2c

              - friendlyarm,nanopi-r2s

          - const: rockchip,rk3328



      - description: FriendlyElec NanoPi4 series boards
@@ -201,6 +203,13 @@ properties: 
              - friendlyarm,nanopi-r4s-enterprise

          - const: rockchip,rk3399



      - description: FriendlyElec NanoPi R5 series boards

        items:

          - enum:

              - friendlyarm,nanopi-r5c

              - friendlyarm,nanopi-r5s

          - const: rockchip,rk3568



      - description: GeekBuying GeekBox

        items:

          - const: geekbuying,geekbox
@@ -533,6 +542,11 @@ properties: 
              - khadas,edge-v

          - const: rockchip,rk3399



      - description: Khadas Edge2 series boards

        items:

          - const: khadas,edge2

          - const: rockchip,rk3588s



      - description: Kobol Helios64

        items:

          - const: kobol,helios64
@@ -817,9 +831,11 @@ properties: 
          - const: tronsmart,orion-r68-meta

          - const: rockchip,rk3368



      - description: Xunlong Orange Pi R1 Plus

      - description: Xunlong Orange Pi R1 Plus / LTS

        items:

          - const: xunlong,orangepi-r1-plus

          - enum:

              - xunlong,orangepi-r1-plus

              - xunlong,orangepi-r1-plus-lts

          - const: rockchip,rk3328



      - description: Zkmagic A95X Z2

Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
              - rockchip,rk3368-wdt

              - rockchip,rk3399-wdt

              - rockchip,rk3568-wdt

              - rockchip,rk3588-wdt

              - rockchip,rv1108-wdt

          - const: snps,dw-wdt

arch/arm64/boot/dts/rockchip/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -14,8 +14,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2-v11.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go3.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
@@ -84,10 +86,13 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-lubancat-1.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat-2.dtb

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-rock-3a.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb

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

+10 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ ports { 
				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

				lvds_in: port@0 {

					reg = <0>;

					#address-cells = <1>;

					#size-cells = <0>;
@@ -489,6 +489,10 @@ lvds_vopl_in: endpoint@1 { 
						remote-endpoint = <&vopl_out_lvds>;

					};

				};



				lvds_out: port@1 {

					reg = <1>;

				};

			};

		};

	};
@@ -1134,7 +1138,7 @@ ports { 
			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

			dsi_in: port@0 {

				reg = <0>;

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1149,6 +1153,10 @@ dsi_in_vopl: endpoint@1 { 
					remote-endpoint = <&vopl_out_dsi>;

				};

			};



			dsi_out: port@1 {

				reg = <1>;

			};

		};

	};

arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts

+4 −1
Original line number Diff line number Diff line
@@ -142,7 +142,10 @@ button-sw22 { 
};



&internal_display {

	status = "disabled";

	compatible = "elida,kd50t048a", "sitronix,st7701";

	reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;

	IOVCC-supply = <&vcc_lcd>;

	VCC-supply = <&vcc_lcd>;

};



&rk817_charger {