From: Krzysztof Kozlowski <krzk@kernel.org>
To: Rob Herring <robh+dt@kernel.org>, Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
"Denis GNUtoo Carikli" <GNUtoo@cyberdimension.org>,
Simon Shields <simon@lineageos.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Sylwester Nawrocki <snawrocki@kernel.org>
Subject: [PATCH 27/33] ARM: dts: exynos: Override thermal by label in Exynos4412 Odroids
Date: Sun, 30 Aug 2020 15:51:54 +0200 [thread overview]
Message-ID: <20200830135200.24304-27-krzk@kernel.org> (raw)
In-Reply-To: <20200830135200.24304-1-krzk@kernel.org>
Using full paths to extend or override a device tree node is error prone
since if there was a typo error, a new node will be created instead of
extending the node as it was desired. This will lead to run-time errors
that could be hard to detect.
A mistyped label on the other hand, will cause a dtc compile error
(during build time).
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
.../boot/dts/exynos4412-odroid-common.dtsi | 34 ++++++--------
arch/arm/boot/dts/exynos4412-odroidu3.dts | 46 +++++++++----------
2 files changed, 36 insertions(+), 44 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 6d3576e21ffa..ca3c78e0966c 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -66,25 +66,6 @@
clock-frequency = <24000000>;
};
};
-
- thermal-zones {
- cpu_thermal: cpu-thermal {
- cooling-maps {
- cooling_map0: map0 {
- /* Corresponds to 800MHz at freq_table */
- cooling-device = <&cpu0 7 7>, <&cpu1 7 7>,
- <&cpu2 7 7>, <&cpu3 7 7>;
- };
- cooling_map1: map1 {
- /* Corresponds to 200MHz at freq_table */
- cooling-device = <&cpu0 13 13>,
- <&cpu1 13 13>,
- <&cpu2 13 13>,
- <&cpu3 13 13>;
- };
- };
- };
- };
};
&bus_dmc {
@@ -172,6 +153,21 @@
};
};
+&cpu_thermal {
+ cooling-maps {
+ cooling_map0: map0 {
+ /* Corresponds to 800MHz at freq_table */
+ cooling-device = <&cpu0 7 7>, <&cpu1 7 7>,
+ <&cpu2 7 7>, <&cpu3 7 7>;
+ };
+ cooling_map1: map1 {
+ /* Corresponds to 200MHz at freq_table */
+ cooling-device = <&cpu0 13 13>, <&cpu1 13 13>,
+ <&cpu2 13 13>, <&cpu3 13 13>;
+ };
+ };
+};
+
&pinctrl_1 {
gpio_power_key: power_key {
samsung,pins = "gpx1-3";
diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
index 8ff243ba4542..b8549d846f86 100644
--- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
@@ -37,31 +37,6 @@
#cooling-cells = <2>;
cooling-levels = <0 102 170 230>;
};
-
- thermal-zones {
- cpu_thermal: cpu-thermal {
- cooling-maps {
- map0 {
- trip = <&cpu_alert1>;
- cooling-device = <&cpu0 9 9>, <&cpu1 9 9>,
- <&cpu2 9 9>, <&cpu3 9 9>,
- <&fan0 1 2>;
- };
- map1 {
- trip = <&cpu_alert2>;
- cooling-device = <&cpu0 15 15>,
- <&cpu1 15 15>,
- <&cpu2 15 15>,
- <&cpu3 15 15>,
- <&fan0 2 3>;
- };
- map2 {
- trip = <&cpu_alert0>;
- cooling-device = <&fan0 0 1>;
- };
- };
- };
- };
};
&adc {
@@ -76,6 +51,27 @@
regulator-max-microvolt = <3300000>;
};
+&cpu_thermal {
+ cooling-maps {
+ map0 {
+ trip = <&cpu_alert1>;
+ cooling-device = <&cpu0 9 9>, <&cpu1 9 9>,
+ <&cpu2 9 9>, <&cpu3 9 9>,
+ <&fan0 1 2>;
+ };
+ map1 {
+ trip = <&cpu_alert2>;
+ cooling-device = <&cpu0 15 15>, <&cpu1 15 15>,
+ <&cpu2 15 15>, <&cpu3 15 15>,
+ <&fan0 2 3>;
+ };
+ map2 {
+ trip = <&cpu_alert0>;
+ cooling-device = <&fan0 0 1>;
+ };
+ };
+};
+
&hdmicec {
needs-hpd;
};
--
2.17.1
next prev parent reply other threads:[~2020-08-30 14:04 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-30 13:51 [PATCH 01/33] ARM: dts: exynos: Silence i2c-gpio dtschema warning in Galaxy I9100 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 02/33] ARM: dts: exynos: Correct GPU regulator properties " Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 03/33] ARM: dts: exynos: Correct S3C RTC bindings and enable it " Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 04/33] ARM: dts: exynos: Correct S3C RTC bindings and enable it in Origen Krzysztof Kozlowski
2020-08-31 9:49 ` Marek Szyprowski
2020-08-30 13:51 ` [PATCH 05/33] ARM: dts: exynos: Correct S3C RTC bindings and enable it in Trats Krzysztof Kozlowski
2020-08-31 9:49 ` Marek Szyprowski
2020-08-30 13:51 ` [PATCH 06/33] ARM: dts: exynos: Correct S3C RTC bindings and enable it in Universal C210 Krzysztof Kozlowski
2020-08-31 9:49 ` Marek Szyprowski
2020-08-30 13:51 ` [PATCH 07/33] ARM: dts: exynos: Correct S3C RTC bindings in SMDKv310 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 08/33] ARM: dts: exynos: Add and enable 32 kHz modem clock in Galaxy I9100 Krzysztof Kozlowski
2020-09-02 15:41 ` Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 09/33] ARM: dts: exynos: Add and enable 32 kHz modem clock in Origen Krzysztof Kozlowski
2020-08-31 9:16 ` Marek Szyprowski
2020-08-31 9:37 ` Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 10/33] ARM: dts: exynos: Add and enable 32 kHz modem clock in Trats Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 11/33] ARM: dts: exynos: Remove empty camera pinctrl configuration " Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 12/33] ARM: dts: exynos: Remove empty camera pinctrl configuration in Universal C210 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 13/33] ARM: dts: exynos: Align SPI GPIO node name with dtschema " Krzysztof Kozlowski
2020-08-30 13:51 ` [RFT 14/33] ARM: dts: exynos: Replace deprecated GPIO spi-gpio properties " Krzysztof Kozlowski
2020-08-31 9:25 ` Marek Szyprowski
2020-08-30 13:51 ` [PATCH 15/33] ARM: dts: exynos: Align SPI GPIO node name with dtschema in Galaxy I9100 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 16/33] ARM: dts: exynos: Override thermal by label in Exynos4210 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 17/33] ARM: dts: exynos: Override thermal by label in Galaxy I9000 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 18/33] ARM: dts: exynos: Override thermal by label in Trats Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 19/33] ARM: dts: exynos: Add CPU cooling in Origen Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 20/33] ARM: dts: exynos: Add CPU cooling in SMDKv310 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 21/33] ARM: dts: exynos: Add CPU cooling in Universal C210 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 22/33] ARM: dts: exynos: Align MHL GPIO pin configuration with dtschema on Galaxy I9100 Krzysztof Kozlowski
2020-09-02 15:45 ` Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 23/33] ARM: dts: exynos: Remove empty camera pinctrl configuration in Odroid X/U3 Krzysztof Kozlowski
2020-08-31 8:31 ` Marek Szyprowski
2020-08-31 8:38 ` Krzysztof Kozlowski
2020-08-31 8:44 ` Marek Szyprowski
2020-08-31 10:35 ` Sylwester Nawrocki
2020-08-31 10:42 ` Krzysztof Kozlowski
2020-08-31 13:57 ` Sylwester Nawrocki
2020-08-31 13:59 ` Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 24/33] ARM: dts: exynos: Correct compatible of fixed clocks in Midas boards Krzysztof Kozlowski
2020-09-02 15:48 ` Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 25/33] ARM: dts: exynos: Add S5M8767 clocks for RTC in Exynos4412 Origen Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 26/33] ARM: dts: exynos: Override thermal by label in Midas Krzysztof Kozlowski
2020-08-30 13:51 ` Krzysztof Kozlowski [this message]
2020-08-30 13:51 ` [PATCH 28/33] ARM: dts: exynos: Add CPU cooling in Exynos4412 Origen Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 29/33] ARM: dts: exynos: Add CPU cooling in SMDK4412 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 30/33] ARM: dts: exynos: Add CPU cooling in Tiny4412 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 31/33] ARM: dts: exynos: Correct S3C RTC bindings in SMDK4412 Krzysztof Kozlowski
2020-08-30 13:51 ` [PATCH 32/33] ARM: dts: exynos: Correct S3C RTC bindings in Tiny4412 Krzysztof Kozlowski
2020-08-30 13:52 ` [PATCH 33/33] ARM: dts: exynos: Correct whitespace and indentation issues Krzysztof Kozlowski
2020-09-02 15:38 ` [PATCH 01/33] ARM: dts: exynos: Silence i2c-gpio dtschema warning in Galaxy I9100 Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200830135200.24304-27-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=GNUtoo@cyberdimension.org \
--cc=b.zolnierkie@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robh+dt@kernel.org \
--cc=simon@lineageos.org \
--cc=snawrocki@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).