Unverified Commit 67fea39d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

New boards: Anberic RG-DS game console, Radxa CM3J module + baseboard
for the Rpi CM4 IO board, QNAP TS133 from the RK3568 NAS series.

2 display outputs for the Lion board (old RK3368), TPS65185 pmic for the
PineNote and fixes for the PCIe ranges on both RK356x and RK3588.
These came quite late, so I wanted to give them the time till 6.20-rc1
and have them migrate to stable-kernels afterwards.

The rest is small stuff on a number of boards wrt gpios and compatibles.

* tag 'v6.20-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

: (25 commits)
  arm64: dts: rockchip: Fix rk3588 PCIe range mappings
  arm64: dts: rockchip: Fix rk356x PCIe range mappings
  arm64: dts: rockchip: Add Anbernic RG-DS
  dt-bindings: input: touchscreen: goodix: Add "panel" property
  dt-bindings: arm: rockchip: Add Anbernic RG-DS
  arm64: dts: rockchip: Explicitly request UFS reset pin on RK3576
  arm64: dts: rockchip: Add TPS65185 for PineNote
  arm64: dts: rockchip: Do not enable hdmi_sound node on Pinebook Pro
  arm64: dts: rockchip: Fix imx258 variant on pinephone pro
  arm64: dts: rockchip: Add the Video-Demo overlay for Lion Haikou
  arm64: dts: rockchip: Enable pwm1 on rk3368-lion-haikou
  arm64: dts: rockchip: Enable HDMI output on RK3368-Lion-Haikou
  arm64: dts: rockchip: Add HDMI node to RK3368
  arm64: dts: rockchip: Use phandle for i2c_lvds_blc on rk3368-lion haikou
  arm64: dts: rockchip: Fix SD card support for RK3576 Nanopi R76s
  arm64: dts: rockchip: Fix SD card support for RK3576 EVB1
  arm64: dts: rockchip: Add Radxa CM3J on RPi CM4 IO Board
  arm64: dts: rockchip: Add Radxa CM3J
  dt-bindings: arm: rockchip: Add Radxa CM3J on RPi CM4 IO Board
  arm64: dts: rockchip: Make eeprom read-only for Radxa ROCK 3C/5A/5C
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a46cb1c7 46c56b73

Documentation/devicetree/bindings/arm/rockchip.yaml

+22 −5
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ properties: 
              - anbernic,rg-arc-s

          - const: rockchip,rk3566



      - description: Anbernic RK3568 Handheld Gaming Console

        items:

          - enum:

              - anbernic,rg-ds

          - const: rockchip,rk3568



      - description: Ariaboard Photonicat

        items:

          - const: ariaboard,photonicat
@@ -894,7 +900,11 @@ properties: 
          - const: rockchip,rk3568



      - description: QNAP TS-x33 NAS devices

        items:

        oneOf:

          - items:

              - const: qnap,ts133

              - const: rockchip,rk3566

          - items:

              - enum:

                  - qnap,ts233

                  - qnap,ts433
@@ -914,6 +924,13 @@ properties: 
          - const: radxa,cm3i

          - const: rockchip,rk3568



      - description: Radxa CM3J

        items:

          - enum:

              - radxa,cm3j-rpi-cm4

          - const: radxa,cm3j

          - const: rockchip,rk3568



      - description: Radxa CM5

        items:

          - enum:

Documentation/devicetree/bindings/input/touchscreen/goodix.yaml

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ properties: 
      address, thus it can be driven by the host during the reset sequence.

    maxItems: 1



  panel: true



  reset-gpios:

    maxItems: 1

arch/arm64/boot/dts/rockchip/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lba3368.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou-video-demo.dtbo

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
@@ -114,6 +115,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb20sx.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rk2023.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-x55.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-qnap-ts133.dtb

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb
@@ -133,6 +135,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-bigtreetech-pi2.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-tinker-board-3.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-tinker-board-3s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-9tripod-x3568-v4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-anbernic-rg-ds.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-easepi-r1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
@@ -148,6 +151,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-photonicat.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-qnap-ts233.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-qnap-ts433.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-cm3j-rpi-cm4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
@@ -241,6 +245,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou-haikou-video-demo.dtb 
px30-ringneck-haikou-haikou-video-demo-dtbs := px30-ringneck-haikou.dtb \

	px30-ringneck-haikou-video-demo.dtbo



dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou-haikou-video-demo.dtb

rk3368-lion-haikou-haikou-video-demo-dtbs := rk3368-lion-haikou.dtb \

	rk3368-lion-haikou-video-demo.dtbo



dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou-haikou-video-demo.dtb

rk3399-puma-haikou-haikou-video-demo-dtbs := rk3399-puma-haikou.dtb \

	rk3399-puma-haikou-video-demo.dtbo

arch/arm64/boot/dts/rockchip/rk3368-lion-haikou-video-demo.dtso

0 → 100644
+170 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2025 Cherry Embedded Solutions GmbH

 *

 * DEVKIT ADDON CAM-TS-A01

 * https://embedded.cherry.de/product/development-kit/

 *

 * DT-overlay for the camera / DSI demo appliance for Haikou boards.

 * In the flavour for use with a Lion system-on-module.

 */



/dts-v1/;

/plugin/;



#include <dt-bindings/clock/rk3368-cru.h>

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

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

#include <dt-bindings/leds/common.h>

#include <dt-bindings/pinctrl/rockchip.h>



&{/} {

	backlight: backlight {

		compatible = "pwm-backlight";

		power-supply = <&dc_12v>;

		pwms = <&pwm1 0 25000 0>;

	};



	cam_afvdd_2v8: regulator-cam-afvdd-2v8 {

		compatible = "regulator-fixed";

		gpio = <&pca9670 2 GPIO_ACTIVE_LOW>;

		regulator-max-microvolt = <2800000>;

		regulator-min-microvolt = <2800000>;

		regulator-name = "cam-afvdd-2v8";

		vin-supply = <&vcc2v8_video>;

	};



	cam_avdd_2v8: regulator-cam-avdd-2v8 {

		compatible = "regulator-fixed";

		gpio = <&pca9670 4 GPIO_ACTIVE_LOW>;

		regulator-max-microvolt = <2800000>;

		regulator-min-microvolt = <2800000>;

		regulator-name = "cam-avdd-2v8";

		vin-supply = <&vcc2v8_video>;

	};



	cam_dovdd_1v8: regulator-cam-dovdd-1v8 {

		compatible = "regulator-fixed";

		gpio = <&pca9670 3 GPIO_ACTIVE_LOW>;

		regulator-max-microvolt = <1800000>;

		regulator-min-microvolt = <1800000>;

		regulator-name = "cam-dovdd-1v8";

		vin-supply = <&vcc1v8_video>;

	};



	cam_dvdd_1v2: regulator-cam-dvdd-1v2 {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&pca9670 5 GPIO_ACTIVE_HIGH>;

		regulator-max-microvolt = <1200000>;

		regulator-min-microvolt = <1200000>;

		regulator-name = "cam-dvdd-1v2";

		vin-supply = <&vcc3v3_baseboard>;

	};



	vcc1v8_video: regulator-vcc1v8-video {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-boot-on;

		regulator-max-microvolt = <1800000>;

		regulator-min-microvolt = <1800000>;

		regulator-name = "vcc1v8-video";

		vin-supply = <&vcc3v3_baseboard>;

	};



	vcc2v8_video: regulator-vcc2v8-video {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-boot-on;

		regulator-max-microvolt = <2800000>;

		regulator-min-microvolt = <2800000>;

		regulator-name = "vcc2v8-video";

		vin-supply = <&vcc3v3_baseboard>;

	};



	video-adapter-leds {

		compatible = "gpio-leds";



		video-adapter-led {

			color = <LED_COLOR_ID_BLUE>;

			gpios = <&pca9670 7 GPIO_ACTIVE_HIGH>;

			label = "video-adapter-led";

			linux,default-trigger = "none";

		};

	};

};



&dphy {

	status = "okay";

};



&i2c_gp2 {

	#address-cells = <1>;

	#size-cells = <0>;

	/* OV5675, GT911, DW9714 are limited to 400KHz */

	clock-frequency = <400000>;



	touchscreen@14 {

		compatible = "goodix,gt911";

		reg = <0x14>;

		interrupt-parent = <&gpio1>;

		interrupts = <RK_PB5 IRQ_TYPE_LEVEL_LOW>;

		irq-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&touch_int>;

		pinctrl-names = "default";

		reset-gpios = <&pca9670 1 GPIO_ACTIVE_HIGH>;

		AVDD28-supply = <&vcc2v8_video>;

		VDDIO-supply = <&vcc3v3_baseboard>;

	};



	pca9670: gpio@27 {

		compatible = "nxp,pca9670";

		reg = <0x27>;

		gpio-controller;

		#gpio-cells = <2>;

		pinctrl-0 = <&pca9670_resetn>;

		pinctrl-names = "default";

		reset-gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>;

	};

};



&mipi_dsi {

	#address-cells = <1>;

	#size-cells = <0>;

	status = "okay";



	panel@0 {

		compatible = "leadtek,ltk050h3148w";

		reg = <0>;

		backlight = <&backlight>;

		iovcc-supply = <&vcc1v8_video>;

		reset-gpios = <&pca9670 0 GPIO_ACTIVE_LOW>;

		vci-supply = <&vcc2v8_video>;



		port {

			mipi_in_panel: endpoint {

				remote-endpoint = <&mipi_out_panel>;

			};

		};

	};

};



&mipi_out {

	mipi_out_panel: endpoint {

		remote-endpoint = <&mipi_in_panel>;

	};

};



&pinctrl {

	pca9670 {

		pca9670_resetn: pca9670-resetn {

			rockchip,pins = <1 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	touch {

		touch_int: touch-int {

			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};

arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts

+28 −10
Original line number Diff line number Diff line
@@ -18,16 +18,6 @@ chosen { 
		stdout-path = "serial0:115200n8";

	};



	i2cmux2 {

		i2c@0 {

			eeprom: eeprom@50 {

				compatible = "atmel,24c01";

				pagesize = <8>;

				reg = <0x50>;

			};

		};

	};



	leds {

		pinctrl-0 = <&module_led_pins>, <&sd_card_led_pin>;
@@ -68,6 +58,26 @@ vcc5v0_otg: regulator-vcc5v0-otg { 
	};

};



&display_subsystem {

	status = "okay";

};



&hdmi {

	status = "okay";

};



&i2c_lvds_blc {

	eeprom: eeprom@50 {

		compatible = "atmel,24c01";

		pagesize = <8>;

		reg = <0x50>;

	};

};



&pwm1 {

	status = "okay";

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;
@@ -103,6 +113,14 @@ &uart1 { 
	status = "disabled";

};



&vop {

	status = "okay";

};



&vop_mmu {

	status = "okay";

};



&pinctrl {

	pinctrl-names = "default";

	pinctrl-0 = <&haikou_pin_hog>;