From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Gregory Clement <gregory.clement@bootlin.com>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, linux-pm@vger.kernel.org,
Antoine Tenart <antoine.tenart@bootlin.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Nadav Haklai <nadavh@marvell.com>,
David Sniatkiwicz <davidsn@marvell.com>,
Rob Herring <robh+dt@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 22/27] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon
Date: Sat, 21 Apr 2018 17:12:50 +0200 [thread overview]
Message-ID: <20180421151255.29929-23-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20180421151255.29929-1-miquel.raynal@bootlin.com>
New bindings impose to declare the thermal IP from within a new syscon.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 11 +++++++----
arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 15 +++++++++------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 71208aba4468..b173d21f2216 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -266,10 +266,13 @@
};
};
- ap_thermal: thermal@6f808c {
- compatible = "marvell,armada-ap806-thermal";
- reg = <0x6f808c 0x4>,
- <0x6f8084 0x8>;
+ ap_syscon1: system-controller@6f8000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x6f8000 0x1000>;
+
+ ap_thermal: ap-thermal {
+ compatible = "marvell,armada-ap806-thermal";
+ };
};
};
};
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index 8e989c721b4c..514780980847 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -170,12 +170,6 @@
interrupts = <77 IRQ_TYPE_LEVEL_HIGH>;
};
- CP110_LABEL(thermal): thermal@400078 {
- compatible = "marvell,armada-cp110-thermal";
- reg = <0x400078 0x4>,
- <0x400070 0x8>;
- };
-
CP110_LABEL(syscon0): system-controller@440000 {
compatible = "syscon", "simple-mfd";
reg = <0x440000 0x2000>;
@@ -216,6 +210,15 @@
};
};
+ CP110_LABEL(syscon1): system-controller@400000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x400000 0x1000>;
+
+ CP110_LABEL(thermal): thermal@400070 {
+ compatible = "marvell,armada-cp110-thermal";
+ };
+ };
+
CP110_LABEL(usb3_0): usb3@500000 {
compatible = "marvell,armada-8k-xhci",
"generic-xhci";
--
2.14.1
next prev parent reply other threads:[~2018-04-21 15:12 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-21 15:12 [PATCH 00/27] Add multi-channel and overheat IRQ support to Armada thermal driver Miquel Raynal
2018-04-21 15:12 ` [PATCH 01/27] thermal: armada: add a function that sanitizes the thermal zone name Miquel Raynal
2018-04-21 15:12 ` [PATCH 02/27] thermal: armada: remove useless register accesses Miquel Raynal
2018-04-21 15:12 ` [PATCH 03/27] thermal: armada: remove misleading comments Miquel Raynal
2018-04-21 15:12 ` [PATCH 04/27] thermal: armada: rename the initialization routine Miquel Raynal
2018-04-21 15:12 ` [PATCH 05/27] thermal: armada: dissociate a380 and cp110 ->init() hooks Miquel Raynal
2018-04-21 15:12 ` [PATCH 06/27] thermal: armada: average over samples to avoid glitches Miquel Raynal
2018-04-21 15:12 ` [PATCH 07/27] thermal: armada: convert driver to syscon register accesses Miquel Raynal
2018-04-21 15:12 ` [PATCH 08/27] thermal: armada: use the resource managed registration helper alternative Miquel Raynal
2018-04-21 15:12 ` [PATCH 09/27] thermal: armada: add multi-channel sensors support Miquel Raynal
2018-04-21 15:12 ` [PATCH 10/27] thermal: armada: remove sensors validity from the IP initialization Miquel Raynal
2018-04-21 15:12 ` [PATCH 11/27] thermal: armada: move validity check out of the read function Miquel Raynal
2018-04-21 15:12 ` [PATCH 12/27] thermal: armada: get rid of the ->is_valid() pointer Miquel Raynal
2018-04-21 15:12 ` [PATCH 13/27] thermal: armada: add overheat interrupt support Miquel Raynal
2018-04-21 15:12 ` [PATCH 14/27] dt-bindings: cp110: rename cp110 syscon file Miquel Raynal
2018-04-27 20:51 ` Rob Herring
2018-04-21 15:12 ` [PATCH 15/27] dt-bindings: ap806: prepare the syscon file to list other syscons nodes Miquel Raynal
2018-04-21 15:12 ` [PATCH 16/27] dt-bindings: cp110: " Miquel Raynal
2018-04-27 21:06 ` Rob Herring
2018-04-28 11:20 ` Miquel Raynal
2018-04-21 15:12 ` [PATCH 17/27] dt-bindings: ap806: add the thermal node in the syscon file Miquel Raynal
2018-04-27 21:07 ` Rob Herring
2018-04-28 11:07 ` Miquel Raynal
2018-05-18 9:56 ` Miquel Raynal
2018-04-21 15:12 ` [PATCH 18/27] dt-bindings: cp110: update documentation since DT de-duplication Miquel Raynal
2018-04-27 21:08 ` Rob Herring
2018-04-21 15:12 ` [PATCH 19/27] dt-bindings: cp110: add the thermal node in the syscon file Miquel Raynal
2018-04-21 15:12 ` [PATCH 20/27] dt-bindings: thermal: armada: add reference to new bindings Miquel Raynal
2018-04-21 15:12 ` [PATCH 21/27] arm64: dts: marvell: rename ap806 syscon node Miquel Raynal
2018-04-21 15:12 ` Miquel Raynal [this message]
2018-04-21 15:12 ` [PATCH 23/27] arm64: dts: marvell: add thermal-zone node in ap806 DTSI file Miquel Raynal
2018-04-21 15:12 ` [PATCH 24/27] arm64: dts: marvell: add macro to make distinction between node names Miquel Raynal
2018-04-21 15:12 ` [PATCH 25/27] arm64: dts: marvell: add thermal-zone node in cp110 DTSI file Miquel Raynal
2018-04-21 15:12 ` [PATCH 26/27] arm64: dts: marvell: add interrupt support to ap806 thermal node Miquel Raynal
2018-04-21 15:12 ` [PATCH 27/27] arm64: dts: marvell: add interrupt support to cp110 " Miquel Raynal
2018-05-16 17:28 ` [PATCH 00/27] Add multi-channel and overheat IRQ support to Armada thermal driver Gregory CLEMENT
2018-05-18 9:49 ` Miquel Raynal
2018-05-21 13:01 ` Zhang Rui
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=20180421151255.29929-23-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=andrew@lunn.ch \
--cc=antoine.tenart@bootlin.com \
--cc=catalin.marinas@arm.com \
--cc=davidsn@marvell.com \
--cc=devicetree@vger.kernel.org \
--cc=edubezval@gmail.com \
--cc=gregory.clement@bootlin.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.chevallier@bootlin.com \
--cc=nadavh@marvell.com \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=will.deacon@arm.com \
/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).