[PATCH] rockchip: rk3566-pinetab2: Migrate to OF_UPSTREAM

Kever Yang kever.yang at rock-chips.com
Mon Jul 29 09:39:44 CEST 2024


On 2024/7/24 15:46, Jonas Karlman wrote:
> The device tree for Pine64 PineTab2 has been merged into dts/upstream
> with devicetree-rebasing v6.10-dts, migrate board to OF_UPSTREAM.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3566-pinetab2-v0.1.dts |  28 -
>   arch/arm/dts/rk3566-pinetab2-v2.0.dts |  48 --
>   arch/arm/dts/rk3566-pinetab2.dtsi     | 943 --------------------------
>   configs/pinetab2-rk3566_defconfig     |   5 +-
>   4 files changed, 2 insertions(+), 1022 deletions(-)
>   delete mode 100644 arch/arm/dts/rk3566-pinetab2-v0.1.dts
>   delete mode 100644 arch/arm/dts/rk3566-pinetab2-v2.0.dts
>   delete mode 100644 arch/arm/dts/rk3566-pinetab2.dtsi
>
> diff --git a/arch/arm/dts/rk3566-pinetab2-v0.1.dts b/arch/arm/dts/rk3566-pinetab2-v0.1.dts
> deleted file mode 100644
> index 5fe6ca5da9d3..000000000000
> --- a/arch/arm/dts/rk3566-pinetab2-v0.1.dts
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> -
> -/dts-v1/;
> -
> -#include "rk3566-pinetab2.dtsi"
> -
> -/ {
> -	model = "Pine64 PineTab2 v0.1";
> -	compatible = "pine64,pinetab2-v0.1", "pine64,pinetab2", "rockchip,rk3566";
> -};
> -
> -&lcd {
> -	reset-gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&lcd_pwren_h &lcd0_rst_l>;
> -};
> -
> -&pinctrl {
> -	lcd0 {
> -		lcd0_rst_l: lcd0-rst-l {
> -			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -};
> -
> -&sdmmc1 {
> -	vmmc-supply = <&vcc3v3_sys>;
> -};
> diff --git a/arch/arm/dts/rk3566-pinetab2-v2.0.dts b/arch/arm/dts/rk3566-pinetab2-v2.0.dts
> deleted file mode 100644
> index 9349541cbbd0..000000000000
> --- a/arch/arm/dts/rk3566-pinetab2-v2.0.dts
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> -
> -/dts-v1/;
> -
> -#include "rk3566-pinetab2.dtsi"
> -
> -/ {
> -	model = "Pine64 PineTab2 v2.0";
> -	compatible = "pine64,pinetab2-v2.0", "pine64,pinetab2", "rockchip,rk3566";
> -};
> -
> -&gpio_keys {
> -	pinctrl-0 = <&kb_id_det>, <&hall_int_l>;
> -
> -	event-hall-sensor {
> -		debounce-interval = <20>;
> -		gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
> -		label = "Hall Sensor";
> -		linux,code = <SW_LID>;
> -		linux,input-type = <EV_SW>;
> -		wakeup-event-action = <EV_ACT_DEASSERTED>;
> -		wakeup-source;
> -	};
> -};
> -
> -&lcd {
> -	reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>;
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&lcd_pwren_h &lcd0_rst_l>;
> -};
> -
> -&pinctrl {
> -	lcd0 {
> -		lcd0_rst_l: lcd0-rst-l {
> -			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	hall {
> -		hall_int_l: hall-int-l {
> -			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -};
> -
> -&sdmmc1 {
> -	vmmc-supply = <&vcc_sys>;
> -};
> diff --git a/arch/arm/dts/rk3566-pinetab2.dtsi b/arch/arm/dts/rk3566-pinetab2.dtsi
> deleted file mode 100644
> index db40281eafbe..000000000000
> --- a/arch/arm/dts/rk3566-pinetab2.dtsi
> +++ /dev/null
> @@ -1,943 +0,0 @@
> -// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> -
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/input/gpio-keys.h>
> -#include <dt-bindings/input/input.h>
> -#include <dt-bindings/leds/common.h>
> -#include <dt-bindings/pinctrl/rockchip.h>
> -#include <dt-bindings/soc/rockchip,vop2.h>
> -#include <dt-bindings/usb/pd.h>
> -#include "rk3566.dtsi"
> -
> -/ {
> -	chassis-type = "tablet";
> -
> -	aliases {
> -		mmc0 = &sdhci;
> -		mmc1 = &sdmmc0;
> -	};
> -
> -	chosen {
> -		stdout-path = "serial2:1500000n8";
> -	};
> -
> -	adc-keys {
> -		compatible = "adc-keys";
> -		io-channels = <&saradc 0>;
> -		io-channel-names = "buttons";
> -		keyup-threshold-microvolt = <1800000>;
> -		poll-interval = <25>;
> -
> -		button-vol-up {
> -			label = "Volume Up";
> -			linux,code = <KEY_VOLUMEUP>;
> -			press-threshold-microvolt = <297500>;
> -		};
> -
> -		button-vol-down {
> -			label = "Volume Down";
> -			linux,code = <KEY_VOLUMEDOWN>;
> -			press-threshold-microvolt = <1750>;
> -		};
> -	};
> -
> -	backlight: backlight {
> -		compatible = "pwm-backlight";
> -		pwms = <&pwm4 0 25000 0>;
> -		brightness-levels = <20 220>;
> -		num-interpolated-steps = <200>;
> -		default-brightness-level = <100>;
> -		power-supply = <&vcc_sys>;
> -	};
> -
> -	battery: battery {
> -		compatible = "simple-battery";
> -		charge-full-design-microamp-hours = <6000000>;
> -		charge-term-current-microamp = <300000>;
> -		constant-charge-current-max-microamp = <2000000>;
> -		constant-charge-voltage-max-microvolt = <4300000>;
> -		voltage-max-design-microvolt = <4350000>;
> -		voltage-min-design-microvolt = <3400000>;
> -
> -		ocv-capacity-celsius = <20>;
> -		ocv-capacity-table-0 = <4322000 100>, <4250000 95>, <4192000 90>, <4136000 85>,
> -				       <4080000 80>, <4022000 75>, <3972000 70>, <3928000 65>,
> -				       <3885000 60>, <3833000 55>, <3798000 50>, <3780000 45>,
> -				       <3776000 40>, <3773000 35>, <3755000 30>, <3706000 25>,
> -				       <3640000 20>, <3589000 15>, <3535000 10>, <3492000 5>,
> -				       <3400000 0>;
> -	};
> -
> -	gpio_keys: gpio-keys {
> -		compatible = "gpio-keys";
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&kb_id_det>;
> -
> -		tablet-mode-switch {
> -			debounce-interval = <20>;
> -			gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
> -			label = "Tablet Mode";
> -			linux,input-type = <EV_SW>;
> -			linux,code = <SW_TABLET_MODE>;
> -		};
> -	};
> -
> -	hdmi-connector {
> -		compatible = "hdmi-connector";
> -		type = "d";
> -
> -		port {
> -			hdmi_con_in: endpoint {
> -				remote-endpoint = <&hdmi_out_con>;
> -			};
> -		};
> -	};
> -
> -	led-0 {
> -		compatible = "regulator-led";
> -		vled-supply = <&vcc5v0_flashled>;
> -		color = <LED_COLOR_ID_WHITE>;
> -		function = LED_FUNCTION_FLASH;
> -	};
> -
> -	rk817-sound {
> -		compatible = "simple-audio-card";
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&hp_det_l>;
> -		simple-audio-card,format = "i2s";
> -		simple-audio-card,name = "rk817_ext";
> -		simple-audio-card,mclk-fs = <256>;
> -
> -		simple-audio-card,widgets =
> -			"Microphone", "Mic Jack",
> -			"Headphone", "Headphones",
> -			"Speaker", "Internal Speakers";
> -
> -		simple-audio-card,routing =
> -			"MICR", "Mic Jack",
> -			"Headphones", "HPOL",
> -			"Headphones", "HPOR",
> -			"Internal Speakers", "Speaker Amplifier OUTL",
> -			"Internal Speakers", "Speaker Amplifier OUTR",
> -			"Speaker Amplifier INL", "HPOL",
> -			"Speaker Amplifier INR", "HPOR";
> -		simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>;
> -		simple-audio-card,aux-devs = <&speaker_amp>;
> -		simple-audio-card,pin-switches = "Internal Speakers";
> -
> -		simple-audio-card,cpu {
> -			sound-dai = <&i2s1_8ch>;
> -		};
> -
> -		simple-audio-card,codec {
> -			sound-dai = <&rk817>;
> -		};
> -	};
> -
> -	speaker_amp: speaker-amplifier {
> -		compatible = "simple-audio-amplifier";
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&spk_ctl>;
> -		enable-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
> -		sound-name-prefix = "Speaker Amplifier";
> -		VCC-supply = <&vcc_bat>;
> -	};
> -
> -	vcc_3v3: vcc-3v3-regulator {
> -		compatible = "regulator-fixed";
> -		regulator-name = "vcc_3v3";
> -		regulator-always-on;
> -		regulator-boot-on;
> -		regulator-min-microvolt = <3300000>;
> -		regulator-max-microvolt = <3300000>;
> -		vin-supply = <&vcc3v3_sys>;
> -	};
> -
> -	vcc3v3_minipcie: vcc3v3-minipcie-regulator {
> -		compatible = "regulator-fixed";
> -		enable-active-high;
> -		gpio = <&gpio4 RK_PC3 GPIO_ACTIVE_HIGH>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&pcie_pwren_h>;
> -		regulator-name = "vcc3v3_minipcie";
> -		regulator-min-microvolt = <3300000>;
> -		regulator-max-microvolt = <3300000>;
> -		vin-supply = <&vcc_sys>;
> -	};
> -
> -	vcc3v3_sd: vcc3v3-sd-regulator {
> -		compatible = "regulator-fixed";
> -		gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&sdmmc_pwren_l>;
> -		regulator-name = "vcc3v3_sd";
> -		regulator-min-microvolt = <3300000>;
> -		regulator-max-microvolt = <3300000>;
> -		vin-supply = <&vcc3v3_sys>;
> -	};
> -
> -	vcc5v0_flashled: vcc5v0-flashled-regulator {
> -		compatible = "regulator-fixed";
> -		enable-active-high;
> -		gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&flash_led_en_h>;
> -		regulator-name = "vcc5v0_flashled";
> -		regulator-min-microvolt = <5000000>;
> -		regulator-max-microvolt = <5000000>;
> -		vin-supply = <&vcc5v_midu>;
> -	};
> -
> -	vcc5v0_usb_host0: vcc5v0-usb-host0-regulator {
> -		compatible = "regulator-fixed";
> -		enable-active-high;
> -		gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&usb_host_pwren1_h>;
> -		regulator-name = "vcc5v0_usb_host0";
> -		regulator-min-microvolt = <5000000>;
> -		regulator-max-microvolt = <5000000>;
> -		vin-supply = <&vcc5v_midu>;
> -	};
> -
> -	vcc5v0_usb_host2: vcc5v0-usb-host2-regulator {
> -		compatible = "regulator-fixed";
> -		enable-active-high;
> -		gpio = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&usb_host_pwren2_h>;
> -		regulator-name = "vcc5v0_usb_host2";
> -		regulator-min-microvolt = <5000000>;
> -		regulator-max-microvolt = <5000000>;
> -		vin-supply = <&vcc5v_midu>;
> -	};
> -
> -	vcc_bat: vcc-bat-regulator {
> -		compatible = "regulator-fixed";
> -		regulator-name = "vcc_bat";
> -		regulator-always-on;
> -		regulator-boot-on;
> -	};
> -
> -	vcc_sys: vcc-sys-regulator {
> -		compatible = "regulator-fixed";
> -		regulator-name = "vcc_sys";
> -		regulator-always-on;
> -		regulator-boot-on;
> -		vin-supply = <&vcc_bat>;
> -	};
> -
> -	vdd1v2_dvp: vdd1v2-dvp-regulator {
> -		compatible = "regulator-fixed";
> -		regulator-name = "vdd1v2_dvp";
> -		regulator-min-microvolt = <1200000>;
> -		regulator-max-microvolt = <1200000>;
> -		vin-supply = <&vcc_3v3>;
> -	};
> -};
> -
> -&combphy1 {
> -	status = "okay";
> -};
> -
> -&combphy2 {
> -	status = "okay";
> -};
> -
> -&cpu0 {
> -	cpu-supply = <&vdd_cpu>;
> -};
> -
> -&cpu1 {
> -	cpu-supply = <&vdd_cpu>;
> -};
> -
> -&cpu2 {
> -	cpu-supply = <&vdd_cpu>;
> -};
> -
> -&cpu3 {
> -	cpu-supply = <&vdd_cpu>;
> -};
> -
> -&cru {
> -	assigned-clocks = <&pmucru CLK_RTC_32K>, <&cru PLL_GPLL>,
> -			  <&pmucru PLL_PPLL>, <&cru PLL_VPLL>;
> -	assigned-clock-rates = <32768>, <1200000000>, <200000000>, <500000000>;
> -	assigned-clock-parents = <&pmucru CLK_RTC32K_FRAC>;
> -};
> -
> -&csi_dphy {
> -	status = "okay";
> -};
> -
> -&dsi0 {
> -	status = "okay";
> -	clock-master;
> -	#address-cells = <1>;
> -	#size-cells = <0>;
> -
> -	lcd: panel at 0 {
> -		compatible = "boe,th101mb31ig002-28a";
> -		reg = <0>;
> -		backlight = <&backlight>;
> -		enable-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
> -		rotation = <90>;
> -		power-supply = <&vcc_3v3>;
> -
> -		port at 0 {
> -			panel_in_dsi: endpoint at 0 {
> -				remote-endpoint = <&dsi0_out_con>;
> -			};
> -		};
> -	};
> -};
> -
> -&dsi0_in {
> -	dsi0_in_vp1: endpoint {
> -		remote-endpoint = <&vp1_out_dsi0>;
> -	};
> -};
> -
> -&dsi0_out {
> -	dsi0_out_con: endpoint {
> -		remote-endpoint = <&panel_in_dsi>;
> -	};
> -};
> -
> -&dsi_dphy0 {
> -	status = "okay";
> -};
> -
> -&gpu {
> -	mali-supply = <&vdd_gpu_npu>;
> -	status = "okay";
> -};
> -
> -&hdmi {
> -	avdd-0v9-supply = <&vdda_0v9_p>;
> -	avdd-1v8-supply = <&vcc_1v8>;
> -	status = "okay";
> -};
> -
> -&hdmi_in {
> -	hdmi_in_vp0: endpoint {
> -		remote-endpoint = <&vp0_out_hdmi>;
> -	};
> -};
> -
> -&hdmi_out {
> -	hdmi_out_con: endpoint {
> -		remote-endpoint = <&hdmi_con_in>;
> -	};
> -};
> -
> -&hdmi_sound {
> -	status = "okay";
> -};
> -
> -&i2c0 {
> -	clock-frequency = <400000>;
> -	status = "okay";
> -
> -	vdd_cpu: regulator at 1c {
> -		compatible = "tcs,tcs4525";
> -		reg = <0x1c>;
> -		fcs,suspend-voltage-selector = <1>;
> -		regulator-name = "vdd_cpu";
> -		regulator-min-microvolt = <800000>;
> -		regulator-max-microvolt = <1150000>;
> -		regulator-ramp-delay = <2300>;
> -		regulator-always-on;
> -		regulator-boot-on;
> -		vin-supply = <&vcc_sys>;
> -
> -		regulator-state-mem {
> -			regulator-off-in-suspend;
> -		};
> -	};
> -
> -	rk817: pmic at 20 {
> -		compatible = "rockchip,rk817";
> -		reg = <0x20>;
> -		interrupt-parent = <&gpio0>;
> -		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
> -		assigned-clocks = <&cru I2S1_MCLKOUT_TX>;
> -		assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>;
> -		clock-names = "mclk";
> -		clocks = <&cru I2S1_MCLKOUT_TX>;
> -		clock-output-names = "rk808-clkout1", "rk808-clkout2";
> -		#clock-cells = <1>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&pmic_int_l>, <&i2s1m0_mclk>;
> -		rockchip,system-power-controller;
> -		#sound-dai-cells = <0>;
> -		wakeup-source;
> -
> -		vcc1-supply = <&vcc_sys>;
> -		vcc2-supply = <&vcc_sys>;
> -		vcc3-supply = <&vcc_sys>;
> -		vcc4-supply = <&vcc_sys>;
> -		vcc5-supply = <&vcc_sys>;
> -		vcc6-supply = <&vcc_sys>;
> -		vcc7-supply = <&vcc_sys>;
> -		vcc8-supply = <&vcc_sys>;
> -		vcc9-supply = <&vcc5v_midu>;
> -
> -		regulators {
> -			vdd_logic: DCDC_REG1 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <500000>;
> -				regulator-max-microvolt = <1350000>;
> -				regulator-ramp-delay = <6001>;
> -				regulator-initial-mode = <0x2>;
> -				regulator-name = "vdd_logic";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vdd_gpu_npu: DCDC_REG2 {
> -				regulator-min-microvolt = <500000>;
> -				regulator-max-microvolt = <1350000>;
> -				regulator-ramp-delay = <6001>;
> -				regulator-initial-mode = <0x2>;
> -				regulator-name = "vdd_gpu_npu";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vcc_ddr: DCDC_REG3 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-initial-mode = <0x2>;
> -				regulator-name = "vcc_ddr";
> -				regulator-state-mem {
> -					regulator-on-in-suspend;
> -				};
> -			};
> -
> -			vcc3v3_sys: DCDC_REG4 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <3300000>;
> -				regulator-max-microvolt = <3300000>;
> -				regulator-initial-mode = <0x2>;
> -				regulator-name = "vcc3v3_sys";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vcca1v8_pmu: LDO_REG1 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <1800000>;
> -				regulator-max-microvolt = <1800000>;
> -				regulator-name = "vcca1v8_pmu";
> -				regulator-state-mem {
> -					regulator-on-in-suspend;
> -				};
> -			};
> -
> -			vdda_0v9_p: LDO_REG2 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <900000>;
> -				regulator-max-microvolt = <900000>;
> -				regulator-name = "vdda_0v9_p";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vdda0v9_pmu: LDO_REG3 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <900000>;
> -				regulator-max-microvolt = <900000>;
> -				regulator-name = "vdda0v9_pmu";
> -				regulator-state-mem {
> -					regulator-on-in-suspend;
> -				};
> -			};
> -
> -			vccio_acodec: LDO_REG4 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <3300000>;
> -				regulator-max-microvolt = <3300000>;
> -				regulator-name = "vccio_acodec";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vccio_sd: LDO_REG5 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <1800000>;
> -				regulator-max-microvolt = <3300000>;
> -				regulator-name = "vccio_sd";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vcc3v3_pmu: LDO_REG6 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <3300000>;
> -				regulator-max-microvolt = <3300000>;
> -				regulator-name = "vcc3v3_pmu";
> -				regulator-state-mem {
> -					regulator-on-in-suspend;
> -				};
> -			};
> -
> -			vcc_1v8: LDO_REG7 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <1800000>;
> -				regulator-max-microvolt = <1800000>;
> -				regulator-name = "vcc_1v8";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vcc1v8_dvp: LDO_REG8 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <1800000>;
> -				regulator-max-microvolt = <1800000>;
> -				regulator-name = "vcc1v8_dvp";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vcc2v8_dvp: LDO_REG9 {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <2800000>;
> -				regulator-max-microvolt = <2800000>;
> -				regulator-name = "vcc2v8_dvp";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vcc5v_midu: BOOST {
> -				regulator-always-on;
> -				regulator-boot-on;
> -				regulator-min-microvolt = <5000000>;
> -				regulator-max-microvolt = <5000000>;
> -				regulator-name = "boost";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -
> -			vbus: OTG_SWITCH {
> -				regulator-min-microvolt = <5000000>;
> -				regulator-max-microvolt = <5000000>;
> -				regulator-name = "otg_switch";
> -				regulator-state-mem {
> -					regulator-off-in-suspend;
> -				};
> -			};
> -		};
> -
> -		charger {
> -			monitored-battery = <&battery>;
> -			rockchip,resistor-sense-micro-ohms = <10000>;
> -			rockchip,sleep-enter-current-microamp = <300000>;
> -			rockchip,sleep-filter-current-microamp = <100000>;
> -		};
> -	};
> -};
> -
> -&i2c1 {
> -	clock-frequency = <400000>;
> -	status = "okay";
> -
> -	touchscreen at 5d {
> -		compatible = "goodix,gt911";
> -		reg = <0x5d>;
> -		interrupt-parent = <&gpio0>;
> -		interrupts = <RK_PB0 IRQ_TYPE_EDGE_FALLING>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&tp_int_l_pmuio2>, <&tp_rst_l_pmuio2>;
> -		AVDD28-supply = <&vcc3v3_pmu>;
> -		VDDIO-supply = <&vcca1v8_pmu>;
> -		irq-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
> -		reset-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
> -	};
> -};
> -
> -&i2c2 {
> -	clock-frequency = <400000>;
> -	pinctrl-0 = <&i2c2m1_xfer>;
> -	status = "okay";
> -
> -	vcm at c {
> -		compatible = "dongwoon,dw9714";
> -		reg = <0x0c>;
> -		vcc-supply = <&vcc1v8_dvp>;
> -	};
> -
> -	camera at 36 {
> -		compatible = "ovti,ov5648";
> -		reg = <0x36>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&camerab_pdn_l &camerab_rst_l>;
> -
> -		clocks = <&cru CLK_CIF_OUT>;
> -		assigned-clocks = <&cru CLK_CIF_OUT>;
> -		assigned-clock-rates = <24000000>;
> -
> -		avdd-supply = <&vcc2v8_dvp>;
> -		dvdd-supply = <&vdd1v2_dvp>;
> -		dovdd-supply = <&vcc1v8_dvp>;
> -		powerdown-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>;
> -		reset-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_LOW>;
> -
> -		port {
> -			endpoint {
> -				data-lanes = <1 2>;
> -				remote-endpoint = <0>;
> -				link-frequencies = /bits/ 64 <210000000 168000000>;
> -			};
> -		};
> -	};
> -};
> -
> -&i2c5 {
> -	clock-frequency = <400000>;
> -	status = "okay";
> -
> -	accelerometer at 18 {
> -		compatible = "silan,sc7a20";
> -		reg = <0x18>;
> -		interrupt-parent = <&gpio3>;
> -		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&gsensor_int_l>;
> -		st,drdy-int-pin = <1>;
> -		vdd-supply = <&vcc_1v8>;
> -		vddio-supply = <&vcc_1v8>;
> -		mount-matrix = "1", "0", "0",
> -			       "0", "0", "1",
> -			       "0", "1", "0";
> -	};
> -};
> -
> -&i2s0_8ch {
> -	status = "okay";
> -};
> -
> -&i2s1_8ch {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&i2s1m0_sclktx
> -		     &i2s1m0_lrcktx
> -		     &i2s1m0_sdi0
> -		     &i2s1m0_sdo0>;
> -	rockchip,trcm-sync-tx-only;
> -	status = "okay";
> -};
> -
> -&pcie2x1 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&pcie_reset_h>;
> -	reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
> -	vpcie3v3-supply = <&vcc3v3_minipcie>;
> -	status = "okay";
> -};
> -
> -&pinctrl {
> -	camerab {
> -		camerab_pdn_l: camerab-pdn-l {
> -			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
> -		camerab_rst_l: camerab-rst-l {
> -			rockchip,pins = <4 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	cameraf {
> -		cameraf_pdn_l: cameraf-pdn-l {
> -			rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
> -		cameraf_rst_l: cameraf-rst-l {
> -			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	flash {
> -		flash_led_en_h: flash-led-en-h {
> -			rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	fspi {
> -		fspi_dual_io_pins: fspi-dual-io-pins {
> -			rockchip,pins =
> -				/* fspi_clk */
> -				<1 RK_PD0 1 &pcfg_pull_none>,
> -				/* fspi_cs0n */
> -				<1 RK_PD3 1 &pcfg_pull_none>,
> -				/* fspi_d0 */
> -				<1 RK_PD1 1 &pcfg_pull_none>,
> -				/* fspi_d1 */
> -				<1 RK_PD2 1 &pcfg_pull_none>;
> -		};
> -	};
> -
> -	gsensor {
> -		gsensor_int_l: gsensor-int-l {
> -			rockchip,pins = <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
> -		};
> -	};
> -
> -	kb {
> -		kb_id_det: kb-id-det {
> -			rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	lcd {
> -		lcd_pwren_h: lcd-pwren-h {
> -			rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	pcie {
> -		pcie_pwren_h: pcie-pwren-h {
> -			rockchip,pins = <4 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
> -		pcie_reset_h: pcie-reset-h {
> -			rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	pmic {
> -		pmic_int_l: pmic-int-l {
> -			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
> -		};
> -	};
> -
> -	sdmmc {
> -		sdmmc_pwren_l: sdmmc-pwren-l {
> -			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	sound {
> -		hp_det_l: hp-det-l {
> -			rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
> -		spk_ctl: spk-ctl {
> -			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	tp {
> -		tp_int_l_pmuio2: tp-int-l-pmuio2 {
> -			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
> -		};
> -
> -		tp_rst_l_pmuio2: tp-rst-l-pmuio2 {
> -			rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	usb {
> -		usbcc_int_l: usbcc-int-l {
> -			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
> -		usb_host_pwren1_h: usb-host-pwren1-h {
> -			rockchip,pins = <4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
> -		usb_host_pwren2_h: usb-host-pwren2-h {
> -			rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
> -
> -	wifi {
> -		host_wake_wl: host-wake-wl {
> -			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
> -		wifi_wake_host_h: wifi-wake-host-h {
> -			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>;
> -		};
> -	};
> -};
> -
> -&pmu_io_domains {
> -	pmuio1-supply = <&vcc3v3_pmu>;
> -	pmuio2-supply = <&vcca1v8_pmu>;
> -	vccio1-supply = <&vccio_acodec>;
> -	vccio2-supply = <&vcc_1v8>;
> -	vccio3-supply = <&vccio_sd>;
> -	vccio4-supply = <&vcc_1v8>;
> -	vccio5-supply = <&vcc_1v8>;
> -	vccio6-supply = <&vcc1v8_dvp>;
> -	vccio7-supply = <&vcc_3v3>;
> -	status = "okay";
> -};
> -
> -&pwm4 {
> -	status = "okay";
> -};
> -
> -&saradc {
> -	vref-supply = <&vcc_1v8>;
> -	status = "okay";
> -};
> -
> -&sdhci {
> -	bus-width = <8>;
> -	no-sdio;
> -	no-sd;
> -	non-removable;
> -	max-frequency = <200000000>;
> -	mmc-hs200-1_8v;
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&emmc_bus8
> -		     &emmc_clk
> -		     &emmc_cmd
> -		     &emmc_datastrobe
> -		     &emmc_rstnout>;
> -	vmmc-supply = <&vcc_3v3>;
> -	vqmmc-supply = <&vcc_1v8>;
> -	status = "okay";
> -};
> -
> -&sdmmc0 {
> -	bus-width = <4>;
> -	cap-sd-highspeed;
> -	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
> -	disable-wp;
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&sdmmc0_bus4
> -		     &sdmmc0_clk
> -		     &sdmmc0_cmd
> -		     &sdmmc0_det>;
> -	sd-uhs-sdr104;
> -	vmmc-supply = <&vcc3v3_sd>;
> -	vqmmc-supply = <&vccio_sd>;
> -	status = "okay";
> -};
> -
> -&sdmmc1 {
> -	bus-width = <4>;
> -	cap-sd-highspeed;
> -	cap-sdio-irq;
> -	keep-power-in-suspend;
> -	non-removable;
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&sdmmc1_bus4
> -		     &sdmmc1_cmd
> -		     &sdmmc1_clk>;
> -	sd-uhs-sdr104;
> -	vqmmc-supply = <&vcca1v8_pmu>;
> -	status = "okay";
> -};
> -
> -&sfc {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&fspi_dual_io_pins>;
> -	status = "okay";
> -	#address-cells = <1>;
> -	#size-cells = <0>;
> -
> -	flash at 0 {
> -		compatible = "jedec,spi-nor";
> -		reg = <0>;
> -		spi-max-frequency = <100000000>;
> -		spi-rx-bus-width = <2>;
> -		spi-tx-bus-width = <1>;
> -	};
> -};
> -
> -&tsadc {
> -	rockchip,hw-tshut-mode = <1>;
> -	rockchip,hw-tshut-polarity = <0>;
> -	status = "okay";
> -};
> -
> -&uart2 {
> -	status = "okay";
> -};
> -
> -&usb_host0_ehci {
> -	status = "okay";
> -};
> -
> -&usb_host0_ohci {
> -	status = "okay";
> -};
> -
> -&usb_host0_xhci {
> -	status = "okay";
> -};
> -
> -&usb_host1_xhci {
> -	status = "okay";
> -};
> -
> -&usb2phy0 {
> -	status = "okay";
> -};
> -
> -&usb2phy0_host {
> -	phy-supply = <&vcc5v0_usb_host0>;
> -	status = "okay";
> -};
> -
> -&usb2phy0_otg {
> -	status = "okay";
> -};
> -
> -&usb2phy1 {
> -	status = "okay";
> -};
> -
> -&usb2phy1_otg {
> -	phy-supply = <&vcc5v0_usb_host2>;
> -	status = "okay";
> -};
> -
> -&vop {
> -	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
> -	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
> -	status = "okay";
> -};
> -
> -&vop_mmu {
> -	status = "okay";
> -};
> -
> -&vp0 {
> -	vp0_out_hdmi: endpoint at ROCKCHIP_VOP2_EP_HDMI0 {
> -		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
> -		remote-endpoint = <&hdmi_in_vp0>;
> -	};
> -};
> -
> -&vp1 {
> -	vp1_out_dsi0: endpoint at ROCKCHIP_VOP2_EP_MIPI0 {
> -		reg = <ROCKCHIP_VOP2_EP_MIPI0>;
> -		remote-endpoint = <&dsi0_in_vp1>;
> -	};
> -};
> diff --git a/configs/pinetab2-rk3566_defconfig b/configs/pinetab2-rk3566_defconfig
> index e46acf3a3b58..2d075d12174c 100644
> --- a/configs/pinetab2-rk3566_defconfig
> +++ b/configs/pinetab2-rk3566_defconfig
> @@ -5,7 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y
>   CONFIG_SPL_GPIO=y
>   CONFIG_SF_DEFAULT_SPEED=24000000
>   CONFIG_SF_DEFAULT_MODE=0x1000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3566-pinetab2-v2.0"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3566-pinetab2-v2.0"
>   CONFIG_ROCKCHIP_RK3568=y
>   CONFIG_ROCKCHIP_RK8XX_DISABLE_BOOT_ON_POWERON=y
>   CONFIG_ROCKCHIP_SPI_IMAGE=y
> @@ -47,8 +47,7 @@ CONFIG_CMD_REGULATOR=y
>   # CONFIG_SPL_DOS_PARTITION is not set
>   CONFIG_SPL_OF_CONTROL=y
>   CONFIG_OF_LIVE=y
> -# CONFIG_OF_UPSTREAM is not set
> -CONFIG_OF_LIST="rk3566-pinetab2-v0.1 rk3566-pinetab2-v2.0"
> +CONFIG_OF_LIST="rockchip/rk3566-pinetab2-v0.1 rockchip/rk3566-pinetab2-v2.0"
>   CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
>   CONFIG_SPL_DM_SEQ_ALIAS=y
>   CONFIG_SPL_REGMAP=y


More information about the U-Boot mailing list