Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp2570143ybk; Tue, 12 May 2020 02:43:22 -0700 (PDT) X-Google-Smtp-Source: APiQypJjcIlSHCDMIMxKIJT7AlxIYY+uMD9cJuJ0JrAyH1SZKFafCyhmycbeugZ36Doq1PzCHnGw X-Received: by 2002:a17:907:948d:: with SMTP id dm13mr17633443ejc.138.1589276601807; Tue, 12 May 2020 02:43:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589276601; cv=none; d=google.com; s=arc-20160816; b=ukghCDq/9lDuOeRdtMSgIHeMUMe99AsmA5MhtT8D0GNeJCXHtyDYbW7sirYJhClf3x 8AqLIH7fDm1/8aCP8vpG76wAy/2AaoR4/VuIg6jxop0Q9bGaLnRebFW8zDLVkSbgO8ew cYjVqbfzifIShCiyYXFLlS8HgsHd8m1ylXpyN2V8HoVveRd5jKw9z73CtplOU4l/zm7Z nVsTSGiPeumDHl5nYZOrCz0SZONZ+2j2olR8S3uWLqOm0ouQZSaajX6AQRWIoor/cjs/ DdHi6IuaGBih/gt+tNczHNtD1bKs1zYiXuZE8vNwZt2o3tVAmqru7ZlpKOhxUnrvQx3c 6uqQ== 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=rLSzS4IRRTC22sAo/0YCE5/fM6LeScWipcURZcTuUlk=; b=EoP5EUKIg0C1S2wU4h3pkMTeCGk3EOmGhuXfclP7T97b0cK5Y2uKmKIH5brG081q8R cCe/rkgoyw+T01ZKAD2fFOgAC0Bj3oTQ1nG6P2xk+8puOqbEFxgANKDOXkcnqxBIyerM 06GA/zXqE0h268+d/BI3WagqHveJ3LlLl/O14g6LlfDvCdbiLGByvV99wr4r3npvVta4 fwKj57zjo2d1wd5DHSejM7S4ceQIr+VzYYJV5lJB+sp9UOKjeER1cpFtqkr9dJo1tut+ GtU3y30yc8GHGhCBV5fsLasYFSj3j+HieI8TtJsmzGeUOWRdnx2ZCOABmtaCkZ4HJ90o /0hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=y2B0A32P; 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 i60si2974893edd.0.2020.05.12.02.42.58; Tue, 12 May 2020 02:43:21 -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=y2B0A32P; 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 S1729336AbgELJj0 (ORCPT + 99 others); Tue, 12 May 2020 05:39:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729325AbgELJj0 (ORCPT ); Tue, 12 May 2020 05:39:26 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4F45C061A0C for ; Tue, 12 May 2020 02:39:24 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id e1so569544wrt.5 for ; Tue, 12 May 2020 02:39:24 -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=rLSzS4IRRTC22sAo/0YCE5/fM6LeScWipcURZcTuUlk=; b=y2B0A32PUd58AQ/WKXzX5pDORK4KvHRz/yZKB1FLLnYF9nhSva0hElj+TsiNjT1/ad rRgQu2MmCufUtCt5ve4SnEmVg6CfKQ3CgB5Hd5hTjkjXxX+GAoF73IQw3+ZxSfelF4hd ccjl4Yx1ifiMwE6fQ9rJgZDzVObLxaRmYDm5EgcPk1GtIgKEFQ1NOA0wDFWYqgoiUM2w F2LlkR9n7JihUEFu55Biu16I/OFvF64tB4gqNxBWbjn6J5MJW/OGEAJrZN3chha8BcNE hc78aZ+F4/knVF5E4LWMuPhoPpV5kUBbPfuPorXquIF9+CS8S89lJvEZCXgFd7slT9V6 N61w== 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=rLSzS4IRRTC22sAo/0YCE5/fM6LeScWipcURZcTuUlk=; b=PafV9vg0d+PwhRJqZdnhrWygWHJxfaOqAbvU63g69OcRPZylfgd5je269VISH7JiMY Xth76RRILAdmwd5JsGz9ck9W7SfpczHVJGplm3vSZG5TulyOvZhzmPJERl8L/v6tmyrV lrTBXvmmbCiSZYyJdpTdQuZSSoNNtlr9XGR8XIywkwHTMeTWEyhcFw+JpzdvA0y2r40p Zee3NHUilC7Qndm7/xH7Rrs/fACr5NFoDno9LD9zmHIoyeIs5Ttp09/EMPneQBEdoQsb Hi1cMdn63QkYlgTSmd2yMOoukpZVVc18qmOG5EVDrh4yr3iWwiYpmH/o/1Gzk4Sog9+L YHaw== X-Gm-Message-State: AGi0PuanK2iNKJ6OYdAZTcHCak6DNtcltLFy2LHa/45/tolxWjpFQgdh AdeBoJWQe91GMdfTEAtKRNl8KA== X-Received: by 2002:a5d:6ca7:: with SMTP id a7mr23970573wra.391.1589276363221; Tue, 12 May 2020 02:39:23 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:2ec0:82b0:4460:3fd3:382:4a71]) by smtp.gmail.com with ESMTPSA id 81sm14037092wme.16.2020.05.12.02.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2020 02:39:22 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Cc: linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong Subject: [PATCH 1/2] arm64: dts: meson-g12b: move G12B thermal nodes to meson-g12b.dtsi Date: Tue, 12 May 2020 11:39:15 +0200 Message-Id: <20200512093916.19676-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20200512093916.19676-1-narmstrong@baylibre.com> References: <20200512093916.19676-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. Fixes: 195f140318a9 ("arm64: dts: meson: g12b: add cooling properties") 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