Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4475536ybz; Tue, 21 Apr 2020 01:03:26 -0700 (PDT) X-Google-Smtp-Source: APiQypIHpoU8BArm9M47fK8ucStTgzQHZC8SESnxASMsmhScIpc37vPrdcOjGoCdbmIGkO51cFHV X-Received: by 2002:a50:9f23:: with SMTP id b32mr16646673edf.183.1587456206084; Tue, 21 Apr 2020 01:03:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587456206; cv=none; d=google.com; s=arc-20160816; b=sorlEA7GeYZkBo4PewwrYPTBdztip5e8QN7VY/BOfPHmne/mEWhWK0nc49S7Vx6KKe QHaZ61fjdnJvOtkgOKCsg0FS0+5ZfPfmPSf/0C18lrL8A7h8LnQe7KTb/v/HAiL+5RhY aJmzNnperE4qjDuPzjI7zjL/hqpHagqrckG8DMtw0tE39mmxnRKmm4zpxtw73+xeePrR ivZKti4cGs9skpx2Q8xSf3h0bPhcJ0632CYBpcURuZfdkoCCVozvUZNJyRfuLB1Ii42T AAaCD6uFHCKBWe+qota1IC6FtYHyyXbT+N45YLIL3Ls4AYuGKKjcL/YmhQmg8EtWpKUU 764w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PW/4clGD+cpV/fhovnrun++NoVB5+LjULUtHoJY62Ro=; b=sdqUiPdd0WWUhvxtuacj32ycWw7+Rww13u1A5wiuXSNCTA9eplXc5hxPSF9HhUYcYn fADCFvklRESKw/4V+lffVaqVf4Z/DEY8EGmZMQ/pEakPcwdKrPfRFAFh1hQwA6MPtP+l 5WSbw4Rjm1nb39Sf4yY1nV+OJ2hhsAy+wbE4KmVBbeKspAnSfkxKdSbdBbPZMZfGI1H3 lm2eh74F+zX2nMU5S+IIqQZFhKWUQsPwOAtLQliPDzH5qqiDh/LwEaeqCxhYIkDHPfJb 8PO+rKGPlG+yGiEEhsCkhh+dZvrZx7wbMvhrsffNEmMDtwXeRGcK86yJb9tbYeDn9Xyl m2iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Md9y6ssM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c2si1060217ejf.471.2020.04.21.01.03.00; Tue, 21 Apr 2020 01:03:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Md9y6ssM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728316AbgDUIBT (ORCPT + 99 others); Tue, 21 Apr 2020 04:01:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728290AbgDUIBR (ORCPT ); Tue, 21 Apr 2020 04:01:17 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DD36C0610D6 for ; Tue, 21 Apr 2020 01:01:17 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id u13so15339739wrp.3 for ; Tue, 21 Apr 2020 01:01:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PW/4clGD+cpV/fhovnrun++NoVB5+LjULUtHoJY62Ro=; b=Md9y6ssMrmxnRFOzwDtyc3RnxZm3nSdhd7K9l4xzl4/VWbFceYuflIerAN7he2TWFR oNTsfEn2Q6Xkb3ecjkbJckzrNkaSGdUuulC6mufGJ0jAlNBQOajgMkfnBBYE58ikB4r1 ISX+etHAS7QP2Uc9I/db4Odza0EoQwgn5DeeShK/I0SQKdFqU3zsuRnlUXGV2Cj/sSeC ei2xrxhha8RcR2Fu5PDtUnOPbzmaKYNFRcNmSArTvonErYUEP4N0gFApNgUGVf+xoAki c/Wi3kdy5iDqG9ZoiKx3UYAhlH7T0vOITbplT1K4cn1POCpdoRtyeeZFvedC054JqDc/ gDQA== 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=PW/4clGD+cpV/fhovnrun++NoVB5+LjULUtHoJY62Ro=; b=g+b106olaHWVuZfSKmTepuvsCD+pYvdcyM5aBPI3je4KKT8MYOxrUmN6Bcpp1FqNjK JCvsB5p0cN2fzmnC+w6BBrLDHa0HnNNzlg0nxlbXuk7NdC+uZN/Ip8zL8G9Pzzz+4VE9 jE0EHEFcB+OFHBZD7AZGh3kp0BorRYnNYYKLNPSYAPPrbuVSg6a1yigMEpFxTKsqYZ8z X92U2DSpYNUnUCkkfy44WXUbQQ1PaaIoIS4krmutYM2pRrz+S29XSRsX/Xosfcneqf5S n9SAXyADKNaRRX1ATU8RFwjtzws0sW2zrgVZbLMe8zkxqvv8s/7WsgWTnn1bvFe/D3Ke NSBw== X-Gm-Message-State: AGi0PubzvV9c8Z1aI1X8anOVaSKxbDR0bBo6rmEjSh3BRMiQlUfXn1wg 8hbfVjNre3mH23GbIxe9ntK6MQ== X-Received: by 2002:a5d:4a4b:: with SMTP id v11mr21989927wrs.32.1587456075927; Tue, 21 Apr 2020 01:01:15 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:2ec0:82b0:39cc:a07:8b48:cc56]) by smtp.gmail.com with ESMTPSA id x132sm2561552wmg.33.2020.04.21.01.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 01:01:15 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Cc: nick@khadas.com, art@khadas.com, Neil Armstrong , linux-amlogic@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC 6/8] arm64: dts: meson-g12b: move G12B thermal nodes to meson-g12b.dtsi Date: Tue, 21 Apr 2020 10:01:00 +0200 Message-Id: <20200421080102.22796-7-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20200421080102.22796-1-narmstrong@baylibre.com> References: <20200421080102.22796-1-narmstrong@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The G12B thermal nodes should be in the meson-g12b.dtsi file. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 23 --------------------- arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 22 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi index 783e5a397f86..e932205badea 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi @@ -355,29 +355,6 @@ }; }; -&cpu_thermal { - cooling-maps { - map0 { - trip = <&cpu_passive>; - cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - map1 { - trip = <&cpu_hot>; - cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - ðmac { power-domains = <&pwrc PWRC_G12A_ETH_ID>; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi index 6dbc3968045b..9b8548e5f6e5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi @@ -113,3 +113,25 @@ compatible = "amlogic,g12b-clkc"; }; +&cpu_thermal { + cooling-maps { + map0 { + trip = <&cpu_passive>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + map1 { + trip = <&cpu_hot>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; +}; -- 2.22.0