From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31C9ACD128A for ; Sun, 31 Mar 2024 21:25:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 69DE287FC9; Sun, 31 Mar 2024 23:25:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=manjaro.org header.i=@manjaro.org header.b="Q6+dU6+q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5AB1887FC9; Sun, 31 Mar 2024 23:25:01 +0200 (CEST) Received: from mail.manjaro.org (mail.manjaro.org [IPv6:2a01:4f8:c0c:51f3::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3C1F587BF1 for ; Sun, 31 Mar 2024 23:24:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=dsimic@manjaro.org MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=manjaro.org; s=2021; t=1711920298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GkwUUz609HUaJJKzhBfwZcnyXmUZKbsU98rN8TSExPA=; b=Q6+dU6+qjWsJesesWpcAaQpCebDhhN8EPBRTSjZs+SB1ErD+lA8L56CUOhkFXmkGMGr073 xxIukcHKXhB4AH/Evjocl2NtxxabAJGQRnZHoxiF+qs3BPVDPuNvHkbLkwTleVyUI0Aiwh QD16zEjlHaEQadXiQeycaWmQ09hFQd+i/vqFuag4spikJGF3dDGqm4DDRlduHwOmpLFY/U UrEqUmTyYUTAd2lqDLVhoRpySxkWI4RWuBR5AQH6F0oUn4p6CPjwRBmRnlKGe589qmHZCd 2q08Ikn+Us0kg/djrJgsFmnj94gi3EPxo+WNCWvGqF/6OL5TAv3xGh1C8VsRAw== Date: Sun, 31 Mar 2024 23:24:57 +0200 From: Dragan Simic To: Jonas Karlman Cc: Kever Yang , Simon Glass , Philipp Tomsich , Tom Rini , Jagan Teki , u-boot@lists.denx.de Subject: Re: [PATCH 29/31] rockchip: rk3399-rockpro64: Sync device tree from linux v6.8 In-Reply-To: <20240331202921.262323-30-jonas@kwiboo.se> References: <20240331202921.262323-1-jonas@kwiboo.se> <20240331202921.262323-30-jonas@kwiboo.se> Message-ID: X-Sender: dsimic@manjaro.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Authentication-Results: ORIGINATING; auth=pass smtp.auth=dsimic@manjaro.org smtp.mailfrom=dsimic@manjaro.org X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean On 2024-03-31 22:28, Jonas Karlman wrote: > Sync rk3399-rockpro64 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. > > Remove USE_PREBOOT=y to speed up booting, standard boot will init USB > after faster boot media has been evaluated. > > Add CMD_POWEROFF=y to support poweroff using cmdline and power on using > the pwr button on the board. > > Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. > > Remove SPL_TINY_MEMSET=y to use full memset in SPL. > > Signed-off-by: Jonas Karlman Looking good to me. Thank you for all these nice cleanups! Reviewed-by: Dragan Simic > --- > arch/arm/dts/rk3399-rockpro64.dtsi | 98 ++++++++++++++++++++++++++++-- > configs/rockpro64-rk3399_defconfig | 7 ++- > 2 files changed, 97 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/dts/rk3399-rockpro64.dtsi > b/arch/arm/dts/rk3399-rockpro64.dtsi > index 6bff8db7d33e..f30b82a10ca3 100644 > --- a/arch/arm/dts/rk3399-rockpro64.dtsi > +++ b/arch/arm/dts/rk3399-rockpro64.dtsi > @@ -11,6 +11,7 @@ > > / { > aliases { > + ethernet0 = &gmac; > mmc0 = &sdio0; > mmc1 = &sdmmc; > mmc2 = &sdhci; > @@ -20,6 +21,15 @@ > stdout-path = "serial2:1500000n8"; > }; > > + /* enable for panel backlight support */ > + backlight: backlight { > + compatible = "pwm-backlight"; > + brightness-levels = <0 4 8 16 32 64 128 255>; > + default-brightness-level = <5>; > + pwms = <&pwm0 0 1000000 0>; > + status = "disabled"; > + }; > + > clkin_gmac: external-gmac-clock { > compatible = "fixed-clock"; > clock-frequency = <125000000>; > @@ -33,7 +43,7 @@ > pinctrl-names = "default"; > pinctrl-0 = <&pwrbtn>; > > - power { > + key-power { > debounce-interval = <100>; > gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; > label = "GPIO Key Power"; > @@ -69,6 +79,7 @@ > > fan: pwm-fan { > compatible = "pwm-fan"; > + cooling-levels = <0 100 150 200 255>; > #cooling-cells = <2>; > fan-supply = <&vcc12v_dcin>; > pwms = <&pwm1 0 50000 0>; > @@ -106,6 +117,14 @@ > }; > }; > > + avdd: avdd-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "avdd"; > + regulator-min-microvolt = <11000000>; > + regulator-max-microvolt = <11000000>; > + vin-supply = <&vcc3v3_s0>; > + }; > + > vcc12v_dcin: vcc12v-dcin { > compatible = "regulator-fixed"; > regulator-name = "vcc12v_dcin"; > @@ -212,12 +231,12 @@ > vdd_log: vdd-log { > compatible = "pwm-regulator"; > pwms = <&pwm2 0 25000 1>; > + pwm-supply = <&vcc5v0_sys>; > regulator-name = "vdd_log"; > regulator-always-on; > regulator-boot-on; > regulator-min-microvolt = <800000>; > regulator-max-microvolt = <1700000>; > - vin-supply = <&vcc5v0_sys>; > }; > }; > > @@ -245,6 +264,34 @@ > cpu-supply = <&vdd_cpu_b>; > }; > > +&cpu_thermal { > + trips { > + cpu_warm: cpu_warm { > + temperature = <55000>; > + hysteresis = <2000>; > + type = "active"; > + }; > + > + cpu_hot: cpu_hot { > + temperature = <65000>; > + hysteresis = <2000>; > + type = "active"; > + }; > + }; > + > + cooling-maps { > + map2 { > + trip = <&cpu_warm>; > + cooling-device = <&fan THERMAL_NO_LIMIT 1>; > + }; > + > + map3 { > + trip = <&cpu_hot>; > + cooling-device = <&fan 2 THERMAL_NO_LIMIT>; > + }; > + }; > +}; > + > &emmc_phy { > status = "okay"; > }; > @@ -371,8 +418,6 @@ > > vcc3v0_touch: LDO_REG2 { > regulator-name = "vcc3v0_touch"; > - regulator-always-on; > - regulator-boot-on; > regulator-min-microvolt = <3000000>; > regulator-max-microvolt = <3000000>; > regulator-state-mem { > @@ -461,8 +506,6 @@ > > vcc3v3_s0: SWITCH_REG2 { > regulator-name = "vcc3v3_s0"; > - regulator-always-on; > - regulator-boot-on; > regulator-state-mem { > regulator-off-in-suspend; > }; > @@ -536,6 +579,19 @@ > vbus-supply = <&vcc5v0_typec>; > status = "okay"; > }; > + > + /* enable for pine64 touch screen support */ > + touch: touchscreen@5d { > + compatible = "goodix,gt911"; > + reg = <0x5d>; > + interrupt-parent = <&gpio4>; > + interrupts = ; > + AVDD28-supply = <&vcc3v0_touch>; > + VDDIO-supply = <&vcc3v0_touch>; > + irq-gpios = <&gpio4 RK_PD5 GPIO_ACTIVE_HIGH>; > + reset-gpios = <&gpio4 RK_PD6 GPIO_ACTIVE_HIGH>; > + status = "disabled"; > + }; > }; > > &i2s0 { > @@ -571,6 +627,36 @@ > gpio1830-supply = <&vcc_3v0>; > }; > > +/* enable for pine64 panel display support */ > +&mipi_dsi { > + clock-master; > + status = "disabled"; > + > + ports { > + mipi_out: port@1 { > + reg = <1>; > + > + mipi_out_panel: endpoint { > + remote-endpoint = <&mipi_in_panel>; > + }; > + }; > + }; > + > + mipi_panel: panel@0 { > + compatible = "feiyang,fy07024di26a30d"; > + reg = <0>; > + avdd-supply = <&avdd>; > + backlight = <&backlight>; > + dvdd-supply = <&vcc3v3_s0>; > + > + port { > + mipi_in_panel: endpoint { > + remote-endpoint = <&mipi_out_panel>; > + }; > + }; > + }; > +}; > + > &pcie0 { > ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; > num-lanes = <4>; > diff --git a/configs/rockpro64-rk3399_defconfig > b/configs/rockpro64-rk3399_defconfig > index 173f8f75020d..4e1af37a1559 100644 > --- a/configs/rockpro64-rk3399_defconfig > +++ b/configs/rockpro64-rk3399_defconfig > @@ -4,6 +4,7 @@ CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_SIZE=0x8000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64" > @@ -20,7 +21,6 @@ CONFIG_PCI=y > CONFIG_DEBUG_UART=y > CONFIG_BOOTSTAGE=y > CONFIG_BOOTSTAGE_REPORT=y > -CONFIG_USE_PREBOOT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_MAX_SIZE=0x40000 > @@ -34,6 +34,7 @@ CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=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 > @@ -57,7 +58,10 @@ 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_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -96,5 +100,4 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y