[PATCH 30/31] rockchip: rk3399-pinebook-pro: Sync device tree from linux v6.8

[Dragan Simic]

On 2024-03-31 22:28, Jonas Karlman wrote:
> Sync rk3399-pinebook-pro device tree from linux v6.8.
> 
> Add SF_DEFAULT_SPEED=10000000 and SPI_FLASH_SFDP_SUPPORT=y to improve
> support for booting from SPI flash.
> 
> Add CMD_POWEROFF=y to support poweroff using cmdline and power on using
> the pwr button on the board.
> 
> Remove SPL_TINY_MEMSET=y to use full memset in SPL.
> 
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>

Looking good to me.

Reviewed-by: Dragan Simic <dsimic at manjaro.org>

> ---
>  arch/arm/dts/rk3399-pinebook-pro.dts  | 24 +++++++-----------------
>  configs/pinebook-pro-rk3399_defconfig |  6 ++++--
>  2 files changed, 11 insertions(+), 19 deletions(-)
> 
> diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts
> b/arch/arm/dts/rk3399-pinebook-pro.dts
> index d6b68d77d63a..054c6a4d1a45 100644
> --- a/arch/arm/dts/rk3399-pinebook-pro.dts
> +++ b/arch/arm/dts/rk3399-pinebook-pro.dts
> @@ -50,19 +50,9 @@
>  		pinctrl-0 = <&panel_en_pin>;
>  		power-supply = <&vcc3v3_panel>;
> 
> -		ports {
> -			#address-cells = <1>;
> -			#size-cells = <0>;
> -
> -			port at 0 {
> -				reg = <0>;
> -				#address-cells = <1>;
> -				#size-cells = <0>;
> -
> -				panel_in_edp: endpoint at 0 {
> -					reg = <0>;
> -					remote-endpoint = <&edp_out_panel>;
> -				};
> +		port {
> +			panel_in_edp: endpoint {
> +				remote-endpoint = <&edp_out_panel>;
>  			};
>  		};
>  	};
> @@ -76,7 +66,7 @@
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&lidbtn_pin>;
> 
> -		lid {
> +		switch-lid {
>  			debounce-interval = <20>;
>  			gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>;
>  			label = "Lid";
> @@ -92,7 +82,7 @@
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pwrbtn_pin>;
> 
> -		power {
> +		key-power {
>  			debounce-interval = <20>;
>  			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
>  			label = "Power";
> @@ -675,7 +665,7 @@
>  	i2c-scl-rising-time-ns = <168>;
>  	status = "okay";
> 
> -	es8316: es8316 at 11 {
> +	es8316: audio-codec at 11 {
>  		compatible = "everest,es8316";
>  		reg = <0x11>;
>  		clocks = <&cru SCLK_I2S_8CH_OUT>;
> @@ -943,7 +933,7 @@
>  	disable-wp;
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
> -	sd-uhs-sdr104;
> +	sd-uhs-sdr50;
>  	vmmc-supply = <&vcc3v0_sd>;
>  	vqmmc-supply = <&vcc_sdio>;
>  	status = "okay";
> diff --git a/configs/pinebook-pro-rk3399_defconfig
> b/configs/pinebook-pro-rk3399_defconfig
> index dd8bc2b72cc3..8ac6ddd49dea 100644
> --- a/configs/pinebook-pro-rk3399_defconfig
> +++ b/configs/pinebook-pro-rk3399_defconfig
> @@ -4,7 +4,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
>  CONFIG_ARCH_ROCKCHIP=y
>  CONFIG_SPL_GPIO=y
>  CONFIG_NR_DRAM_BANKS=1
> -CONFIG_SF_DEFAULT_SPEED=20000000
> +CONFIG_SF_DEFAULT_SPEED=10000000
>  CONFIG_ENV_SIZE=0x8000
>  CONFIG_ENV_OFFSET=0x3F8000
>  CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
> @@ -36,6 +36,7 @@ CONFIG_CMD_GPT=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
>  CONFIG_CMD_PCI=y
> +CONFIG_CMD_POWEROFF=y
>  CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_CMD_TIME=y
> @@ -64,7 +65,9 @@ CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_SDMA=y
>  CONFIG_MMC_SDHCI_ROCKCHIP=y
>  CONFIG_SF_DEFAULT_BUS=1
> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
>  CONFIG_SPI_FLASH_GIGADEVICE=y
> +CONFIG_SPI_FLASH_SILICONKAISER=y
>  CONFIG_SPI_FLASH_WINBOND=y
>  CONFIG_NVME_PCI=y
>  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> @@ -98,5 +101,4 @@ CONFIG_VIDEO=y
>  CONFIG_DISPLAY=y
>  CONFIG_VIDEO_ROCKCHIP=y
>  CONFIG_DISPLAY_ROCKCHIP_EDP=y
> -CONFIG_SPL_TINY_MEMSET=y
>  CONFIG_ERRNO_STR=y