From patchwork Thu Mar 26 16:39:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 6101051 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6743E9F66C for ; Thu, 26 Mar 2015 16:44:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D13A203A4 for ; Thu, 26 Mar 2015 16:44:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A64DE203A0 for ; Thu, 26 Mar 2015 16:44:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbAr6-00044E-43; Thu, 26 Mar 2015 16:42:04 +0000 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbApx-0003QD-A4 for linux-arm-kernel@lists.infradead.org; Thu, 26 Mar 2015 16:40:54 +0000 Received: by padet14 with SMTP id et14so15413063pad.1 for ; Thu, 26 Mar 2015 09:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fLRGdj4IaHQ0FoUG8OfMClCzPUuXBvedZ+WCgzG2Jj0=; b=RX3qYdSNFeqZ3RqphQU/EvTB+IeUJb3yC6JVOTUnv3L4+k+mqHNwYipeAKE3XKqrfR mg7M66Jt6Aqsyuo92O0TtPB/OcpwLE+jFzqy8dNZA8XPoYlfmmFfTP0SCAYH0krWq4DS g0uNrKF2qOz8K3L9t6AQpxulmhY+5oSJqqqD9ejo4BtfppbObgMKkHc9gQu+yrNuki7J yAqM0bl2ROc2pwPOSpVPZLnIucM0WOoSoUrIJNoT2fjNsBjybltYUmPC00HTvY6fTsb7 ovRczBM+CPj8dIN5s62QFz/n7GIF60wFt/UWIhX0W2imfsJzrOpuxrAChTlCJImmZavO HjiA== X-Received: by 10.69.0.106 with SMTP id ax10mr28041006pbd.11.1427388030552; Thu, 26 Mar 2015 09:40:30 -0700 (PDT) Received: from odroidxu3.localdomain ([103.249.89.113]) by mx.google.com with ESMTPSA id k9sm6113468pdp.24.2015.03.26.09.40.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Mar 2015 09:40:30 -0700 (PDT) From: Anand Moon To: Lukasz Majewski , Eduardo Valentin , Sjoerd Simons , Russell King , Kukjin Kim Subject: [PATCH 3/6] ARM:dts exynos5422 Update the thermal sensor for tmu_cpu0 Date: Fri, 27 Mar 2015 03:09:12 +1030 Message-Id: <1427387955-5129-4-git-send-email-linux.amoon@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427387955-5129-1-git-send-email-linux.amoon@gmail.com> References: <1427387955-5129-1-git-send-email-linux.amoon@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150326_094053_444269_332F66C5 X-CRM114-Status: GOOD ( 13.08 ) X-Spam-Score: -0.8 (/) Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-pwm@vger.kernel.org, Anand Moon , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the registration of thermal sensors for tmu_cpu0 from exynos5420.dtsi to exynos5-cpu-thermal.dtsi, to avoid duplicate registration of the sensors. Tested on OdroidXU3 board. Signed-off-by: Anand Moon --- arch/arm/boot/dts/exynos5-cpu-thermal.dtsi | 58 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/exynos5420.dtsi | 4 --- arch/arm/boot/dts/exynos5422-odroidxu3.dts | 1 + 3 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 arch/arm/boot/dts/exynos5-cpu-thermal.dtsi diff --git a/arch/arm/boot/dts/exynos5-cpu-thermal.dtsi b/arch/arm/boot/dts/exynos5-cpu-thermal.dtsi new file mode 100644 index 0000000..8fede70 --- /dev/null +++ b/arch/arm/boot/dts/exynos5-cpu-thermal.dtsi @@ -0,0 +1,58 @@ +/* + * Device tree sources for Exynos5 thermal zone + * + * Copyright (c) 2014 Lukasz Majewski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include + +/ { + thermal-zones { + cpu0_thermal: cpu0-thermal { + thermal-sensors = <&tmu_cpu0>; + polling-delay-passive = <0>; + polling-delay = <0>; + trips { + cpu_alert0: cpu-alert-0 { + temperature = <48000>; /* ms */ + hysteresis = <3000>; /* ms */ + type = "active"; + }; + cpu_alert1: cpu-alert-1 { + temperature = <53000>; /* ms */ + hysteresis = <3000>; /* ms */ + type = "active"; + }; + cpu_alert2: cpu-alert-2 { + temperature = <59000>; /* ms */ + hysteresis = <3000>; /* ms */ + type = "active"; + }; + cpu_crit0: cpu-crit-0 { + temperature = <75000>; /* ms */ + hysteresis = <0>; /* ms */ + type = "critical"; + }; + }; + cooling-maps { + map0 { + trip = <&cpu_alert0>; + cooling-device = <&fan0 0 1>; + }; + map1 { + trip = <&cpu_alert1>; + cooling-device = <&fan0 1 2>; + }; + map2 { + trip = <&cpu_alert2>; + cooling-device = <&fan0 2 3>; + }; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 6b49f3c..eb0f16c 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -827,10 +827,6 @@ }; thermal-zones { - cpu0_thermal: cpu0-thermal { - thermal-sensors = <&tmu_cpu0>; - #include "exynos5420-trip-points.dtsi" - }; cpu1_thermal: cpu1-thermal { thermal-sensors = <&tmu_cpu1>; #include "exynos5420-trip-points.dtsi" diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3.dts b/arch/arm/boot/dts/exynos5422-odroidxu3.dts index eaec006..c8b3e3e 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3.dts +++ b/arch/arm/boot/dts/exynos5422-odroidxu3.dts @@ -12,6 +12,7 @@ /dts-v1/; #include "exynos5800.dtsi" +#include "exynos5-cpu-thermal.dtsi" / { model = "Hardkernel Odroid XU3";