From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3829E2773CA; Thu, 25 Sep 2025 09:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758792648; cv=none; b=l8WadNXkuXiFQwU4feUP5fPaLMdbhJYQfpaSqQbQTRpG/+Nzq/PK1PsHfwKuWWt4+yoiNVntkXo/EkQQBpEVg/7WjfENUvxQLG3bjJFZ449zb61if4CEkY9kZtk3PCrOYweMYKTevBhzu7HfAi0ARwm9VQLNbc9Mo5jypuRXAW4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758792648; c=relaxed/simple; bh=DK1eafKflS1VMkgKFpYRZQJtGcCG+9RUeQyxkEG/CZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s/rTVgv6iF+8yWJsw86DThI6H5ReG3aFZyL6pWAyFZuH7v8alAmTQIXufUYcLT7NhMhayyDi9jb9lywVZJUuhKRJ1j+LTy8Ytt2L/tUaUG3d2+xwLu/xnsfHJYZzIlfFnx1+yXdLM+qHgFHy8xoG6sjYifyExqzdGpdccrNAiwQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=ix/XOx4r; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="ix/XOx4r" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type; bh=OH1cdcIwLbHj9b9TDgmclt0bqqFEVSxJAiUw7x5ysn8=; b=ix/XOx4rI2biibVmlkMEOu85O+ hKapOfb+vKHXGsI04LNS7n3EBLcPBBH1tu8jLqaD3n55JdVcqBJ6XUic/+xz+cnC8as/t0YEDcQm5 uvbjZKKicCgtpUr2xmH0xbL1F4hq/4ZKLNpldvGMDEXU0akJCSvpskOjBVyXqyuIxGX5qGoCuYlyH Kv2Jd3W60KSIUwmRIy+UmjM4ETEDcjuhv8rEHgFzGq7+N7eoYxlOYamnqIUglI7AjMXPxKOCoP8KM T3a72YUXq5nLOPB8/vY63jhDZyU5cGxaB1DgjLrN8K4pY68eAlGH2brkiO7fQyLEY3mzQ+oC53Rzs X31W0Iog==; Received: from i53875a54.versanet.de ([83.135.90.84] helo=localhost.localdomain) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1v1iJF-0001Nz-NF; Thu, 25 Sep 2025 11:30:41 +0200 From: Heiko Stuebner To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, ukleinek@debian.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 1/6] arm64: dts: rockchip: move cpu_thermal node to the correct position Date: Thu, 25 Sep 2025 11:29:18 +0200 Message-ID: <20250925092923.2184187-2-heiko@sntech.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250925092923.2184187-1-heiko@sntech.de> References: <20250925092923.2184187-1-heiko@sntech.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The &cpu_thermal node was added at the wrong position, move it to the correctly sorted one. Signed-off-by: Heiko Stuebner --- .../boot/dts/rockchip/rk3568-qnap-ts433.dts | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts index 6ae4316761c4..5656554ca284 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts @@ -196,6 +196,54 @@ &cpu3 { cpu-supply = <&vdd_cpu>; }; +/* + * The MCU can provide system temperature too, but only by polling and of + * course also cannot set trip points. So attach to the cpu thermal-zone + * instead to control the fan. + */ +&cpu_thermal { + trips { + case_fan0: case-fan0 { + hysteresis = <2000>; + temperature = <35000>; + type = "active"; + }; + + case_fan1: case-fan1 { + hysteresis = <2000>; + temperature = <45000>; + type = "active"; + }; + + case_fan2: case-fan2 { + hysteresis = <2000>; + temperature = <65000>; + type = "active"; + }; + }; + + cooling-maps { + /* + * Always provide some air movement, due to small case + * full of harddrives. + */ + map1 { + cooling-device = <&fan THERMAL_NO_LIMIT 1>; + trip = <&case_fan0>; + }; + + map2 { + cooling-device = <&fan 2 3>; + trip = <&case_fan1>; + }; + + map3 { + cooling-device = <&fan 4 THERMAL_NO_LIMIT>; + trip = <&case_fan2>; + }; + }; +}; + &gmac0 { assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>; assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>; @@ -492,54 +540,6 @@ rgmii_phy0: ethernet-phy@3 { }; }; -/* - * The MCU can provide system temperature too, but only by polling and of - * course also cannot set trip points. So attach to the cpu thermal-zone - * instead to control the fan. - */ -&cpu_thermal { - trips { - case_fan0: case-fan0 { - hysteresis = <2000>; - temperature = <35000>; - type = "active"; - }; - - case_fan1: case-fan1 { - hysteresis = <2000>; - temperature = <45000>; - type = "active"; - }; - - case_fan2: case-fan2 { - hysteresis = <2000>; - temperature = <65000>; - type = "active"; - }; - }; - - cooling-maps { - /* - * Always provide some air movement, due to small case - * full of harddrives. - */ - map1 { - cooling-device = <&fan THERMAL_NO_LIMIT 1>; - trip = <&case_fan0>; - }; - - map2 { - cooling-device = <&fan 2 3>; - trip = <&case_fan1>; - }; - - map3 { - cooling-device = <&fan 4 THERMAL_NO_LIMIT>; - trip = <&case_fan2>; - }; - }; -}; - &pcie30phy { data-lanes = <1 2>; status = "okay"; -- 2.47.2