From patchwork Mon Sep 6 12:04:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 507418 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F386CC433F5 for ; Mon, 6 Sep 2021 12:05:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC0AC61076 for ; Mon, 6 Sep 2021 12:05:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240963AbhIFMGn (ORCPT ); Mon, 6 Sep 2021 08:06:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238537AbhIFMGk (ORCPT ); Mon, 6 Sep 2021 08:06:40 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEB7BC061575; Mon, 6 Sep 2021 05:05:34 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id dm15so9223500edb.10; Mon, 06 Sep 2021 05:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=In9AqwxG6kQ9Z2Bk5c/A+CJjxcpZ+YKTzhcivosE+ZI=; b=iqO00bcQFNZF13Jj6amSx44PsCVInDTUO87KiRNOIINyFBpjPUn8qfHLCYihpbCjUL +vbGecOmdqECGj6DApBtUue8VWyBuR86X8HOW6CNaKgXVlnNtPRD3QVmE80rkukG2Z+A XESmlXdDSjXmbupmWU0X3gle/LLd+DhXOLNJ7/wpubYi2yI4zVQEdDOIt59TsSuQJkxW hUBysiQ30hWdwxCAQ4XNq5oEnQ2onL6EY6dbsUte14D8HD3eG9oQmult2ymNmu4jS89A ECGHW48jNYAdX5yRURa/K96AwqrMRz2EVJiHQhSu6Ag/anSOJhmcE6Mggm6wvDh/7orx KgJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=In9AqwxG6kQ9Z2Bk5c/A+CJjxcpZ+YKTzhcivosE+ZI=; b=IsemVauVqvsCAU25JeSRrQmRV7XobkY+pU4ijDM1uFpJDk+sqRNbYVO68QFn1OREWA LwK1x721UUhvKWS0zoaxXnBXGkQaZYfnhjC9Q8Rvp3tlzTokAniCb+zUY9AOqSyD7O1Y xvKW4D6jfFIpwHXA/nvHOeQlvNTdF4nKUqJtG82vY9ah8uhBGHd1R5zm1Ate1KZJFcOc 8eQaIiHGKzcBc80XWSofLp82rj7bebxJ/zEIXcO/j1E+UyZWzKlkkeT9iKpGeRplroS0 NdMbLOafnBCr0JNOQA2xNtjWXAr8AFZufPtHbrMYu3aRZm/2HkGBg5s0OELeaNfJYpky JtaA== X-Gm-Message-State: AOAM533P3tpS3CKkbcWjhUA2BYD6EmrMsz9ginn9m6VOHZdzcBLGyNGn 2jjhLbyboVebwdmnrb5yYzM= X-Google-Smtp-Source: ABdhPJxOOCo2ca3Si5A7uvngo7vEXqfO8X5NR5B7TPIdx8OOX7kX/c866e8Lfd4yYReXDI6gp0LmCQ== X-Received: by 2002:a05:6402:1057:: with SMTP id e23mr13285183edu.352.1630929933230; Mon, 06 Sep 2021 05:05:33 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id b8sm4536954edv.96.2021.09.06.05.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 05:05:32 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, rui.zhang@intel.com, daniel.lezcano@linaro.org, amitk@kernel.org, p.zabel@pengutronix.de, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 1/4] dt-bindings: thermal: allow more resets for tsadc node in rockchip-thermal.yaml Date: Mon, 6 Sep 2021 14:04:01 +0200 Message-Id: <20210906120404.10005-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The tsadc node in rk356x.dtsi has more resets defined then currently allowed by rockchip-thermal.yaml, so fix that in the documentation. The driver now uses the devm_reset_control_array_get() function, so reset-names is no longer required, but keep it for legacy reasons. Signed-off-by: Johan Jonker --- .../devicetree/bindings/thermal/rockchip-thermal.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml index b96ea277b..ee104e451 100644 --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml @@ -37,11 +37,16 @@ properties: - const: apb_pclk resets: - maxItems: 1 + minItems: 1 + maxItems: 3 reset-names: + deprecated: true + minItems: 1 items: - const: tsadc-apb + - const: tsadc + - const: tsadc-phy "#thermal-sensor-cells": const: 1 @@ -71,7 +76,6 @@ required: - clocks - clock-names - resets - - reset-names - "#thermal-sensor-cells" additionalProperties: false From patchwork Mon Sep 6 12:04:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 507417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED7CDC433EF for ; Mon, 6 Sep 2021 12:05:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C747261039 for ; Mon, 6 Sep 2021 12:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241558AbhIFMGq (ORCPT ); Mon, 6 Sep 2021 08:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241425AbhIFMGo (ORCPT ); Mon, 6 Sep 2021 08:06:44 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C35C4C061575; Mon, 6 Sep 2021 05:05:36 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id n27so13077788eja.5; Mon, 06 Sep 2021 05:05:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1jSWxQD3ZakGUw6t3PqAHw4n2IXaSLh4ZsA1sASlt9o=; b=kIMOOeXQwVNBwDAWMehjWUBA1cnNcm/6CMVB3Y2jTJNPEMNK/XYcBwrw9aSidnM618 bwC6jQp7CqXN/7J2CJtBh3byoNxv/o4m7kipxXXr3X/8O0QjIZwaI9gjDskvKOmJPSq7 Un0Sx3lAYjfM88gkbhtVC4Au1c1rLuYIe1WMW5law0+SKko8xarqNsEIuCS5BbT64150 jYzKIpmlkhsRwcd4wL1elJm9btpPX3NrfLE1OSCt5Ob2zT9Mp1PAmFRPAsDMGnZGlVOg UbTk1n2DMBOoRzKqVot5eggpLzg/dV7JTqjD3hodrGZDbmIm97dn/VNJLi1zahE9gV8l AUyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1jSWxQD3ZakGUw6t3PqAHw4n2IXaSLh4ZsA1sASlt9o=; b=gVL36EEwKMhCzWYdDWDnxAVt3DTKcWa/1egilPEIBBpgm5JPCo/Lw93CHnuOMUNA9k XSHYcnLl4S744cc0BKRSid1k6PIz2xKmVJj9PKaVTtipJ5+h8yrq+kCBTbSphBLLaiFp rJ8uTEOREBKvxm+FAkq7XGLROeN8MAJXc86oJPMTOoR8IzewMEYnObdNoHjZXkSzenjI iDuqNU+hQCtX6HiEo6a2100cVBpx0cyD0bRutCkhHpDziEf1LVR/xAfpY+aQBcBgPGSh TYIYJSHvsFiwSaneZfTONv3D9LYeMEflGOPtLiMf3Yo+JlfJPskHVVHyvGVmVxyDJG+s hdvw== X-Gm-Message-State: AOAM533uh17LnEienaRE86sPI/OvHdLvPqDsm/vQ4obaTWOYtZ/1AjQN I7lf5SK5G8sNhWOyohbd4VOgkjOH2CJY/QpX X-Google-Smtp-Source: ABdhPJy/cwcqasiNdqkpW55WGrmKCcwe3js4BRGA8fMxCasOSDxAnSs05DUepDolnR8WgP9eoctUOA== X-Received: by 2002:a17:906:3497:: with SMTP id g23mr13250953ejb.85.1630929935384; Mon, 06 Sep 2021 05:05:35 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id b8sm4536954edv.96.2021.09.06.05.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 05:05:35 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, rui.zhang@intel.com, daniel.lezcano@linaro.org, amitk@kernel.org, p.zabel@pengutronix.de, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 4/4] arm64: dts: fix resets in tsadc node for rk356x.dtsi Date: Mon, 6 Sep 2021 14:04:04 +0200 Message-Id: <20210906120404.10005-4-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210906120404.10005-1-jbx6244@gmail.com> References: <20210906120404.10005-1-jbx6244@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org In the rockchip_thermal.c driver we now get the resets with a devm_reset_control_array_get() function, so remove the reset-names property as it is no longer needed. Although no longer required in rockchip-thermal.yaml sort tsadc-apb as first item. Signed-off-by: Johan Jonker --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index d89831bee..2dc997eff 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -837,9 +837,8 @@ assigned-clock-rates = <17000000>, <700000>; clocks = <&cru CLK_TSADC>, <&cru PCLK_TSADC>; clock-names = "tsadc", "apb_pclk"; - resets = <&cru SRST_TSADC>, <&cru SRST_P_TSADC>, + resets = <&cru SRST_P_TSADC>, <&cru SRST_TSADC>, <&cru SRST_TSADCPHY>; - reset-names = "tsadc", "tsadc-apb", "tsadc-phy"; rockchip,grf = <&grf>; rockchip,hw-tshut-temp = <95000>; pinctrl-names = "init", "default", "sleep";