From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/14] ARM: berlin: prepare simple-mfd/syscon conversion of sys/chip ctrl nodes
Date: Sat, 16 May 2015 02:23:31 +0200 [thread overview]
Message-ID: <1431735823-28006-3-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1431735823-28006-1-git-send-email-sebastian.hesselbarth@gmail.com>
From: Antoine Tenart <antoine.tenart@free-electrons.com>
The chip and system controller nodes will be handled by simple-mfd based
driver probing. Prepare the conversion by adding "simple-mfd" and "syscon"
compatibles to the corresponding nodes.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
arch/arm/boot/dts/berlin2.dtsi | 4 ++--
arch/arm/boot/dts/berlin2cd.dtsi | 4 ++--
arch/arm/boot/dts/berlin2q.dtsi | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index 63d00a63cfa6..245527abb77c 100644
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -351,7 +351,7 @@
};
chip: chip-control at ea0000 {
- compatible = "marvell,berlin2-chip-ctrl";
+ compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon";
#clock-cells = <1>;
#reset-cells = <2>;
reg = <0xea0000 0x400>;
@@ -442,7 +442,7 @@
};
sysctrl: system-controller at d000 {
- compatible = "marvell,berlin2-system-ctrl";
+ compatible = "marvell,berlin2-system-ctrl", "simple-mfd", "syscon";
reg = <0xd000 0x100>;
uart0_pmux: uart0-pmux {
diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 81b670ac494a..cccc23b45a26 100644
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -295,7 +295,7 @@
};
chip: chip-control at ea0000 {
- compatible = "marvell,berlin2cd-chip-ctrl";
+ compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon";
#clock-cells = <1>;
#reset-cells = <2>;
reg = <0xea0000 0x400>;
@@ -389,7 +389,7 @@
};
sysctrl: system-controller at d000 {
- compatible = "marvell,berlin2cd-system-ctrl";
+ compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon";
reg = <0xd000 0x100>;
};
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index be5397288d24..a515b54bb3e5 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -360,7 +360,7 @@
};
chip: chip-control at ea0000 {
- compatible = "marvell,berlin2q-chip-ctrl";
+ compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon";
#clock-cells = <1>;
#reset-cells = <2>;
reg = <0xea0000 0x400>, <0xdd0170 0x10>;
@@ -526,7 +526,7 @@
};
sysctrl: pin-controller at d000 {
- compatible = "marvell,berlin2q-system-ctrl";
+ compatible = "marvell,berlin2q-system-ctrl", "simple-mfd", "syscon";
reg = <0xd000 0x100>;
uart0_pmux: uart0-pmux {
--
2.1.0
next prev parent reply other threads:[~2015-05-16 0:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-16 0:23 [PATCH 00/14] ARM: berlin: bisect compatible simple-mfd conversion Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 01/14] ARM: berlin: select MFD_SYSCON by default Sebastian Hesselbarth
2015-05-16 0:23 ` Sebastian Hesselbarth [this message]
2015-05-16 0:23 ` [PATCH 03/14] reset: berlin: convert to a platform driver Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 04/14] ARM: berlin: move reset to simple-mfd nodes Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 05/14] reset: berlin: drop arch_initcall initialization Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 06/14] pinctrl: berlin: prepare to use regmap provided by syscon Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 07/14] ARM: berlin: move pinctrl to simple-mfd nodes Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 08/14] pinctrl: berlin: drop SoC stub provided regmap Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 09/14] clk: berlin: prepare simple-mfd conversion Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 10/14] ARM: berlin: move BG2 clock node Sebastian Hesselbarth
2015-06-04 18:56 ` Stephen Boyd
2015-05-16 0:23 ` [PATCH 11/14] ARM: berlin: move BG2CD " Sebastian Hesselbarth
2015-06-04 18:56 ` Stephen Boyd
2015-05-16 0:23 ` [PATCH 12/14] ARM: berlin: move BG2Q " Sebastian Hesselbarth
2015-06-04 18:56 ` Stephen Boyd
2015-05-16 0:23 ` [PATCH 13/14] clk: berlin: drop direct of_iomap of nodes reg property Sebastian Hesselbarth
2015-05-16 0:23 ` [PATCH 14/14] ARM: berlin: remove useless chip and system ctrl compatibles Sebastian Hesselbarth
2015-05-16 7:39 ` [PATCH 00/14] ARM: berlin: bisect compatible simple-mfd conversion Arnd Bergmann
2015-05-20 15:25 ` Arnd Bergmann
2015-05-20 15:37 ` Sebastian Hesselbarth
2015-05-20 15:51 ` Arnd Bergmann
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=1431735823-28006-3-git-send-email-sebastian.hesselbarth@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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).