Unverified Commit 70ea4e97 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Work mostly focussed on the still new rk3588 Soc with some new boards the
Orange Pi 5 and Orange Pi 5 Plus as well as the QuartzPro64 from Pine64.

It also gained two new peripherals, the SFC (serial-flash-controller)
as well as support for it's AV1 video decoder.

And of course existing rk3588 boards got support added for various
peripherals (PCIe, usb, sardadc, leds, etc).

And in non-rk3588 news, rk3566-based gaming devices seem to be en-vogue,
and the Powkiddy RGB30 also moved in.

* tag 'v6.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (27 commits)
  arm64: dts: rockchip: add support for Powkiddy RGB30
  dt-bindings: arm64: rockchip: add Powkiddy RGB30
  arm64: dts: rockchip: add status LED to rock-5b
  arm64: dts: rockchip: add ADC buttons to rk3588-evb1
  arm64: dts: rockchip: Add AV1 decoder node to rk3588s
  arm64: dts: rockchip: Add missing sdmmc2 SDR rates to rock-3a
  arm64: dts: rockchip: Enable UART6 on rock-5b
  arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b
  arm64: dts: rockchip: Add QuartzPro64 SBC device tree
  dt-bindings: arm: rockchip: Add Pine64 QuarzPro64
  arm64: dts: rockchip: Add board device tree for rk3588-orangepi-5-plus
  dt-bindings: arm: rockchip: Add Orange Pi 5 Plus
  arm64: dts: rockchip: Add UART9 M0 pin definitions to rk3588s
  arm64: dts: rockchip: Add I2S2 M0 pin definitions to rk3588s
  arm64: dts: rockchip: Add Orange Pi 5
  arm64: dts: rockchip: Add sfc node to rk3588s
  dt-bindings: arm: rockchip: Add Orange Pi 5 board
  arm64: dts: rockchip: Add NanoPC T6 PCIe e-key support
  arm64: dts: rockchip: Add sdio node to rock-5b
  arm64: dts: rockchip: add PCIe3 bus to rk3588-evb1
  ...

Link: https://lore.kernel.org/r/1870252.CQOukoFCf9@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 79384a04 1e9ac3e8

Documentation/devicetree/bindings/arm/rockchip.yaml

+20 −0
Original line number Diff line number Diff line
@@ -660,6 +660,11 @@ properties: 
              - pine64,quartz64-b

          - const: rockchip,rk3566



      - description: Pine64 QuartzPro64

        items:

          - const: pine64,quartzpro64

          - const: rockchip,rk3588



      - description: Pine64 SoQuartz SoM

        items:

          - enum:
@@ -669,6 +674,11 @@ properties: 
          - const: pine64,soquartz

          - const: rockchip,rk3566



      - description: Powkiddy RGB30

        items:

          - const: powkiddy,rgb30

          - const: rockchip,rk3566



      - description: Radxa Compute Module 3(CM3)

        items:

          - enum:
@@ -870,6 +880,11 @@ properties: 
          - const: tronsmart,orion-r68-meta

          - const: rockchip,rk3368



      - description: Xunlong Orange Pi 5 Plus

        items:

          - const: xunlong,orangepi-5-plus

          - const: rockchip,rk3588



      - description: Xunlong Orange Pi R1 Plus / LTS

        items:

          - enum:
@@ -877,6 +892,11 @@ properties: 
              - xunlong,orangepi-r1-plus-lts

          - const: rockchip,rk3328



      - description: Xunlong Orange Pi 5

        items:

          - const: xunlong,orangepi-5

          - const: rockchip,rk3588s



      - description: Zkmagic A95X Z2

        items:

          - const: zkmagic,a95x-z2

arch/arm64/boot/dts/rockchip/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.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
@@ -101,7 +102,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb

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

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) += rk3588s-indiedroid-nova.dtb

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb

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

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



/dts-v1/;



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

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

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

#include "rk3566-anbernic-rg353x.dtsi"



/ {

	model = "RGB30";

	compatible = "powkiddy,rgb30", "rockchip,rk3566";



	aliases {

		mmc1 = &sdmmc0;

		mmc2 = &sdmmc1;

		mmc3 = &sdmmc2;

	};



	battery: battery {

		compatible = "simple-battery";

		charge-full-design-microamp-hours = <3151000>;

		charge-term-current-microamp = <300000>;

		constant-charge-current-max-microamp = <2000000>;

		constant-charge-voltage-max-microvolt = <4250000>;

		factory-internal-resistance-micro-ohms = <117000>;

		voltage-max-design-microvolt = <4172000>;

		voltage-min-design-microvolt = <3400000>;



		ocv-capacity-celsius = <20>;

		ocv-capacity-table-0 =  <4172000 100>, <4092000 95>, <4035000 90>, <3990000 85>,

					<3939000 80>, <3895000 75>, <3852000 70>, <3807000 65>,

					<3762000 60>, <3713000 55>, <3672000 50>, <3647000 45>,

					<3629000 40>, <3613000 35>, <3598000 30>, <3578000 25>,

					<3550000 20>, <3519000 15>, <3479000 10>, <3438000 5>,

					<3400000 0>;

	};



	/*

	 * Channels reversed for speakers. Headphones automatically switch via hardware when

	 * detected with no ability to control output in software. Headphones appear to be mono

	 * (each output channel receives all audio). No microphone support on 3.5mm jack.

	 */

	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "rk817_ext";

		simple-audio-card,format = "i2s";

		simple-audio-card,mclk-fs = <256>;

		simple-audio-card,widgets =

			"Headphone", "Headphones";

		simple-audio-card,routing =

			"Headphones", "HPOL",

			"Headphones", "HPOR";



		simple-audio-card,codec {

			sound-dai = <&rk817>;

		};



		simple-audio-card,cpu {

			sound-dai = <&i2s1_8ch>;

		};

	};

};



/delete-node/ &adc_keys;



&cru {

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

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

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

			       <200000000>, <108000000>;

};



&gpio_keys_control {

	button-r1 {

		gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;

		label = "TR";

		linux,code = <BTN_TR>;

	};



	button-r2 {

		gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>;

		label = "TR2";

		linux,code = <BTN_TR2>;

	};

};



/delete-node/ &{/i2c@fdd40000/regulator@40};



&i2c0 {

	vdd_cpu: regulator@1c {

		compatible = "tcs,tcs4525";

		reg = <0x1c>;

		fcs,suspend-voltage-selector = <1>;

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <712500>;

		regulator-max-microvolt = <1390000>;

		regulator-name = "vdd_cpu";

		regulator-ramp-delay = <2300>;

		vin-supply = <&vcc_sys>;

		regulator-state-mem {

			regulator-off-in-suspend;

		};

	};

};



/*

 * Device has 2 red LEDs instead of an amber and a red. Relabel LEDs as

 * red_led0 and red_led1.

 */

/delete-node/ &{/pwm-leds/led-1};

/delete-node/ &{/pwm-leds/led-2};



&leds {

	red_led0: led-1 {

		color = <LED_COLOR_ID_RED>;

		function = LED_FUNCTION_CHARGING;

		max-brightness = <255>;

		pwms = <&pwm7 0 25000 0>;

	};



	red_led1: led-2 {

		color = <LED_COLOR_ID_RED>;

		default-state = "off";

		function = LED_FUNCTION_STATUS;

		max-brightness = <255>;

		pwms = <&pwm0 0 25000 0>;

	};

};



&panel {

	compatible = "powkiddy,rgb30-panel";

	vcc-supply = <&vcc3v3_lcd0_n>;

	iovcc-supply = <&vcc3v3_lcd0_n>;

	/delete-property/ vdd-supply;

};



&pwm5 {

	status = "disabled";

};



&rk817 {

	rk817_charger: charger {

		monitored-battery = <&battery>;

		rockchip,resistor-sense-micro-ohms = <10000>;

		rockchip,sleep-enter-current-microamp = <300000>;

		rockchip,sleep-filter-current-microamp = <100000>;

	};

};



/delete-node/ &vibrator;

arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ aliases { 
		ethernet0 = &gmac1;

		mmc0 = &sdhci;

		mmc1 = &sdmmc0;

		mmc2 = &sdmmc2;

	};



	chosen: chosen {
@@ -747,6 +748,9 @@ &sdmmc2 { 
	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;

	sd-uhs-sdr12;

	sd-uhs-sdr25;

	sd-uhs-sdr50;

	sd-uhs-sdr104;

	vmmc-supply = <&vcc3v3_sys>;

	vqmmc-supply = <&vcc_1v8>;

arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts

+136 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
/dts-v1/;



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

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

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

#include "rk3588.dtsi"
@@ -23,12 +24,84 @@ chosen { 
		stdout-path = "serial2:1500000n8";

	};



	adc-keys {

		compatible = "adc-keys";

		io-channels = <&saradc 1>;

		io-channel-names = "buttons";

		keyup-threshold-microvolt = <1800000>;

		poll-interval = <100>;



		button-vol-up {

			label = "Volume Up";

			linux,code = <KEY_VOLUMEUP>;

			press-threshold-microvolt = <17000>;

		};



		button-vol-down {

			label = "Volume Down";

			linux,code = <KEY_VOLUMEDOWN>;

			press-threshold-microvolt = <417000>;

		};



		button-menu {

			label = "Menu";

			linux,code = <KEY_MENU>;

			press-threshold-microvolt = <890000>;

		};



		button-escape {

			label = "Escape";

			linux,code = <KEY_ESC>;

			press-threshold-microvolt = <1235000>;

		};

	};



	backlight: backlight {

		compatible = "pwm-backlight";

		power-supply = <&vcc12v_dcin>;

		pwms = <&pwm2 0 25000 0>;

	};



	pcie20_avdd0v85: pcie20-avdd0v85-regulator {

		compatible = "regulator-fixed";

		regulator-name = "pcie20_avdd0v85";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <850000>;

		regulator-max-microvolt = <850000>;

		vin-supply = <&avdd_0v85_s0>;

	};



	pcie20_avdd1v8: pcie20-avdd1v8-regulator {

		compatible = "regulator-fixed";

		regulator-name = "pcie20_avdd1v8";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&avcc_1v8_s0>;

	};



	pcie30_avdd0v75: pcie30-avdd0v75-regulator {

		compatible = "regulator-fixed";

		regulator-name = "pcie30_avdd0v75";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <750000>;

		regulator-max-microvolt = <750000>;

		vin-supply = <&avdd_0v75_s0>;

	};



	pcie30_avdd1v8: pcie30-avdd1v8-regulator {

		compatible = "regulator-fixed";

		regulator-name = "pcie30_avdd1v8";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&avcc_1v8_s0>;

	};



	vcc12v_dcin: vcc12v-dcin-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc12v_dcin";
@@ -38,6 +111,19 @@ vcc12v_dcin: vcc12v-dcin-regulator { 
		regulator-max-microvolt = <12000000>;

	};



	vcc3v3_pcie30: vcc3v3-pcie30-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_pcie30";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpios = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;

		startup-delay-us = <5000>;

		vin-supply = <&vcc12v_dcin>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc3v3_pcie30_en>;

	};



	vcc5v0_host: vcc5v0-host-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_host";
@@ -87,6 +173,10 @@ &combphy0_ps { 
	status = "okay";

};



&combphy2_psu {

	status = "okay";

};



&cpu_b0 {

	cpu-supply = <&vdd_cpu_big0_s0>;

};
@@ -163,7 +253,32 @@ rgmii_phy: ethernet-phy@1 { 
	};

};



&pcie2x1l1 {

	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&pcie2_1_rst>, <&rtl8111_isolate>;

	status = "okay";

};



&pcie30phy {

	status = "okay";

};



&pcie3x4 {

	pinctrl-names = "default";

	pinctrl-0 = <&pcie3_reset>;

	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;

	vpcie3v3-supply = <&vcc3v3_pcie30>;

	status = "okay";

};



&pinctrl {

	rtl8111 {

		rtl8111_isolate: rtl8111-isolate {

			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	rtl8211f {

		rtl8211f_rst: rtl8211f-rst {

			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -177,6 +292,22 @@ hym8563_int: hym8563-int { 
		};

	};



	pcie2 {

		pcie2_1_rst: pcie2-1-rst {

			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pcie3 {

		pcie3_reset: pcie3-reset {

			rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		vcc3v3_pcie30_en: vcc3v3-pcie30-en {

			rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	usb {

		vcc5v0_host_en: vcc5v0-host-en {

			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -188,6 +319,11 @@ &pwm2 { 
	status = "okay";

};



&saradc {

	vref-supply = <&vcc_1v8_s0>;

	status = "okay";

};



&sdhci {

	bus-width = <8>;

	no-sdio;