From patchwork Sat Dec 9 17:15:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Heidelberg X-Patchwork-Id: 13486056 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF9BFC4167B for ; Sat, 9 Dec 2023 17:17:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CuRTQW5oFwnzTyY0g/xNbb54hl2x04tzq1mq1aheVV0=; b=dxcyKDqEgKqfrz oADD2dlKZYyzJiJAIDrQ4ZyCwk4fOe8JhfTV131RoFPinaTdvkPSSBalsm9fQGkf4Hj91FwIS/7t1 IxHX3bUp/PUZLHlm7KCbngLMWl8y0ITKjfVK1aafpnAkY9CKvrgMLCNgyj7jeZ2iw70CGUdTtCFO8 uW12ITlh/g2kR1nFnLxXHyjB8nfm9IN6gAMKsdprXYBX5Qb+qFICdJOzFBwhIRrQASApKaUMvvuys cp+B/y+QWL/wV4YKwQ3SnOZ5oYp2MiVvCuyLg46M9BGzPPphLA/13SPYgJwiAskpgoy/n18LeIG+a IH+TTVYPYgql35SuB/Ww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rC0xA-000LME-2Z; Sat, 09 Dec 2023 17:17:24 +0000 Received: from ip-89-177-23-149.bb.vodafone.cz ([89.177.23.149] helo=ixit.cz) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rC0x7-000LKH-0e; Sat, 09 Dec 2023 17:17:23 +0000 Received: from newone.lan (unknown [10.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ixit.cz (Postfix) with ESMTPSA id 6EFFE1605EE; Sat, 9 Dec 2023 18:17:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ixit.cz; s=dkim; t=1702142231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/0H6bwtLy8JPhPVHInIhXdE8jtxG6LhIg62kFR5k+5I=; b=PkNTbnysWysZQfAXiotMky8OnHvb4I+xsiTc3dsfe7RP8SL8MPU7uVMZTu9i7U95bMBXCK DkMQiEunGNPPTkOlWVl2KhbJF1a0oaYN8bS3+fZCS0z3jKjUitbB/Z6+vdrn1Cb9sHsmzK 3AoJcI9V5bPBIOL91Dua3W0CwZUuxJM= From: David Heidelberg To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , David Heidelberg , Cristian Ciocaltea , AngeloGioacchino Del Regno Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] arm64: dts: rockchip: make dts use gpio-fan matrix instead of array Date: Sat, 9 Dec 2023 18:15:40 +0100 Message-ID: <20231209171653.85468-2-david@ixit.cz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231209171653.85468-1-david@ixit.cz> References: <20231209171653.85468-1-david@ixit.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231209_091721_421064_974ED771 X-CRM114-Status: GOOD ( 11.20 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org No functional changes. Adjust to comply with dt-schema requirements and make possible to validate values. Acked-by: Heiko Stuebner Signed-off-by: David Heidelberg --- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index e6ac292ce645..69dd3568b84e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -44,7 +44,7 @@ dc_12v: dc-12v { fan0: gpio-fan { #cooling-cells = <2>; compatible = "gpio-fan"; - gpio-fan,speed-map = <0 0 3000 1>; + gpio-fan,speed-map = <0 0>, <3000 1>; gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts index 854d02b46e6f..59843a7a199c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts @@ -31,8 +31,9 @@ gmac1_clkin: external-gmac1-clock { fan: gpio_fan { compatible = "gpio-fan"; gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>; - gpio-fan,speed-map = <0 0 - 4500 1>; + gpio-fan,speed-map = + < 0 0>, + <4500 1>; pinctrl-names = "default"; pinctrl-0 = <&fan_en_h>; #cooling-cells = <2>;