From patchwork Tue May 21 18:38:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 13669646 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 4EE70C25B74 for ; Tue, 21 May 2024 18:39:15 +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:CC:To:In-Reply-To:References:Message-ID :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JNyHInQXPQFzZYkbCYr0zkuj+MCQD9ggx9pQWf3vKj4=; b=ssruWhj6EMVtWY BiFYPjKxF8ZV2OdCQFcVWYYB8WtLNjba64vy5IkH3GhVblBzkvRLEmMBfIGpZDGdIlCfOU8csnVf7 UXu15O37vWWeFGIeZ3GRzbFetFlE/PHmO/d1a8X/cpzBdN9B+hThDAgWKC677HixdeUoaxvvfXQYR UJ2G+cWe9I/ayL67muu3365e+WjHI+QL9oZ6YYuzLFD882NHNJ3uDg3fYoEwhj2nKGKpYsHkSED9X uuyHmSR3vWv/uaAyIVuYWZFt2wpzNvw1AoId5FznbwhgErYT2bWjLW2RpLIbeQPo52pPS1Nss30CD MjlD4sbFPL0Idblr9+Hw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9UO7-00000000nei-3QuN; Tue, 21 May 2024 18:39:03 +0000 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9UNl-00000000nTY-24no for linux-arm-kernel@lists.infradead.org; Tue, 21 May 2024 18:38:45 +0000 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44LEwuoJ020201; Tue, 21 May 2024 18:38:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:date:subject:mime-version:content-type :content-transfer-encoding:message-id:references:in-reply-to:to :cc; s=qcppdkim1; bh=QwY0YQr84zBHrkcdkKsTRVkrZiZJkP64GeSk1KtlB8w =; b=l2A3MT++e/5WyLDXOWF8BagMKmPI4Zuv6DXIRaW8dr2sPefaM2E8sR81zkp v+r0IRB4ONgWrA1ftyO+2dEnW8yCRShpGDK46RqMxsDNt+b73LTgPvf9ofRtdbsE gRNNAbUoWFU2txpwgyRJ53BSKYXvaFnbAhGXtvUnfSL2B2nL2KJsXcNXDn+VPoTN xzzXupdmhcpMrla/l4dmsKvc0vKh4eu6huPhvKjpBZckoax2crsxUvAdYesnj0Pt yNa4VFULQsqBSsILKkYMCxJlTFRZAwu1kEbLFvAdgziAka/29TYLlx67SHa7K9I/ K7omTIqm+b5Kqe2IzDVVbQH6KJw== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3y6pqapmmk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 May 2024 18:38:29 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 44LIcT7A016664 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 May 2024 18:38:29 GMT Received: from hu-eberman-lv.qualcomm.com (10.49.16.6) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 21 May 2024 11:38:28 -0700 From: Elliot Berman Date: Tue, 21 May 2024 11:38:04 -0700 Subject: [PATCH RFC v3 7/9] arm64: boot: dts: qcom: Use phandles for thermal_zones MIME-Version: 1.0 Message-ID: <20240521-board-ids-v3-7-e6c71d05f4d2@quicinc.com> References: <20240521-board-ids-v3-0-e6c71d05f4d2@quicinc.com> In-Reply-To: <20240521-board-ids-v3-0-e6c71d05f4d2@quicinc.com> To: Rob Herring , Frank Rowand , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Amrit Anand , Peter Griffin , Caleb Connolly , "Andy Gross" , Konrad Dybcio , "Doug Anderson" , Simon Glass , "Chen-Yu Tsai" , Julius Werner , "Humphreys, Jonathan" , Sumit Garg , "Jon Hunter" , Michal Simek , , , , , , Elliot Berman X-Mailer: b4 0.13.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: O8l3yje1EKD7HghNyRUlYyv4bHgIydEY X-Proofpoint-ORIG-GUID: O8l3yje1EKD7HghNyRUlYyv4bHgIydEY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-21_11,2024-05-21_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 bulkscore=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=820 clxscore=1015 priorityscore=1501 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405210140 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240521_113841_782938_302D23EE X-CRM114-Status: GOOD ( 13.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for converting sm8550 to use devicetree overlays, use phandles for thermal_zones. Signed-off-by: Elliot Berman --- arch/arm64/boot/dts/qcom/pm8010.dtsi | 62 ++++++++-------- arch/arm64/boot/dts/qcom/pm8550.dtsi | 32 ++++---- arch/arm64/boot/dts/qcom/pm8550b.dtsi | 36 +++++---- arch/arm64/boot/dts/qcom/pm8550ve.dtsi | 38 +++++----- arch/arm64/boot/dts/qcom/pm8550vs.dtsi | 128 ++++++++++++++++---------------- arch/arm64/boot/dts/qcom/pmr735d_a.dtsi | 38 +++++----- arch/arm64/boot/dts/qcom/pmr735d_b.dtsi | 38 +++++----- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 +- 9 files changed, 181 insertions(+), 195 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/pm8010.dtsi b/arch/arm64/boot/dts/qcom/pm8010.dtsi index 0ea641e12209..a889df2f2f25 100644 --- a/arch/arm64/boot/dts/qcom/pm8010.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8010.dtsi @@ -6,47 +6,45 @@ #include #include -/ { - thermal-zones { - pm8010-m-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; +&thermal_zones { + pm8010-m-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; - thermal-sensors = <&pm8010_m_temp_alarm>; + thermal-sensors = <&pm8010_m_temp_alarm>; - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; + }; - pm8010-n-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; + pm8010-n-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; - thermal-sensors = <&pm8010_n_temp_alarm>; + thermal-sensors = <&pm8010_n_temp_alarm>; - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550.dtsi b/arch/arm64/boot/dts/qcom/pm8550.dtsi index 797a18c249a4..cb5e70b28445 100644 --- a/arch/arm64/boot/dts/qcom/pm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550.dtsi @@ -6,26 +6,24 @@ #include #include -/ { - thermal-zones { - pm8550-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; +&thermal_zones { + pm8550-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; - thermal-sensors = <&pm8550_temp_alarm>; + thermal-sensors = <&pm8550_temp_alarm>; - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550b.dtsi b/arch/arm64/boot/dts/qcom/pm8550b.dtsi index 72609f31c890..b3cfa030679a 100644 --- a/arch/arm64/boot/dts/qcom/pm8550b.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550b.dtsi @@ -6,26 +6,24 @@ #include #include -/ { - thermal-zones { - pm8550b-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; - - thermal-sensors = <&pm8550b_temp_alarm>; - - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; +&thermal_zones { + pm8550b-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; + + thermal-sensors = <&pm8550b_temp_alarm>; + + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550ve.dtsi b/arch/arm64/boot/dts/qcom/pm8550ve.dtsi index 4dc1f03ab2c7..8ef57a51b5cd 100644 --- a/arch/arm64/boot/dts/qcom/pm8550ve.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550ve.dtsi @@ -6,26 +6,24 @@ #include #include -/ { - thermal-zones { - pm8550ve-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; - - thermal-sensors = <&pm8550ve_temp_alarm>; - - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; - - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; +&thermal_zones { + pm8550ve-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; + + thermal-sensors = <&pm8550ve_temp_alarm>; + + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; + + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550vs.dtsi b/arch/arm64/boot/dts/qcom/pm8550vs.dtsi index 97b1c18aa7d8..258526abcc21 100644 --- a/arch/arm64/boot/dts/qcom/pm8550vs.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550vs.dtsi @@ -6,89 +6,87 @@ #include #include -/ { - thermal-zones { - pm8550vs-c-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; - - thermal-sensors = <&pm8550vs_c_temp_alarm>; - - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; - - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; +&thermal_zones { + pm8550vs-c-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; + + thermal-sensors = <&pm8550vs_c_temp_alarm>; + + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; + + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; + }; - pm8550vs-d-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; + pm8550vs-d-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; - thermal-sensors = <&pm8550vs_d_temp_alarm>; + thermal-sensors = <&pm8550vs_d_temp_alarm>; - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; + }; - pm8550vs-e-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; + pm8550vs-e-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; - thermal-sensors = <&pm8550vs_e_temp_alarm>; + thermal-sensors = <&pm8550vs_e_temp_alarm>; - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; + }; - pm8550vs-g-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; + pm8550vs-g-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; - thermal-sensors = <&pm8550vs_g_temp_alarm>; + thermal-sensors = <&pm8550vs_g_temp_alarm>; - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi b/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi index 37daaefe3431..251a16424d84 100644 --- a/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi +++ b/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi @@ -6,26 +6,24 @@ #include #include -/ { - thermal-zones { - pmr735d-k-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; - - thermal-sensors = <&pmr735d_k_temp_alarm>; - - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; - - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; +&thermal_zones { + pmr735d-k-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; + + thermal-sensors = <&pmr735d_k_temp_alarm>; + + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; + + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi b/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi index 3b470f6ac46f..dbcfeb53d8ec 100644 --- a/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi +++ b/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi @@ -6,26 +6,24 @@ #include #include -/ { - thermal-zones { - pmr735d-l-thermal { - polling-delay-passive = <100>; - polling-delay = <0>; - - thermal-sensors = <&pmr735d_l_temp_alarm>; - - trips { - trip0 { - temperature = <95000>; - hysteresis = <0>; - type = "passive"; - }; - - trip1 { - temperature = <115000>; - hysteresis = <0>; - type = "hot"; - }; +&thermal_zones { + pmr735d-l-thermal { + polling-delay-passive = <100>; + polling-delay = <0>; + + thermal-sensors = <&pmr735d_l_temp_alarm>; + + trips { + trip0 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; + + trip1 { + temperature = <115000>; + hysteresis = <0>; + type = "hot"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index ee1ba5a8c8fc..c68e08747b6f 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -4452,7 +4452,7 @@ compute-cb@8 { }; }; - thermal-zones { + thermal_zones: thermal-zones { aoss0-thermal { polling-delay-passive = <0>; polling-delay = <0>; diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi index 2df77123a8c7..32198bf3cf7c 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -5030,7 +5030,7 @@ compute-cb@8 { }; }; - thermal-zones { + thermal_zones: thermal-zones { aoss0-thermal { polling-delay-passive = <0>; polling-delay = <0>;