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 10/15] ARM: dts: kirkwood: set default pinctrl for SPI0
Date: Wed, 30 Apr 2014 14:56:37 +0200 [thread overview]
Message-ID: <1398862602-29595-11-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1398862602-29595-1-git-send-email-sebastian.hesselbarth@gmail.com>
Most Kirkwood boards use the default SPI0 pinctrl setting anyway. Add a
default pinctrl setting to the toplevel SoC SPI0 node and put a note
in front of the corresponding pinctrl node to overwrite the setting
on board level.
Currently, only T5325 is using a different setting and already
overwrites the corresponding pinctrl 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-b3.dts | 2 --
arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 --
arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 --
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 --
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 --
arch/arm/boot/dts/kirkwood-rd88f6192.dts | 2 --
arch/arm/boot/dts/kirkwood-synology.dtsi | 2 --
arch/arm/boot/dts/kirkwood-t5325.dts | 6 ------
arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 --
arch/arm/boot/dts/kirkwood.dtsi | 6 ++++++
10 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index 38972b221089..6678e0b318d5 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -70,8 +70,6 @@
spi@10600 {
status = "okay";
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
m25p16@0 {
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 1ac6bd9f54de..e7a232eb28b0 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -37,8 +37,6 @@
};
spi@10600 {
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
status = "okay";
flash@0 {
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index dd8d1a4611a8..af56cecc6c73 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -38,8 +38,6 @@
spi@10600 {
status = "okay";
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
m25p40@0 {
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index acbebc6dc169..b318d5d82d67 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -60,8 +60,6 @@
};
spi@10600 {
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
status = "okay";
flash@0 {
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 696b208b676f..c10ff0f5290b 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -24,8 +24,6 @@
};
spi@10600 {
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
status = "okay";
flash@0 {
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index 30087b19efae..35a29dee8dd8 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -57,8 +57,6 @@
spi@10600 {
status = "okay";
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
m25p128@0 {
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 370af7f69319..a21419f78bee 100644
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -213,8 +213,6 @@
spi@10600 {
status = "okay";
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
m25p80@0 {
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index ae102abcab04..289fc9e2afc2 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -65,10 +65,6 @@
marvell,function = "gpio";
};
- /*
- * Redefined from kirkwood-6281.dtsi, because
- * we don't use SPI CS on MPP0, but on MPP7.
- */
pmx_spi: pmx-spi {
marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7";
marvell,function = "spi";
@@ -87,8 +83,6 @@
};
spi@10600 {
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
status = "okay";
flash@0 {
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 21cb9aeb2455..539a2f80a3ad 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -47,8 +47,6 @@
};
spi@10600 {
status = "okay";
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
m25p128@0 {
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index f92c8c4e3908..0c8d8fa29926 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -88,6 +88,10 @@
marvell,function = "nand";
};
+ /*
+ * Default SPI0 pinctrl setting with CSn on mpp0,
+ * overwrite marvell,pins on board level if required.
+ */
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
@@ -127,6 +131,8 @@
interrupts = <23>;
reg = <0x10600 0x28>;
clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_spi>;
+ pinctrl-names = "default";
status = "disabled";
};
--
1.9.1
next prev parent reply other threads:[~2014-04-30 12:57 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
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
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
2014-04-30 16:38 ` Andrew Lunn
2014-04-30 19:47 ` Sebastian Hesselbarth
2014-04-30 20:21 ` Andrew Lunn
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
2014-04-30 16:44 ` Andrew Lunn
2014-04-30 19:39 ` Sebastian Hesselbarth
2014-04-30 19:44 ` Jason Gunthorpe
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 ` Sebastian Hesselbarth [this message]
2014-04-30 12:56 ` [PATCH 11/15] ARM: dts: kirkwood: set default pinctrl for NAND Sebastian Hesselbarth
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
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-11-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).