From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Gregory Clement <gregory.clement@free-electrons.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 11/15] ARM: dts: kirkwood: set default pinctrl for NAND
Date: Wed, 30 Apr 2014 14:56:38 +0200 [thread overview]
Message-ID: <1398862602-29595-12-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1398862602-29595-1-git-send-email-sebastian.hesselbarth@gmail.com>
There is only one valid pinctrl setting for NAND on Kirkwood. Now that we
have the setting in the common SoC pinctrl, move it to the NAND controller
node directly and remove it from the individual boards.
While at it, also fix up status = "okay" to "ok" on one board's NAND node.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
arch/arm/boot/dts/kirkwood-db.dtsi | 2 --
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 2 --
arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 --
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 +---
arch/arm/boot/dts/kirkwood-laplug.dts | 1 -
arch/arm/boot/dts/kirkwood-mplcec4.dts | 2 --
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 --
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 --
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 2 --
arch/arm/boot/dts/kirkwood-topkick.dts | 2 --
arch/arm/boot/dts/kirkwood.dtsi | 2 ++
11 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 2790f46d87e0..812df691ae3d 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -57,8 +57,6 @@
};
&nand {
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
chip-delay = <25>;
status = "okay";
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index bcc6e0f48571..113dcf056dcf 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -183,8 +183,6 @@
};
&nand {
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
status = "okay";
chip-delay = <35>;
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 6804638eb87e..bfa5edde179c 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -105,8 +105,6 @@
&nand {
status = "okay";
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
partition@0 {
label = "u-boot";
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index db14bd03b86b..61139bf30985 100644
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -46,9 +46,7 @@
};
&nand {
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
- status = "ok";
+ status = "okay";
chip-delay = <25>;
};
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 4c91fbb084c5..642755acf2fe 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -138,7 +138,6 @@
&nand {
/* Total size : 512MB */
status = "okay";
- pinctrl-0 = <&pmx_nand>;
partition@0 {
label = "u-boot";
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 79796c8b9c4f..f3a991837515 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -162,8 +162,6 @@
};
&nand {
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
status = "okay";
partition@0 {
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 1e056b3b1817..00c2e5a9d863 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -130,8 +130,6 @@
&nand {
chip-delay = <25>;
status = "okay";
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
partition@0 {
label = "uboot";
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 07f6bf6aba91..bc07aa5e6698 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -148,8 +148,6 @@
&nand {
chip-delay = <25>;
status = "okay";
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
partition@0 {
label = "uboot";
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index e2c43aecc7b2..7196c7f3e109 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -71,8 +71,6 @@
};
&nand {
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
status = "okay";
partition@0 {
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 14b12189d464..a4dd47acf98a 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -174,8 +174,6 @@
&nand {
status = "okay";
- pinctrl-0 = <&pmx_nand>;
- pinctrl-names = "default";
partition@0 {
label = "u-boot";
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 0c8d8fa29926..caafcde88f67 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -61,6 +61,8 @@
chip-delay = <25>;
/* set partition map and/or chip-delay in board dts */
clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_nand>;
+ pinctrl-names = "default";
status = "disabled";
};
};
--
1.9.1
next prev parent reply other threads:[~2014-04-30 12:56 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes Sebastian Hesselbarth
[not found] ` <1398862602-29595-2-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-05-05 0:46 ` Jason Cooper
2014-05-05 22:20 ` Adam Baker
2014-04-30 12:56 ` [PATCH 02/15] ARM: dts: kirkwood: add node labels Sebastian Hesselbarth
[not found] ` <1398862602-29595-3-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-05-05 0:56 ` Jason Cooper
2014-04-30 12:56 ` [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards Sebastian Hesselbarth
[not found] ` <1398862602-29595-4-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-30 16:38 ` Andrew Lunn
[not found] ` <20140430163807.GA3082-g2DYL2Zd6BY@public.gmane.org>
2014-04-30 19:47 ` Sebastian Hesselbarth
[not found] ` <53615342.8010600-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-30 20:21 ` Andrew Lunn
[not found] ` <20140430202130.GE3082-g2DYL2Zd6BY@public.gmane.org>
2014-04-30 20:30 ` Arnd Bergmann
2014-05-01 7:30 ` Andrew Lunn
2014-04-30 12:56 ` [PATCH 04/15] ARM: dts: kirkwood: remove clock-frequency properties from UART nodes Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 05/15] ARM: dts: kirkwood: rename pin-controller nodes Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 06/15] ARM: dts: kirkwood: add pinctrl node to common SoC include Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings Sebastian Hesselbarth
2014-04-30 16:42 ` Jason Gunthorpe
[not found] ` <20140430164236.GC12944-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2014-04-30 16:44 ` Andrew Lunn
2014-04-30 19:39 ` Sebastian Hesselbarth
[not found] ` <5361517D.8000106-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-30 19:44 ` Jason Gunthorpe
[not found] ` <20140430194437.GB17365-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2014-04-30 19:54 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 08/15] ARM: dts: kirkwood: set default pinctrl for GBE1 Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 09/15] ARM: dts: kirkwood: set default pinctrl for UART0/1 Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 10/15] ARM: dts: kirkwood: set default pinctrl for SPI0 Sebastian Hesselbarth
2014-04-30 12:56 ` Sebastian Hesselbarth [this message]
2014-04-30 12:56 ` [PATCH 12/15] ARM: dts: kirkwood: set default pinctrl for I2C0 Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 13/15] ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282 Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 14/15] ARM: dts: kirkwood: set Guruplug ethernet PHY compatible Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 15/15] ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id Sebastian Hesselbarth
[not found] ` <1398862602-29595-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-30 16:49 ` [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Andrew Lunn
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=1398862602-29595-12-git-send-email-sebastian.hesselbarth@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gregory.clement@free-electrons.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@free-electrons.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).