* [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
@ 2014-04-30 12:56 ` 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
` (14 subsequent siblings)
15 siblings, 2 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
Commit 54397d85349f
("ARM: kirkwood: Relocate PCIe device tree nodes")
moved the pcie-controller nodes for the Kirkwood SoCs to the mbus
bus node. For some reason, two boards were not properly converted
and have their pci-controller nodes still in the ocp bus node.
As the corresponding SoC pcie-controller does not exist anymore,
it is likely that pcie is broken on those boards since above commit.
Fix it by moving the pcie related nodes to the correct location.
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-mv88f6281gtw-ge.dts | 18 ++++++++++--------
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 18 ++++++++++--------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 2cb0dc529165..4bf358c28be2 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -30,6 +30,16 @@
bootargs = "console=ttyS0,115200n8 earlyprintk";
};
+ mbus {
+ pcie-controller {
+ status = "okay";
+
+ pcie@1,0 {
+ status = "okay";
+ };
+ };
+ };
+
ocp@f1000000 {
pinctrl@10000 {
pmx_usb_led: pmx-usb-led {
@@ -73,14 +83,6 @@
ehci@50000 {
status = "okay";
};
-
- pcie-controller {
- status = "okay";
-
- pcie@1,0 {
- status = "okay";
- };
- };
};
gpio-leds {
diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
index 843b8b561e5e..b88810df7ca2 100644
--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
@@ -4,6 +4,16 @@
/ {
model = "ZyXEL NSA310";
+ mbus {
+ pcie-controller {
+ status = "okay";
+
+ pcie@1,0 {
+ status = "okay";
+ };
+ };
+ };
+
ocp@f1000000 {
pinctrl: pinctrl@10000 {
@@ -51,14 +61,6 @@
status = "okay";
nr-ports = <2>;
};
-
- pcie-controller {
- status = "okay";
-
- pcie@1,0 {
- status = "okay";
- };
- };
};
gpio_poweroff {
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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
1 sibling, 0 replies; 30+ messages in thread
From: Jason Cooper @ 2014-05-05 0:46 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Andrew Lunn, Gregory Clement, Thomas Petazzoni,
devicetree, linux-arm-kernel, linux-kernel
On Wed, Apr 30, 2014 at 02:56:28PM +0200, Sebastian Hesselbarth wrote:
> Commit 54397d85349f
> ("ARM: kirkwood: Relocate PCIe device tree nodes")
>
> moved the pcie-controller nodes for the Kirkwood SoCs to the mbus
> bus node. For some reason, two boards were not properly converted
> and have their pci-controller nodes still in the ocp bus node.
>
> As the corresponding SoC pcie-controller does not exist anymore,
> it is likely that pcie is broken on those boards since above commit.
> Fix it by moving the pcie related nodes to the correct location.
>
> 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-mv88f6281gtw-ge.dts | 18 ++++++++++--------
> arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 18 ++++++++++--------
> 2 files changed, 20 insertions(+), 16 deletions(-)
Applied to mvebu/dt-fixes with Andrew's Ack and flagged for backporting
to -stable v3.12+
thx,
Jason.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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
1 sibling, 0 replies; 30+ messages in thread
From: Adam Baker @ 2014-05-05 22:20 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Mark Rutland, Andrew Lunn, Russell King, Jason Cooper,
Pawel Moll, Ian Campbell, linux-kernel, devicetree, Rob Herring,
Kumar Gala, Gregory Clement, Thomas Petazzoni, linux-arm-kernel
On 30/04/14 13:56, Sebastian Hesselbarth wrote:
> Commit 54397d85349f
> ("ARM: kirkwood: Relocate PCIe device tree nodes")
>
> moved the pcie-controller nodes for the Kirkwood SoCs to the mbus
> bus node. For some reason, two boards were not properly converted
> and have their pci-controller nodes still in the ocp bus node.
>
> As the corresponding SoC pcie-controller does not exist anymore,
> it is likely that pcie is broken on those boards since above commit.
> Fix it by moving the pcie related nodes to the correct location.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
I've tried this patch on NSA320, as expected it doesn't make any
observable difference as there is nothing connected to the PCIe bus
(hence not really worth a tested by). It matters more on the NSA310 as
that uses PCIe for Ethernet.
Regards
Adam Baker
> ---
> 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-mv88f6281gtw-ge.dts | 18 ++++++++++--------
> arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 18 ++++++++++--------
> 2 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> index 2cb0dc529165..4bf358c28be2 100644
> --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> @@ -30,6 +30,16 @@
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> };
>
> + mbus {
> + pcie-controller {
> + status = "okay";
> +
> + pcie@1,0 {
> + status = "okay";
> + };
> + };
> + };
> +
> ocp@f1000000 {
> pinctrl@10000 {
> pmx_usb_led: pmx-usb-led {
> @@ -73,14 +83,6 @@
> ehci@50000 {
> status = "okay";
> };
> -
> - pcie-controller {
> - status = "okay";
> -
> - pcie@1,0 {
> - status = "okay";
> - };
> - };
> };
>
> gpio-leds {
> diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
> index 843b8b561e5e..b88810df7ca2 100644
> --- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
> @@ -4,6 +4,16 @@
> / {
> model = "ZyXEL NSA310";
>
> + mbus {
> + pcie-controller {
> + status = "okay";
> +
> + pcie@1,0 {
> + status = "okay";
> + };
> + };
> + };
> +
> ocp@f1000000 {
> pinctrl: pinctrl@10000 {
>
> @@ -51,14 +61,6 @@
> status = "okay";
> nr-ports = <2>;
> };
> -
> - pcie-controller {
> - status = "okay";
> -
> - pcie@1,0 {
> - status = "okay";
> - };
> - };
> };
>
> gpio_poweroff {
>
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 02/15] ARM: dts: kirkwood: add node labels
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-04-30 12:56 ` 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
` (13 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
This adds missing node labels to Kirkwood common and SoC specific nodes
to allow to reference them more easily.
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-6192.dtsi | 10 +++++-----
arch/arm/boot/dts/kirkwood-6281.dtsi | 10 +++++-----
arch/arm/boot/dts/kirkwood-6282.dtsi | 16 ++++++++--------
arch/arm/boot/dts/kirkwood.dtsi | 16 ++++++++--------
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index 3916937d6818..294a6fa0208c 100644
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -1,6 +1,6 @@
/ {
mbus {
- pcie-controller {
+ pciec: pcie-controller {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";
@@ -15,7 +15,7 @@
0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;
- pcie@1,0 {
+ pcie0: pcie@1,0 {
device_type = "pci";
assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
reg = <0x0800 0 0 0 0>;
@@ -76,14 +76,14 @@
};
};
- rtc@10300 {
+ rtc: rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};
- sata@80000 {
+ sata: sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
@@ -92,7 +92,7 @@
status = "disabled";
};
- mvsdio@90000 {
+ sdio: mvsdio@90000 {
compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>;
interrupts = <28>;
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index 416d96e1302f..2560cbbdb0b3 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -1,6 +1,6 @@
/ {
mbus {
- pcie-controller {
+ pciec: pcie-controller {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";
@@ -15,7 +15,7 @@
0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;
- pcie@1,0 {
+ pcie0: pcie@1,0 {
device_type = "pci";
assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
reg = <0x0800 0 0 0 0>;
@@ -76,14 +76,14 @@
};
};
- rtc@10300 {
+ rtc: rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};
- sata@80000 {
+ sata: sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
@@ -94,7 +94,7 @@
status = "disabled";
};
- mvsdio@90000 {
+ sdio: mvsdio@90000 {
compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>;
interrupts = <28>;
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 2902e0d7971d..f4b4786b9a01 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -1,6 +1,6 @@
/ {
mbus {
- pcie-controller {
+ pciec: pcie-controller {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";
@@ -19,7 +19,7 @@
0x82000000 0x2 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 1.0 MEM */
0x81000000 0x2 0 MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 1.0 IO */>;
- pcie@1,0 {
+ pcie0: pcie@1,0 {
device_type = "pci";
assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
reg = <0x0800 0 0 0 0>;
@@ -36,7 +36,7 @@
status = "disabled";
};
- pcie@2,0 {
+ pcie1: pcie@2,0 {
device_type = "pci";
assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>;
reg = <0x1000 0 0 0 0>;
@@ -104,20 +104,20 @@
};
};
- thermal@10078 {
+ thermal: thermal@10078 {
compatible = "marvell,kirkwood-thermal";
reg = <0x10078 0x4>;
status = "okay";
};
- rtc@10300 {
+ rtc: rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};
- i2c@11100 {
+ i2c1: i2c@11100 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11100 0x20>;
#address-cells = <1>;
@@ -128,7 +128,7 @@
status = "disabled";
};
- sata@80000 {
+ sata: sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
@@ -139,7 +139,7 @@
status = "disabled";
};
- mvsdio@90000 {
+ sdio: mvsdio@90000 {
compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>;
interrupts = <28>;
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 90384587c278..2570e0f1673f 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -40,7 +40,7 @@
pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */
- crypto@0301 {
+ cesa: crypto@0301 {
compatible = "marvell,orion-crypto";
reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>,
<MBUS_ID(0x03, 0x01) 0 0x800>;
@@ -77,7 +77,7 @@
#clock-cells = <1>;
};
- spi@10600 {
+ spi0: spi@10600 {
compatible = "marvell,orion-spi";
#address-cells = <1>;
#size-cells = <0>;
@@ -123,7 +123,7 @@
status = "disabled";
};
- serial@12000 {
+ uart0: serial@12000 {
compatible = "ns16550a";
reg = <0x12000 0x100>;
reg-shift = <2>;
@@ -132,7 +132,7 @@
status = "disabled";
};
- serial@12100 {
+ uart1: serial@12100 {
compatible = "ns16550a";
reg = <0x12100 0x100>;
reg-shift = <2>;
@@ -146,7 +146,7 @@
reg = <0x20000 0x80>, <0x1500 0x20>;
};
- system-controller@20000 {
+ sysc: system-controller@20000 {
compatible = "marvell,orion-system-controller";
reg = <0x20000 0x120>;
};
@@ -196,7 +196,7 @@
status = "okay";
};
- ehci@50000 {
+ usb0: ehci@50000 {
compatible = "marvell,orion-ehci";
reg = <0x50000 0x1000>;
interrupts = <19>;
@@ -204,7 +204,7 @@
status = "okay";
};
- xor@60800 {
+ dma0: xor@60800 {
compatible = "marvell,orion-xor";
reg = <0x60800 0x100
0x60A00 0x100>;
@@ -224,7 +224,7 @@
};
};
- xor@60900 {
+ dma1: xor@60900 {
compatible = "marvell,orion-xor";
reg = <0x60900 0x100
0x60B00 0x100>;
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 02/15] ARM: dts: kirkwood: add node labels
2014-04-30 12:56 ` [PATCH 02/15] ARM: dts: kirkwood: add node labels Sebastian Hesselbarth
@ 2014-05-05 0:56 ` Jason Cooper
0 siblings, 0 replies; 30+ messages in thread
From: Jason Cooper @ 2014-05-05 0:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Andrew Lunn, Gregory Clement, Thomas Petazzoni,
devicetree, linux-arm-kernel, linux-kernel
On Wed, Apr 30, 2014 at 02:56:29PM +0200, Sebastian Hesselbarth wrote:
> This adds missing node labels to Kirkwood common and SoC specific nodes
> to allow to reference them more easily.
>
> 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-6192.dtsi | 10 +++++-----
> arch/arm/boot/dts/kirkwood-6281.dtsi | 10 +++++-----
> arch/arm/boot/dts/kirkwood-6282.dtsi | 16 ++++++++--------
> arch/arm/boot/dts/kirkwood.dtsi | 16 ++++++++--------
> 4 files changed, 26 insertions(+), 26 deletions(-)
Patches 2 through 15 applied to mvebu/dt with Andrew's Ack.
thx,
Jason.
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards
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-04-30 12:56 ` [PATCH 02/15] ARM: dts: kirkwood: add node labels Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 16:38 ` Andrew Lunn
2014-04-30 12:56 ` [PATCH 04/15] ARM: dts: kirkwood: remove clock-frequency properties from UART nodes Sebastian Hesselbarth
` (12 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
ePAPR allows to reference the device used for console output by
stdout-path property. With node labels for Kirkwood UART0, now
reference it on all Kirkwood boards that already have ttyS0 in
their bootargs property.
While at it, fix some whitespace issues on mplcec4's chosen node
(there are more, but we only fix the chosen node now)
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 | 1 +
arch/arm/boot/dts/kirkwood-cloudbox.dts | 1 +
arch/arm/boot/dts/kirkwood-db.dtsi | 1 +
arch/arm/boot/dts/kirkwood-dns320.dts | 1 +
arch/arm/boot/dts/kirkwood-dns325.dts | 1 +
arch/arm/boot/dts/kirkwood-dockstar.dts | 1 +
arch/arm/boot/dts/kirkwood-dreamplug.dts | 1 +
arch/arm/boot/dts/kirkwood-ds109.dts | 1 +
arch/arm/boot/dts/kirkwood-ds110jv10.dts | 1 +
arch/arm/boot/dts/kirkwood-ds111.dts | 1 +
arch/arm/boot/dts/kirkwood-ds112.dts | 1 +
arch/arm/boot/dts/kirkwood-ds209.dts | 1 +
arch/arm/boot/dts/kirkwood-ds210.dts | 1 +
arch/arm/boot/dts/kirkwood-ds212.dts | 1 +
arch/arm/boot/dts/kirkwood-ds212j.dts | 1 +
arch/arm/boot/dts/kirkwood-ds409.dts | 1 +
arch/arm/boot/dts/kirkwood-ds409slim.dts | 1 +
arch/arm/boot/dts/kirkwood-ds411.dts | 1 +
arch/arm/boot/dts/kirkwood-ds411j.dts | 1 +
arch/arm/boot/dts/kirkwood-ds411slim.dts | 1 +
arch/arm/boot/dts/kirkwood-goflexnet.dts | 1 +
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 1 +
arch/arm/boot/dts/kirkwood-ib62x0.dts | 1 +
arch/arm/boot/dts/kirkwood-iconnect.dts | 1 +
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 1 +
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 1 +
arch/arm/boot/dts/kirkwood-laplug.dts | 1 +
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 1 +
arch/arm/boot/dts/kirkwood-mplcec4.dts | 7 ++++---
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 1 +
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 1 +
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 1 +
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 1 +
arch/arm/boot/dts/kirkwood-nsa310.dts | 1 +
arch/arm/boot/dts/kirkwood-nsa310a.dts | 1 +
arch/arm/boot/dts/kirkwood-nsa320.dts | 1 +
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 1 +
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 1 +
arch/arm/boot/dts/kirkwood-rd88f6192.dts | 1 +
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 1 +
arch/arm/boot/dts/kirkwood-rs212.dts | 1 +
arch/arm/boot/dts/kirkwood-rs409.dts | 1 +
arch/arm/boot/dts/kirkwood-rs411.dts | 1 +
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 1 +
arch/arm/boot/dts/kirkwood-t5325.dts | 1 +
arch/arm/boot/dts/kirkwood-topkick.dts | 1 +
arch/arm/boot/dts/kirkwood-ts219.dtsi | 1 +
47 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index 40791053106b..86073f4f31ac 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -30,6 +30,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 0e06fd3cee4d..61212692740e 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 02d1225ef99f..22df970df2a1 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -22,6 +22,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index bf7fe8ab88f4..3210daeb264c 100644
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -13,6 +13,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
gpio-leds {
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
index cb9978c652f2..5e586ed04c58 100644
--- a/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -13,6 +13,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
gpio-leds {
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
index f31312ebd0d6..d703f3eeef1c 100644
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index ef3463e0ae19..8ed737e9aa2f 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-ds109.dts b/arch/arm/boot/dts/kirkwood-ds109.dts
index 772092c94ca3..d4bcc1c7f6b3 100644
--- a/arch/arm/boot/dts/kirkwood-ds109.dts
+++ b/arch/arm/boot/dts/kirkwood-ds109.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-32-35 {
diff --git a/arch/arm/boot/dts/kirkwood-ds110jv10.dts b/arch/arm/boot/dts/kirkwood-ds110jv10.dts
index aabafbe0da4c..95bf83b91b4a 100644
--- a/arch/arm/boot/dts/kirkwood-ds110jv10.dts
+++ b/arch/arm/boot/dts/kirkwood-ds110jv10.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-32-35 {
diff --git a/arch/arm/boot/dts/kirkwood-ds111.dts b/arch/arm/boot/dts/kirkwood-ds111.dts
index 16ec7fbab573..61f47fbe44d0 100644
--- a/arch/arm/boot/dts/kirkwood-ds111.dts
+++ b/arch/arm/boot/dts/kirkwood-ds111.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-15-35-1 {
diff --git a/arch/arm/boot/dts/kirkwood-ds112.dts b/arch/arm/boot/dts/kirkwood-ds112.dts
index cff1b2388765..bf4143c6cb8f 100644
--- a/arch/arm/boot/dts/kirkwood-ds112.dts
+++ b/arch/arm/boot/dts/kirkwood-ds112.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-15-35-1 {
diff --git a/arch/arm/boot/dts/kirkwood-ds209.dts b/arch/arm/boot/dts/kirkwood-ds209.dts
index 330411993d38..6d25093a9ac4 100644
--- a/arch/arm/boot/dts/kirkwood-ds209.dts
+++ b/arch/arm/boot/dts/kirkwood-ds209.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-32-35 {
diff --git a/arch/arm/boot/dts/kirkwood-ds210.dts b/arch/arm/boot/dts/kirkwood-ds210.dts
index 6052eaa37d4f..2f1933efcac1 100644
--- a/arch/arm/boot/dts/kirkwood-ds210.dts
+++ b/arch/arm/boot/dts/kirkwood-ds210.dts
@@ -26,6 +26,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-32-35 {
diff --git a/arch/arm/boot/dts/kirkwood-ds212.dts b/arch/arm/boot/dts/kirkwood-ds212.dts
index 7f76cd30e84e..99afd462f956 100644
--- a/arch/arm/boot/dts/kirkwood-ds212.dts
+++ b/arch/arm/boot/dts/kirkwood-ds212.dts
@@ -27,6 +27,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-15-35-1 {
diff --git a/arch/arm/boot/dts/kirkwood-ds212j.dts b/arch/arm/boot/dts/kirkwood-ds212j.dts
index 1f83a00f1f74..f5c4213fc67c 100644
--- a/arch/arm/boot/dts/kirkwood-ds212j.dts
+++ b/arch/arm/boot/dts/kirkwood-ds212j.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-32-35 {
diff --git a/arch/arm/boot/dts/kirkwood-ds409.dts b/arch/arm/boot/dts/kirkwood-ds409.dts
index 0a573add44a2..e80a962ebba0 100644
--- a/arch/arm/boot/dts/kirkwood-ds409.dts
+++ b/arch/arm/boot/dts/kirkwood-ds409.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-15-18 {
diff --git a/arch/arm/boot/dts/kirkwood-ds409slim.dts b/arch/arm/boot/dts/kirkwood-ds409slim.dts
index 1848a6245fd3..cae5af4b88b5 100644
--- a/arch/arm/boot/dts/kirkwood-ds409slim.dts
+++ b/arch/arm/boot/dts/kirkwood-ds409slim.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-32-35 {
diff --git a/arch/arm/boot/dts/kirkwood-ds411.dts b/arch/arm/boot/dts/kirkwood-ds411.dts
index a1737b4311c6..623cd4a37d71 100644
--- a/arch/arm/boot/dts/kirkwood-ds411.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-15-35-1 {
diff --git a/arch/arm/boot/dts/kirkwood-ds411j.dts b/arch/arm/boot/dts/kirkwood-ds411j.dts
index 0cde914eceae..3348e330f074 100644
--- a/arch/arm/boot/dts/kirkwood-ds411j.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411j.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-15-18 {
diff --git a/arch/arm/boot/dts/kirkwood-ds411slim.dts b/arch/arm/boot/dts/kirkwood-ds411slim.dts
index aef0cadc2c78..a0a1fad8b4de 100644
--- a/arch/arm/boot/dts/kirkwood-ds411slim.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411slim.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-15-35-1 {
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index eb9329420107..5e39cc3ca95e 100644
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 2d51fce74a5a..db183455ff34 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index a1add3f215e3..810818b2bff6 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 8d8c80e3656d..7c4cd7e7535b 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
linux,initrd-start = <0x4500040>;
linux,initrd-end = <0x4800000>;
};
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index 59e7a5adeedb..9a8d40a17938 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index 04a1e44541b3..2213a20e7871 100644
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index c9e82eff9bf2..6e83b13fc26a 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 1656653d339b..ed3cdfbb45bb 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -4,6 +4,7 @@
/ {
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 73722c067501..b23abfe08d2f 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -12,9 +12,10 @@
reg = <0x00000000 0x20000000>;
};
- chosen {
- bootargs = "console=ttyS0,115200n8 earlyprintk";
- };
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+ };
mbus {
pcie-controller {
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 4bf358c28be2..9c48e827e34e 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -28,6 +28,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index 4838478019cc..b29cab304fd0 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
index 7c8a0d9d8d1f..4ef494231b78 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 743152f31a81..da8891bbeec8 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -4,6 +4,7 @@
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 989846ac6577..cd68210b9f11 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -12,6 +12,7 @@
chosen {
bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
index d0a602578f5b..8fd72d49e43f 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -17,6 +17,7 @@
chosen {
bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
index fc20baf0eade..817eaf02a346 100644
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index b88da9392c32..557b824f9c43 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index b2f7cae06839..b1f5e1180803 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -26,6 +26,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index e9dd85049297..8df800757175 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -26,6 +26,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index d6368c39102e..c573c204dbdb 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -22,6 +22,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-rs212.dts b/arch/arm/boot/dts/kirkwood-rs212.dts
index 93ec3d00c6ab..3b19f1fd4cac 100644
--- a/arch/arm/boot/dts/kirkwood-rs212.dts
+++ b/arch/arm/boot/dts/kirkwood-rs212.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-15-35-3 {
diff --git a/arch/arm/boot/dts/kirkwood-rs409.dts b/arch/arm/boot/dts/kirkwood-rs409.dts
index 311df4e5aa28..921ca49e85a4 100644
--- a/arch/arm/boot/dts/kirkwood-rs409.dts
+++ b/arch/arm/boot/dts/kirkwood-rs409.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-150-15-18 {
diff --git a/arch/arm/boot/dts/kirkwood-rs411.dts b/arch/arm/boot/dts/kirkwood-rs411.dts
index f90da850bb31..02852b0c809f 100644
--- a/arch/arm/boot/dts/kirkwood-rs411.dts
+++ b/arch/arm/boot/dts/kirkwood-rs411.dts
@@ -24,6 +24,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
gpio-fan-100-15-35-3 {
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index 1ff848d570a9..bd01d306a754 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -17,6 +17,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index 7d1c7677a18f..df53176c9354 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -27,6 +27,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
mbus {
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 5fc817c2cb87..a85025ef4c52 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -14,6 +14,7 @@
chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
};
ocp@f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 911f3a8cee23..8f2226b8bd3d 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -9,6 +9,7 @@
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
mbus {
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards
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
0 siblings, 1 reply; 30+ messages in thread
From: Andrew Lunn @ 2014-04-30 16:38 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
On Wed, Apr 30, 2014 at 02:56:30PM +0200, Sebastian Hesselbarth wrote:
> ePAPR allows to reference the device used for console output by
> stdout-path property. With node labels for Kirkwood UART0, now
> reference it on all Kirkwood boards that already have ttyS0 in
> their bootargs property.
Hi Sebastian
Could this be done in kirkwood.dtsi. I don't think we have any board
using ttyS1 for console, and if one does come along, it should be able
to override it.
Andrew
> While at it, fix some whitespace issues on mplcec4's chosen node
> (there are more, but we only fix the chosen node now)
>
> 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 | 1 +
> arch/arm/boot/dts/kirkwood-cloudbox.dts | 1 +
> arch/arm/boot/dts/kirkwood-db.dtsi | 1 +
> arch/arm/boot/dts/kirkwood-dns320.dts | 1 +
> arch/arm/boot/dts/kirkwood-dns325.dts | 1 +
> arch/arm/boot/dts/kirkwood-dockstar.dts | 1 +
> arch/arm/boot/dts/kirkwood-dreamplug.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds109.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds110jv10.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds111.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds112.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds209.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds210.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds212.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds212j.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds409.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds409slim.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds411.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds411j.dts | 1 +
> arch/arm/boot/dts/kirkwood-ds411slim.dts | 1 +
> arch/arm/boot/dts/kirkwood-goflexnet.dts | 1 +
> arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 1 +
> arch/arm/boot/dts/kirkwood-ib62x0.dts | 1 +
> arch/arm/boot/dts/kirkwood-iconnect.dts | 1 +
> arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 1 +
> arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 1 +
> arch/arm/boot/dts/kirkwood-laplug.dts | 1 +
> arch/arm/boot/dts/kirkwood-lsxl.dtsi | 1 +
> arch/arm/boot/dts/kirkwood-mplcec4.dts | 7 ++++---
> arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 1 +
> arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 1 +
> arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 1 +
> arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 1 +
> arch/arm/boot/dts/kirkwood-nsa310.dts | 1 +
> arch/arm/boot/dts/kirkwood-nsa310a.dts | 1 +
> arch/arm/boot/dts/kirkwood-nsa320.dts | 1 +
> arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 1 +
> arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 1 +
> arch/arm/boot/dts/kirkwood-rd88f6192.dts | 1 +
> arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 1 +
> arch/arm/boot/dts/kirkwood-rs212.dts | 1 +
> arch/arm/boot/dts/kirkwood-rs409.dts | 1 +
> arch/arm/boot/dts/kirkwood-rs411.dts | 1 +
> arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 1 +
> arch/arm/boot/dts/kirkwood-t5325.dts | 1 +
> arch/arm/boot/dts/kirkwood-topkick.dts | 1 +
> arch/arm/boot/dts/kirkwood-ts219.dtsi | 1 +
> 47 files changed, 50 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
> index 40791053106b..86073f4f31ac 100644
> --- a/arch/arm/boot/dts/kirkwood-b3.dts
> +++ b/arch/arm/boot/dts/kirkwood-b3.dts
> @@ -30,6 +30,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
> index 0e06fd3cee4d..61212692740e 100644
> --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
> +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
> index 02d1225ef99f..22df970df2a1 100644
> --- a/arch/arm/boot/dts/kirkwood-db.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-db.dtsi
> @@ -22,6 +22,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
> index bf7fe8ab88f4..3210daeb264c 100644
> --- a/arch/arm/boot/dts/kirkwood-dns320.dts
> +++ b/arch/arm/boot/dts/kirkwood-dns320.dts
> @@ -13,6 +13,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> gpio-leds {
> diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
> index cb9978c652f2..5e586ed04c58 100644
> --- a/arch/arm/boot/dts/kirkwood-dns325.dts
> +++ b/arch/arm/boot/dts/kirkwood-dns325.dts
> @@ -13,6 +13,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> gpio-leds {
> diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
> index f31312ebd0d6..d703f3eeef1c 100644
> --- a/arch/arm/boot/dts/kirkwood-dockstar.dts
> +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
> index ef3463e0ae19..8ed737e9aa2f 100644
> --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
> +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds109.dts b/arch/arm/boot/dts/kirkwood-ds109.dts
> index 772092c94ca3..d4bcc1c7f6b3 100644
> --- a/arch/arm/boot/dts/kirkwood-ds109.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds109.dts
> @@ -25,6 +25,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-32-35 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds110jv10.dts b/arch/arm/boot/dts/kirkwood-ds110jv10.dts
> index aabafbe0da4c..95bf83b91b4a 100644
> --- a/arch/arm/boot/dts/kirkwood-ds110jv10.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds110jv10.dts
> @@ -25,6 +25,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-32-35 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds111.dts b/arch/arm/boot/dts/kirkwood-ds111.dts
> index 16ec7fbab573..61f47fbe44d0 100644
> --- a/arch/arm/boot/dts/kirkwood-ds111.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds111.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-15-35-1 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds112.dts b/arch/arm/boot/dts/kirkwood-ds112.dts
> index cff1b2388765..bf4143c6cb8f 100644
> --- a/arch/arm/boot/dts/kirkwood-ds112.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds112.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-15-35-1 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds209.dts b/arch/arm/boot/dts/kirkwood-ds209.dts
> index 330411993d38..6d25093a9ac4 100644
> --- a/arch/arm/boot/dts/kirkwood-ds209.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds209.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-32-35 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds210.dts b/arch/arm/boot/dts/kirkwood-ds210.dts
> index 6052eaa37d4f..2f1933efcac1 100644
> --- a/arch/arm/boot/dts/kirkwood-ds210.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds210.dts
> @@ -26,6 +26,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-32-35 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds212.dts b/arch/arm/boot/dts/kirkwood-ds212.dts
> index 7f76cd30e84e..99afd462f956 100644
> --- a/arch/arm/boot/dts/kirkwood-ds212.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds212.dts
> @@ -27,6 +27,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-15-35-1 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds212j.dts b/arch/arm/boot/dts/kirkwood-ds212j.dts
> index 1f83a00f1f74..f5c4213fc67c 100644
> --- a/arch/arm/boot/dts/kirkwood-ds212j.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds212j.dts
> @@ -25,6 +25,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-32-35 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds409.dts b/arch/arm/boot/dts/kirkwood-ds409.dts
> index 0a573add44a2..e80a962ebba0 100644
> --- a/arch/arm/boot/dts/kirkwood-ds409.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds409.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-15-18 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds409slim.dts b/arch/arm/boot/dts/kirkwood-ds409slim.dts
> index 1848a6245fd3..cae5af4b88b5 100644
> --- a/arch/arm/boot/dts/kirkwood-ds409slim.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds409slim.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-32-35 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds411.dts b/arch/arm/boot/dts/kirkwood-ds411.dts
> index a1737b4311c6..623cd4a37d71 100644
> --- a/arch/arm/boot/dts/kirkwood-ds411.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds411.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-15-35-1 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds411j.dts b/arch/arm/boot/dts/kirkwood-ds411j.dts
> index 0cde914eceae..3348e330f074 100644
> --- a/arch/arm/boot/dts/kirkwood-ds411j.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds411j.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-15-18 {
> diff --git a/arch/arm/boot/dts/kirkwood-ds411slim.dts b/arch/arm/boot/dts/kirkwood-ds411slim.dts
> index aef0cadc2c78..a0a1fad8b4de 100644
> --- a/arch/arm/boot/dts/kirkwood-ds411slim.dts
> +++ b/arch/arm/boot/dts/kirkwood-ds411slim.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-15-35-1 {
> diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
> index eb9329420107..5e39cc3ca95e 100644
> --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
> +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
> index 2d51fce74a5a..db183455ff34 100644
> --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
> +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
> index a1add3f215e3..810818b2bff6 100644
> --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
> +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
> index 8d8c80e3656d..7c4cd7e7535b 100644
> --- a/arch/arm/boot/dts/kirkwood-iconnect.dts
> +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> linux,initrd-start = <0x4500040>;
> linux,initrd-end = <0x4800000>;
> };
> diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
> index 59e7a5adeedb..9a8d40a17938 100644
> --- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
> +++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
> index 04a1e44541b3..2213a20e7871 100644
> --- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
> +++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
> index c9e82eff9bf2..6e83b13fc26a 100644
> --- a/arch/arm/boot/dts/kirkwood-laplug.dts
> +++ b/arch/arm/boot/dts/kirkwood-laplug.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> index 1656653d339b..ed3cdfbb45bb 100644
> --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> @@ -4,6 +4,7 @@
> / {
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
> index 73722c067501..b23abfe08d2f 100644
> --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
> +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
> @@ -12,9 +12,10 @@
> reg = <0x00000000 0x20000000>;
> };
>
> - chosen {
> - bootargs = "console=ttyS0,115200n8 earlyprintk";
> - };
> + chosen {
> + bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> + };
>
> mbus {
> pcie-controller {
> diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> index 4bf358c28be2..9c48e827e34e 100644
> --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> @@ -28,6 +28,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
> index 4838478019cc..b29cab304fd0 100644
> --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
> +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
> @@ -25,6 +25,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
> index 7c8a0d9d8d1f..4ef494231b78 100644
> --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
> +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
> @@ -25,6 +25,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
> index 743152f31a81..da8891bbeec8 100644
> --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
> @@ -4,6 +4,7 @@
> / {
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
> index 989846ac6577..cd68210b9f11 100644
> --- a/arch/arm/boot/dts/kirkwood-nsa310.dts
> +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
> @@ -12,6 +12,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
> index d0a602578f5b..8fd72d49e43f 100644
> --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
> +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
> @@ -17,6 +17,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
> index fc20baf0eade..817eaf02a346 100644
> --- a/arch/arm/boot/dts/kirkwood-nsa320.dts
> +++ b/arch/arm/boot/dts/kirkwood-nsa320.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
> index b88da9392c32..557b824f9c43 100644
> --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
> +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> index b2f7cae06839..b1f5e1180803 100644
> --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> @@ -26,6 +26,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
> index e9dd85049297..8df800757175 100644
> --- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
> +++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
> @@ -26,6 +26,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
> index d6368c39102e..c573c204dbdb 100644
> --- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
> @@ -22,6 +22,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-rs212.dts b/arch/arm/boot/dts/kirkwood-rs212.dts
> index 93ec3d00c6ab..3b19f1fd4cac 100644
> --- a/arch/arm/boot/dts/kirkwood-rs212.dts
> +++ b/arch/arm/boot/dts/kirkwood-rs212.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-15-35-3 {
> diff --git a/arch/arm/boot/dts/kirkwood-rs409.dts b/arch/arm/boot/dts/kirkwood-rs409.dts
> index 311df4e5aa28..921ca49e85a4 100644
> --- a/arch/arm/boot/dts/kirkwood-rs409.dts
> +++ b/arch/arm/boot/dts/kirkwood-rs409.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-150-15-18 {
> diff --git a/arch/arm/boot/dts/kirkwood-rs411.dts b/arch/arm/boot/dts/kirkwood-rs411.dts
> index f90da850bb31..02852b0c809f 100644
> --- a/arch/arm/boot/dts/kirkwood-rs411.dts
> +++ b/arch/arm/boot/dts/kirkwood-rs411.dts
> @@ -24,6 +24,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> gpio-fan-100-15-35-3 {
> diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
> index 1ff848d570a9..bd01d306a754 100644
> --- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
> @@ -17,6 +17,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
> index 7d1c7677a18f..df53176c9354 100644
> --- a/arch/arm/boot/dts/kirkwood-t5325.dts
> +++ b/arch/arm/boot/dts/kirkwood-t5325.dts
> @@ -27,6 +27,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> mbus {
> diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
> index 5fc817c2cb87..a85025ef4c52 100644
> --- a/arch/arm/boot/dts/kirkwood-topkick.dts
> +++ b/arch/arm/boot/dts/kirkwood-topkick.dts
> @@ -14,6 +14,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8 earlyprintk";
> + stdout-path = &uart0;
> };
>
> ocp@f1000000 {
> diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
> index 911f3a8cee23..8f2226b8bd3d 100644
> --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
> @@ -9,6 +9,7 @@
>
> chosen {
> bootargs = "console=ttyS0,115200n8";
> + stdout-path = &uart0;
> };
>
> mbus {
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards
2014-04-30 16:38 ` Andrew Lunn
@ 2014-04-30 19:47 ` Sebastian Hesselbarth
2014-04-30 20:21 ` Andrew Lunn
0 siblings, 1 reply; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 19:47 UTC (permalink / raw)
To: Andrew Lunn
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Gregory Clement, Thomas Petazzoni,
devicetree, linux-arm-kernel, linux-kernel
On 04/30/2014 06:38 PM, Andrew Lunn wrote:
> On Wed, Apr 30, 2014 at 02:56:30PM +0200, Sebastian Hesselbarth wrote:
>> ePAPR allows to reference the device used for console output by
>> stdout-path property. With node labels for Kirkwood UART0, now
>> reference it on all Kirkwood boards that already have ttyS0 in
>> their bootargs property.
>
> Could this be done in kirkwood.dtsi. I don't think we have any board
> using ttyS1 for console, and if one does come along, it should be able
> to override it.
Yes, we *can* move it in kirkwood.dtsi, but IMHO we *should* keep it in
the board files. I see the "chosen" node and its properties as _the_
board node.
One could argue then, that we should count the memory properties too and
put the most common in the SoC dtsi. But you are right, as UART0 is also
the UART with boot support, it is likely to be always connected to
a more-or-less accessible console output.
I really have no strong opinion about it.
Sebastian
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards
2014-04-30 19:47 ` Sebastian Hesselbarth
@ 2014-04-30 20:21 ` Andrew Lunn
2014-04-30 20:30 ` Arnd Bergmann
0 siblings, 1 reply; 30+ messages in thread
From: Andrew Lunn @ 2014-04-30 20:21 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Andrew Lunn, Mark Rutland, Thomas Petazzoni, Russell King,
Jason Cooper, Pawel Moll, Ian Campbell, linux-kernel, devicetree,
Rob Herring, Kumar Gala, Gregory Clement, linux-arm-kernel
> Yes, we *can* move it in kirkwood.dtsi, but IMHO we *should* keep it in
> the board files. I see the "chosen" node and its properties as _the_
> board node.
>
> One could argue then, that we should count the memory properties too and
> put the most common in the SoC dtsi. But you are right, as UART0 is also
> the UART with boot support, it is likely to be always connected to
> a more-or-less accessible console output.
>
> I really have no strong opinion about it.
Me neithe, but the advantage of putting it in kirkwood.dtsi is that it
then does not get forgotten, and is always there for bearbox to use.
Andrew
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards
2014-04-30 20:21 ` Andrew Lunn
@ 2014-04-30 20:30 ` Arnd Bergmann
2014-05-01 7:30 ` Andrew Lunn
0 siblings, 1 reply; 30+ messages in thread
From: Arnd Bergmann @ 2014-04-30 20:30 UTC (permalink / raw)
To: Andrew Lunn
Cc: Sebastian Hesselbarth, Mark Rutland, Thomas Petazzoni,
Russell King, Jason Cooper, Pawel Moll, Ian Campbell,
linux-kernel, devicetree, Rob Herring, Kumar Gala,
Gregory Clement, linux-arm-kernel
On Wednesday 30 April 2014 22:21:30 Andrew Lunn wrote:
> > Yes, we *can* move it in kirkwood.dtsi, but IMHO we *should* keep it in
> > the board files. I see the "chosen" node and its properties as _the_
> > board node.
> >
> > One could argue then, that we should count the memory properties too and
> > put the most common in the SoC dtsi. But you are right, as UART0 is also
> > the UART with boot support, it is likely to be always connected to
> > a more-or-less accessible console output.
> >
> > I really have no strong opinion about it.
>
> Me neithe, but the advantage of putting it in kirkwood.dtsi is that it
> then does not get forgotten, and is always there for bearbox to use.
I would prefer having it in the board.dts file out of principle, but I
agree it's not very important either way.
Arnd
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards
2014-04-30 20:30 ` Arnd Bergmann
@ 2014-05-01 7:30 ` Andrew Lunn
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Lunn @ 2014-05-01 7:30 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Lunn, Mark Rutland, Thomas Petazzoni, Russell King,
Jason Cooper, Pawel Moll, Ian Campbell, linux-kernel, devicetree,
Rob Herring, Kumar Gala, Gregory Clement, linux-arm-kernel,
Sebastian Hesselbarth
On Wed, Apr 30, 2014 at 10:30:21PM +0200, Arnd Bergmann wrote:
> On Wednesday 30 April 2014 22:21:30 Andrew Lunn wrote:
> > > Yes, we *can* move it in kirkwood.dtsi, but IMHO we *should* keep it in
> > > the board files. I see the "chosen" node and its properties as _the_
> > > board node.
> > >
> > > One could argue then, that we should count the memory properties too and
> > > put the most common in the SoC dtsi. But you are right, as UART0 is also
> > > the UART with boot support, it is likely to be always connected to
> > > a more-or-less accessible console output.
> > >
> > > I really have no strong opinion about it.
> >
> > Me neithe, but the advantage of putting it in kirkwood.dtsi is that it
> > then does not get forgotten, and is always there for bearbox to use.
>
> I would prefer having it in the board.dts file out of principle, but I
> agree it's not very important either way.
OK, then i can add my
Acked-by: Andrew Lunn <andrew@lunn.ch>
I will try to do some testing over the weekend.
Andrew
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 04/15] ARM: dts: kirkwood: remove clock-frequency properties from UART nodes
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (2 preceding siblings ...)
2014-04-30 12:56 ` [PATCH 03/15] ARM: dts: kirkwood: add stdout-path property to all boards Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 05/15] ARM: dts: kirkwood: rename pin-controller nodes Sebastian Hesselbarth
` (11 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
UART devices found on Kirkwood SoCs derive their baudrate from TCLK.
With proper clocks property in the SoCs serial node, boards do not
need to overwrite it anymore.
Remove the remaining clock-frequency property from all Kirkwood boards.
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-cloudbox.dts | 1 -
arch/arm/boot/dts/kirkwood-db.dtsi | 1 -
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 1 -
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 1 -
arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 --
5 files changed, 6 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 61212692740e..65ae6471d553 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -28,7 +28,6 @@
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
- clock-frequency = <166666667>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 22df970df2a1..68dfb3ad57dd 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -36,7 +36,6 @@
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
- clock-frequency = <200000000>;
status = "ok";
};
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index db183455ff34..3994a86f989e 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -37,7 +37,6 @@
};
};
serial@12000 {
- clock-frequency = <200000000>;
status = "ok";
};
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 9c48e827e34e..444257c08a0c 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -77,7 +77,6 @@
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
- clock-frequency = <200000000>;
status = "ok";
};
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 8f2226b8bd3d..414d2246b37c 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -35,13 +35,11 @@
};
};
serial@12000 {
- clock-frequency = <200000000>;
status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
};
serial@12100 {
- clock-frequency = <200000000>;
status = "okay";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 05/15] ARM: dts: kirkwood: rename pin-controller nodes
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (3 preceding siblings ...)
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 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 06/15] ARM: dts: kirkwood: add pinctrl node to common SoC include Sebastian Hesselbarth
` (10 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
To prepare pin-controller consolidation, first rename all pinctrl nodes
to a more appropriate name regarding ePAPR recommended names.
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-6192.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-b3.dts | 2 +-
arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +-
arch/arm/boot/dts/kirkwood-db.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +-
arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +-
arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +-
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 +-
arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 +-
arch/arm/boot/dts/kirkwood-iconnect.dts | 2 +-
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +-
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 2 +-
arch/arm/boot/dts/kirkwood-laplug.dts | 2 +-
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-mplcec4.dts | 2 +-
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +-
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 2 +-
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 2 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-nsa310.dts | 2 +-
arch/arm/boot/dts/kirkwood-nsa310a.dts | 2 +-
arch/arm/boot/dts/kirkwood-nsa320.dts | 2 +-
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +-
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +-
arch/arm/boot/dts/kirkwood-rd88f6192.dts | 2 +-
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-t5325.dts | 2 +-
arch/arm/boot/dts/kirkwood-topkick.dts | 2 +-
arch/arm/boot/dts/kirkwood-ts219-6281.dts | 2 +-
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 2 +-
arch/arm/boot/dts/kirkwood-ts419.dtsi | 2 +-
38 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index 294a6fa0208c..4f1eef36a7ac 100644
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -35,7 +35,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
compatible = "marvell,88f6192-pinctrl";
reg = <0x10000 0x20>;
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index 2560cbbdb0b3..d95a7a9cfd1e 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -35,7 +35,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
compatible = "marvell,88f6281-pinctrl";
reg = <0x10000 0x20>;
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index f4b4786b9a01..523d6feeaf19 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -56,7 +56,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
compatible = "marvell,88f6282-pinctrl";
reg = <0x10000 0x20>;
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
index 3271e4c8ea07..c59e7b75b169 100644
--- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
@@ -1,6 +1,6 @@
/ {
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
compatible = "marvell,98dx4122-pinctrl";
reg = <0x10000 0x20>;
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index 86073f4f31ac..c723ce7ad1b8 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -45,7 +45,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
marvell,pins = "mpp39";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 65ae6471d553..3f30475fea11 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_cloudbox_sata0: pmx-cloudbox-sata0 {
marvell,pins = "mpp15";
marvell,function = "sata0";
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 68dfb3ad57dd..9b62f78b516b 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -26,7 +26,7 @@
};
ocp@f1000000 {
- pinctrl@10000 {
+ pin-controller@10000 {
pmx_sdio_gpios: pmx-sdio-gpios {
marvell,pins = "mpp37", "mpp38";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index d5aa9564a287..bcc6e0f48571 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -50,7 +50,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0
&pmx_present_sata1 &pmx_fan_tacho
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
index d703f3eeef1c..849736349511 100644
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 8ed737e9aa2f..dd8d1a4611a8 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_led_bluetooth: pmx-led-bluetooth {
marvell,pins = "mpp47";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index 5e39cc3ca95e..aa60a0b049a7 100644
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 3994a86f989e..871a5f8afb01 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_led_health_r: pmx-led-health-r {
marvell,pins = "mpp46";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 810818b2bff6..6804638eb87e 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_led_os_red: pmx-led-os-red {
marvell,pins = "mpp22";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 7c4cd7e7535b..38e31d15a62d 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -30,7 +30,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_button_reset: pmx-button-reset {
marvell,pins = "mpp12";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index 9a8d40a17938..05291f3990d0 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = < &pmx_led_sata_brt_ctrl_1
&pmx_led_sata_brt_ctrl_2
&pmx_led_backup_brt_ctrl_1
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index 2213a20e7871..db14bd03b86b 100644
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 6e83b13fc26a..4f7741184f98 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -55,7 +55,7 @@
};
};
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp14";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index ed3cdfbb45bb..53484474df1f 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -8,7 +8,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_power_hdd: pmx-power-hdd {
marvell,pins = "mpp10";
marvell,function = "gpo";
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index b23abfe08d2f..414024c578e8 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -28,7 +28,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_led_health: pmx-led-health {
marvell,pins = "mpp7";
marvell,function = "gpo";
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 444257c08a0c..52b80b108f8e 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -42,7 +42,7 @@
};
ocp@f1000000 {
- pinctrl@10000 {
+ pin-controller@10000 {
pmx_usb_led: pmx-usb-led {
marvell,pins = "mpp12";
marvell,function = "gpo";
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index b29cab304fd0..c4741699605c 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -39,7 +39,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
marvell,pins = "mpp47";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
index 4ef494231b78..8437f3e3b8d7 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
@@ -41,7 +41,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
marvell,pins = "mpp47";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index da8891bbeec8..46eb8f6b6243 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -8,7 +8,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_ns2_sata0: pmx-ns2-sata0 {
marvell,pins = "mpp21";
marvell,function = "sata0";
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index cd68210b9f11..78bdf9c7f16b 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -26,7 +26,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_unknown>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
index 8fd72d49e43f..0788473f0447 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -21,7 +21,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-names = "default";
pmx_led_esata_green: pmx-led-esata-green {
diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
index 817eaf02a346..24f686d1044d 100644
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts
@@ -38,7 +38,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-names = "default";
/* SATA Activity and Present pins are not connected */
diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
index b88810df7ca2..2075a2e828f1 100644
--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
@@ -15,7 +15,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_usb_power: pmx-usb-power {
marvell,pins = "mpp21";
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 557b824f9c43..fd1c8b535e28 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -46,7 +46,7 @@
};
};
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index b1f5e1180803..8c3d50c57fa0 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -58,7 +58,7 @@
};
};
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index 8df800757175..30087b19efae 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -40,7 +40,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index c573c204dbdb..26cf0e0ccefd 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -36,7 +36,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_sdio_cd>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index bd01d306a754..a015af4da9a2 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -21,7 +21,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29";
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 4227c974729d..e137bd4e26fd 100644
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -25,7 +25,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pmx_alarmled_12: pmx-alarmled-12 {
marvell,pins = "mpp12";
marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index df53176c9354..ae102abcab04 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -41,7 +41,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index a85025ef4c52..5bc57efbee99 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -18,7 +18,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
/*
* Switch positions
*
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
index c17ae45e19be..9767d73f3857 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -6,7 +6,7 @@
/ {
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index 0713d072758a..bfc1a32d4e42 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -16,7 +16,7 @@
};
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi
index 1a9c624c7a92..30ab93bfb1e4 100644
--- a/arch/arm/boot/dts/kirkwood-ts419.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts419.dtsi
@@ -14,7 +14,7 @@
compatible = "qnap,ts419", "marvell,kirkwood";
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
+ pinctrl: pin-controller@10000 {
pinctrl-names = "default";
pmx_USB_copy_button: pmx-USB-copy-button {
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 06/15] ARM: dts: kirkwood: add pinctrl node to common SoC include
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (4 preceding siblings ...)
2014-04-30 12:56 ` [PATCH 05/15] ARM: dts: kirkwood: rename pin-controller nodes Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings Sebastian Hesselbarth
` (9 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
All Kirkwood SoCs have their pinctrl registers at the same address.
Instead of replaying the same reg property on each SoC, have the
reg property set in the common SoC file already. This also allows
us to move common pinctrl settings to this node later on.
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-6192.dtsi | 1 -
arch/arm/boot/dts/kirkwood-6281.dtsi | 1 -
arch/arm/boot/dts/kirkwood-6282.dtsi | 1 -
arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 1 -
arch/arm/boot/dts/kirkwood.dtsi | 5 +++++
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index 4f1eef36a7ac..c008e9a877d5 100644
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -37,7 +37,6 @@
ocp@f1000000 {
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6192-pinctrl";
- reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index d95a7a9cfd1e..3674a9b9552e 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -37,7 +37,6 @@
ocp@f1000000 {
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6281-pinctrl";
- reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 523d6feeaf19..89a6ba149ec2 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -58,7 +58,6 @@
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6282-pinctrl";
- reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
index c59e7b75b169..4a2d1b12d1ca 100644
--- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
@@ -2,7 +2,6 @@
ocp@f1000000 {
pinctrl: pin-controller@10000 {
compatible = "marvell,98dx4122-pinctrl";
- reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 2570e0f1673f..028003e12111 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -71,6 +71,11 @@
#address-cells = <1>;
#size-cells = <1>;
+ pinctrl: pin-controller@10000 {
+ /* set compatible property in SoC file */
+ reg = <0x10000 0x20>;
+ };
+
core_clk: core-clocks@10030 {
compatible = "marvell,kirkwood-core-clock";
reg = <0x10030 0x4>;
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (5 preceding siblings ...)
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 ` Sebastian Hesselbarth
2014-04-30 16:42 ` Jason Gunthorpe
2014-04-30 12:56 ` [PATCH 08/15] ARM: dts: kirkwood: set default pinctrl for GBE1 Sebastian Hesselbarth
` (8 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
All SoCs have the same pinctrl setting for NAND, UART0/1, SPI, TWSI0,
and GBE1. Move it to the common pinctrl node that we now have.
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-6192.dtsi | 22 -------------------
arch/arm/boot/dts/kirkwood-6281.dtsi | 22 -------------------
arch/arm/boot/dts/kirkwood-6282.dtsi | 23 -------------------
arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 22 -------------------
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 7 ------
arch/arm/boot/dts/kirkwood.dtsi | 33 ++++++++++++++++++++++++++++
6 files changed, 33 insertions(+), 96 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index c008e9a877d5..dd81508b919b 100644
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -38,12 +38,6 @@
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6192-pinctrl";
- pmx_nand: pmx-nand {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
- "mpp4", "mpp5", "mpp18",
- "mpp19";
- marvell,function = "nand";
- };
pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0";
@@ -52,22 +46,6 @@
marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1";
};
- pmx_spi: pmx-spi {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
- marvell,function = "spi";
- };
- pmx_twsi0: pmx-twsi0 {
- marvell,pins = "mpp8", "mpp9";
- marvell,function = "twsi0";
- };
- pmx_uart0: pmx-uart0 {
- marvell,pins = "mpp10", "mpp11";
- marvell,function = "uart0";
- };
- pmx_uart1: pmx-uart1 {
- marvell,pins = "mpp13", "mpp14";
- marvell,function = "uart1";
- };
pmx_sdio: pmx-sdio {
marvell,pins = "mpp12", "mpp13", "mpp14",
"mpp15", "mpp16", "mpp17";
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index 3674a9b9552e..7dc7d6782e83 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -38,12 +38,6 @@
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6281-pinctrl";
- pmx_nand: pmx-nand {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
- "mpp4", "mpp5", "mpp18",
- "mpp19";
- marvell,function = "nand";
- };
pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0";
@@ -52,22 +46,6 @@
marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1";
};
- pmx_spi: pmx-spi {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
- marvell,function = "spi";
- };
- pmx_twsi0: pmx-twsi0 {
- marvell,pins = "mpp8", "mpp9";
- marvell,function = "twsi0";
- };
- pmx_uart0: pmx-uart0 {
- marvell,pins = "mpp10", "mpp11";
- marvell,function = "uart0";
- };
- pmx_uart1: pmx-uart1 {
- marvell,pins = "mpp13", "mpp14";
- marvell,function = "uart1";
- };
pmx_sdio: pmx-sdio {
marvell,pins = "mpp12", "mpp13", "mpp14",
"mpp15", "mpp16", "mpp17";
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 89a6ba149ec2..b869f48cac02 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -59,12 +59,6 @@
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6282-pinctrl";
- pmx_nand: pmx-nand {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
- "mpp4", "mpp5", "mpp18", "mpp19";
- marvell,function = "nand";
- };
-
pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0";
@@ -73,29 +67,12 @@
marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1";
};
- pmx_spi: pmx-spi {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
- marvell,function = "spi";
- };
- pmx_twsi0: pmx-twsi0 {
- marvell,pins = "mpp8", "mpp9";
- marvell,function = "twsi0";
- };
pmx_twsi1: pmx-twsi1 {
marvell,pins = "mpp36", "mpp37";
marvell,function = "twsi1";
};
- pmx_uart0: pmx-uart0 {
- marvell,pins = "mpp10", "mpp11";
- marvell,function = "uart0";
- };
-
- pmx_uart1: pmx-uart1 {
- marvell,pins = "mpp13", "mpp14";
- marvell,function = "uart1";
- };
pmx_sdio: pmx-sdio {
marvell,pins = "mpp12", "mpp13", "mpp14",
"mpp15", "mpp16", "mpp17";
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
index 4a2d1b12d1ca..2e8e412b9db0 100644
--- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
@@ -3,28 +3,6 @@
pinctrl: pin-controller@10000 {
compatible = "marvell,98dx4122-pinctrl";
- pmx_nand: pmx-nand {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
- "mpp4", "mpp5", "mpp18",
- "mpp19";
- marvell,function = "nand";
- };
- pmx_spi: pmx-spi {
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
- marvell,function = "spi";
- };
- pmx_twsi0: pmx-twsi0 {
- marvell,pins = "mpp8", "mpp9";
- marvell,function = "twsi0";
- };
- pmx_uart0: pmx-uart0 {
- marvell,pins = "mpp10", "mpp11";
- marvell,function = "uart0";
- };
- pmx_uart1: pmx-uart1 {
- marvell,pins = "mpp13", "mpp14";
- marvell,function = "uart1";
- };
};
};
};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 8c3d50c57fa0..1a7f18d5530d 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -110,13 +110,6 @@
marvell,pins = "mpp41", "mpp42", "mpp43";
marvell,function = "gpio";
};
-
- pmx_ge1: pmx-ge1 {
- marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
- "mpp24", "mpp25", "mpp26", "mpp27",
- "mpp30", "mpp31", "mpp32", "mpp33";
- marvell,function = "ge1";
- };
};
};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 028003e12111..5d412e71b9fb 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -74,6 +74,39 @@
pinctrl: pin-controller@10000 {
/* set compatible property in SoC file */
reg = <0x10000 0x20>;
+
+ pmx_ge1: pmx-ge1 {
+ marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
+ "mpp24", "mpp25", "mpp26", "mpp27",
+ "mpp30", "mpp31", "mpp32", "mpp33";
+ marvell,function = "ge1";
+ };
+
+ pmx_nand: pmx-nand {
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+ "mpp4", "mpp5", "mpp18", "mpp19";
+ marvell,function = "nand";
+ };
+
+ pmx_spi: pmx-spi {
+ marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
+ marvell,function = "spi";
+ };
+
+ pmx_twsi0: pmx-twsi0 {
+ marvell,pins = "mpp8", "mpp9";
+ marvell,function = "twsi0";
+ };
+
+ pmx_uart0: pmx-uart0 {
+ marvell,pins = "mpp10", "mpp11";
+ marvell,function = "uart0";
+ };
+
+ pmx_uart1: pmx-uart1 {
+ marvell,pins = "mpp13", "mpp14";
+ marvell,function = "uart1";
+ };
};
core_clk: core-clocks@10030 {
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings
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
0 siblings, 2 replies; 30+ messages in thread
From: Jason Gunthorpe @ 2014-04-30 16:42 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Mark Rutland, Andrew Lunn, Russell King, Jason Cooper,
Pawel Moll, Ian Campbell, linux-kernel, devicetree, Rob Herring,
Kumar Gala, Gregory Clement, Thomas Petazzoni, linux-arm-kernel
On Wed, Apr 30, 2014 at 02:56:34PM +0200, Sebastian Hesselbarth wrote:
> All SoCs have the same pinctrl setting for NAND, UART0/1, SPI, TWSI0,
> and GBE1. Move it to the common pinctrl node that we now have.
There are two possible choices for UART0, UART1, and SPI on kirkwood..
For instance I use this on my board:
pmx_spi0: pmx-spi0 {
marvell,pins = "mpp7", "mpp10", "mpp11", "mpp12";
marvell,function = "spi";
};
vs
> +
> + pmx_spi: pmx-spi {
> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> + marvell,function = "spi";
> + };
It looks like all the boards in the kernel use the same choice, so it
makes some sense to consolidate, but I assume a board file can
override the marvell,pins?
Otherwise the rest of your patchset looked sane to me.
Regards,
Jason
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings
2014-04-30 16:42 ` Jason Gunthorpe
@ 2014-04-30 16:44 ` Andrew Lunn
2014-04-30 19:39 ` Sebastian Hesselbarth
1 sibling, 0 replies; 30+ messages in thread
From: Andrew Lunn @ 2014-04-30 16:44 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: Sebastian Hesselbarth, Mark Rutland, Andrew Lunn, Russell King,
Jason Cooper, Pawel Moll, Ian Campbell, linux-kernel, devicetree,
Rob Herring, Kumar Gala, Gregory Clement, Thomas Petazzoni,
linux-arm-kernel
On Wed, Apr 30, 2014 at 10:42:36AM -0600, Jason Gunthorpe wrote:
> On Wed, Apr 30, 2014 at 02:56:34PM +0200, Sebastian Hesselbarth wrote:
> > All SoCs have the same pinctrl setting for NAND, UART0/1, SPI, TWSI0,
> > and GBE1. Move it to the common pinctrl node that we now have.
>
> There are two possible choices for UART0, UART1, and SPI on kirkwood..
>
> For instance I use this on my board:
>
> pmx_spi0: pmx-spi0 {
> marvell,pins = "mpp7", "mpp10", "mpp11", "mpp12";
> marvell,function = "spi";
> };
>
> vs
>
> > +
> > + pmx_spi: pmx-spi {
> > + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
> > + marvell,function = "spi";
> > + };
>
> It looks like all the boards in the kernel use the same choice, so it
> makes some sense to consolidate, but I assume a board file can
> override the marvell,pins?
Hi Jason
Yes, the board can override it, see patch 10/15 for an example.
Andrew
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings
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
1 sibling, 1 reply; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 19:39 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: Mark Rutland, Andrew Lunn, Russell King, Jason Cooper,
Pawel Moll, Ian Campbell, linux-kernel, devicetree, Rob Herring,
Kumar Gala, Gregory Clement, Thomas Petazzoni, linux-arm-kernel
On 04/30/2014 06:42 PM, Jason Gunthorpe wrote:
> On Wed, Apr 30, 2014 at 02:56:34PM +0200, Sebastian Hesselbarth wrote:
>> All SoCs have the same pinctrl setting for NAND, UART0/1, SPI, TWSI0,
>> and GBE1. Move it to the common pinctrl node that we now have.
>
> There are two possible choices for UART0, UART1, and SPI on kirkwood..
>
> For instance I use this on my board:
>
> pmx_spi0: pmx-spi0 {
> marvell,pins = "mpp7", "mpp10", "mpp11", "mpp12";
> marvell,function = "spi";
> };
>
> vs
>
>> +
>> + pmx_spi: pmx-spi {
>> + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
>> + marvell,function = "spi";
>> + };
>
> It looks like all the boards in the kernel use the same choice, so it
> makes some sense to consolidate, but I assume a board file can
> override the marvell,pins?
Yes, there are already some boards (e.g. t5325 with spi0) overwriting
pinctrl settings instead of overwriting the pinctrl-0 property. I
thought, I keep this behavior and note it above each pinctrl node in
some of the following patches.
But your comment reminded me of something more important: there is
one set of boards using kirkwood-lsxl.dtsi which does not explicitly
set spi's pinctrl property. So this consolidation potentially breaks
spi on those boards.
An explicit Tested-by for Buffalo Linkstation LS-CHLv2 and/or LS-XHL
would be good.
> Otherwise the rest of your patchset looked sane to me.
I count that as a
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Thanks!
Sebastian
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings
2014-04-30 19:39 ` Sebastian Hesselbarth
@ 2014-04-30 19:44 ` Jason Gunthorpe
2014-04-30 19:54 ` Sebastian Hesselbarth
0 siblings, 1 reply; 30+ messages in thread
From: Jason Gunthorpe @ 2014-04-30 19:44 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Mark Rutland, Andrew Lunn, Russell King, Jason Cooper,
Pawel Moll, Ian Campbell, linux-kernel, devicetree, Rob Herring,
Kumar Gala, Gregory Clement, Thomas Petazzoni, linux-arm-kernel
On Wed, Apr 30, 2014 at 09:39:41PM +0200, Sebastian Hesselbarth wrote:
> On 04/30/2014 06:42 PM, Jason Gunthorpe wrote:
> > On Wed, Apr 30, 2014 at 02:56:34PM +0200, Sebastian Hesselbarth wrote:
> >> All SoCs have the same pinctrl setting for NAND, UART0/1, SPI, TWSI0,
> >> and GBE1. Move it to the common pinctrl node that we now have.
> Yes, there are already some boards (e.g. t5325 with spi0) overwriting
> pinctrl settings instead of overwriting the pinctrl-0 property. I
> thought, I keep this behavior and note it above each pinctrl node in
> some of the following patches.
That all makes sense, I think the commit message just seemed to say
something else.
Maybe more like:
NAND and TWSI0 have only one valid pin control choice on Kirkwood,
move those definitions into the common dtsi.
For UART0/1 and SPI, which have two choices, move the definition that
is used in the majority of the board files into the common dtsi.
Board files that are different will override.
Regards,
Jason
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings
2014-04-30 19:44 ` Jason Gunthorpe
@ 2014-04-30 19:54 ` Sebastian Hesselbarth
0 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 19:54 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: Mark Rutland, Andrew Lunn, Russell King, Jason Cooper,
Pawel Moll, Ian Campbell, linux-kernel, devicetree, Rob Herring,
Kumar Gala, Gregory Clement, Thomas Petazzoni, linux-arm-kernel
On 04/30/2014 09:44 PM, Jason Gunthorpe wrote:
> On Wed, Apr 30, 2014 at 09:39:41PM +0200, Sebastian Hesselbarth wrote:
>> On 04/30/2014 06:42 PM, Jason Gunthorpe wrote:
>>> On Wed, Apr 30, 2014 at 02:56:34PM +0200, Sebastian Hesselbarth wrote:
>>>> All SoCs have the same pinctrl setting for NAND, UART0/1, SPI, TWSI0,
>>>> and GBE1. Move it to the common pinctrl node that we now have.
>
>> Yes, there are already some boards (e.g. t5325 with spi0) overwriting
>> pinctrl settings instead of overwriting the pinctrl-0 property. I
>> thought, I keep this behavior and note it above each pinctrl node in
>> some of the following patches.
>
> That all makes sense, I think the commit message just seemed to say
> something else.
Well, this patch is about moving the pinctrl nodes to the common SoC
dtsi. The next 6 patches are about setting the default pinctrl property.
> Maybe more like:
>
> NAND and TWSI0 have only one valid pin control choice on Kirkwood,
> move those definitions into the common dtsi.
>
> For UART0/1 and SPI, which have two choices, move the definition that
> is used in the majority of the board files into the common dtsi.
> Board files that are different will override.
Ok, I see. Well, strictly speaking the setting node itself is always
valid, no matter if the board uses it. So that is why I first moved
them into kirkwood.dtsi and did set the pinctrl-0 property in the
later patches, e.g. commit message of Patch 9 reads:
"""
Most boards use the default UART0/1 pinctrl setting without RTS/CTS.
Add the pinctrl setting to the toplevel SoC UART nodes and put a note
in front of the corresponding pinctrl node to overwrite the setting
on board level. Currently, both boards using a different UART pinctrl
setting (Openblocks A6, A7) already overwrite the pinctrl node.
"""
But I can, of course, reword this commit message.
Sebastian
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 08/15] ARM: dts: kirkwood: set default pinctrl for GBE1
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (6 preceding siblings ...)
2014-04-30 12:56 ` [PATCH 07/15] ARM: dts: kirkwood: consolidate common pinctrl settings Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 09/15] ARM: dts: kirkwood: set default pinctrl for UART0/1 Sebastian Hesselbarth
` (7 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
On Kirkwood, there is only one valid pinctrl setting for GBE1. With
a common SoC pinctrl node, we can now set it in the node instead of
in each board file.
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-openblocks_a7.dts | 2 --
arch/arm/boot/dts/kirkwood.dtsi | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 1a7f18d5530d..622a3ca12c2d 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -207,8 +207,6 @@
ð1 {
status = "okay";
- pinctrl-0 = <&pmx_ge1>;
- pinctrl-names = "default";
ethernet1-port@0 {
phy-handle = <ðphy1>;
};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 5d412e71b9fb..fff28b71b474 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -320,6 +320,8 @@
reg = <0x76000 0x4000>;
clocks = <&gate_clk 19>;
marvell,tx-checksum-limit = <1600>;
+ pinctrl-0 = <&pmx_ge1>;
+ pinctrl-names = "default";
status = "disabled";
ethernet1-port@0 {
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 09/15] ARM: dts: kirkwood: set default pinctrl for UART0/1
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (7 preceding siblings ...)
2014-04-30 12:56 ` [PATCH 08/15] ARM: dts: kirkwood: set default pinctrl for GBE1 Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 10/15] ARM: dts: kirkwood: set default pinctrl for SPI0 Sebastian Hesselbarth
` (6 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
Most boards use the default UART0/1 pinctrl setting without RTS/CTS.
Add the pinctrl setting to the toplevel SoC UART nodes and put a note
in front of the corresponding pinctrl node to overwrite the setting
on board level. Currently, both boards using a different UART pinctrl
setting (Openblocks A6, A7) already overwrite the pinctrl node.
While at it, also fix up some status = "ok" to "okay" and again
whitespace issues on mplcec4 uart nodes.
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-db.dtsi | 4 +---
arch/arm/boot/dts/kirkwood-dns320.dts | 2 --
arch/arm/boot/dts/kirkwood-laplug.dts | 2 --
arch/arm/boot/dts/kirkwood-mplcec4.dts | 8 +++-----
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 +---
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 2 --
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 2 --
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 --
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 8 ++------
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 8 ++------
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 2 --
arch/arm/boot/dts/kirkwood-synology.dtsi | 4 ----
arch/arm/boot/dts/kirkwood-topkick.dts | 4 +---
arch/arm/boot/dts/kirkwood-ts219.dtsi | 4 ----
arch/arm/boot/dts/kirkwood.dtsi | 8 ++++++++
17 files changed, 18 insertions(+), 50 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index c723ce7ad1b8..38972b221089 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -114,8 +114,6 @@
* UART0_TX = Testpoint 66
* See the Excito Wiki for more details.
*/
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 3f30475fea11..1ac6bd9f54de 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -26,8 +26,6 @@
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 9b62f78b516b..2790f46d87e0 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -34,9 +34,7 @@
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
- status = "ok";
+ status = "okay";
};
sata@80000 {
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index 3210daeb264c..d85ef0a91b50 100644
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -52,8 +52,6 @@
};
serial@12100 {
- pinctrl-0 = <&pmx_uart1>;
- pinctrl-names = "default";
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 4f7741184f98..4c91fbb084c5 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -38,8 +38,6 @@
ocp@f1000000 {
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 414024c578e8..79796c8b9c4f 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -90,11 +90,9 @@
};
- serial@12000 {
- status = "ok";
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
- };
+ serial@12000 {
+ status = "okay";
+ };
rtc@10300 {
status = "disabled";
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 52b80b108f8e..acbebc6dc169 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -75,9 +75,7 @@
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
- status = "ok";
+ status = "okay";
};
ehci@50000 {
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index c4741699605c..fd733c63bc27 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -113,8 +113,6 @@
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
index 8437f3e3b8d7..b514d643fb6c 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
@@ -120,8 +120,6 @@
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 46eb8f6b6243..696b208b676f 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -20,8 +20,6 @@
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index fd1c8b535e28..1e056b3b1817 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -19,15 +19,11 @@
ocp@f1000000 {
serial@12000 {
- status = "ok";
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
+ status = "okay";
};
serial@12100 {
- status = "ok";
- pinctrl-0 = <&pmx_uart1>;
- pinctrl-names = "default";
+ status = "okay";
};
sata@80000 {
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 622a3ca12c2d..07f6bf6aba91 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -31,15 +31,11 @@
ocp@f1000000 {
serial@12000 {
- status = "ok";
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
+ status = "okay";
};
serial@12100 {
- status = "ok";
- pinctrl-0 = <&pmx_uart1>;
- pinctrl-names = "default";
+ status = "okay";
};
sata@80000 {
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index a015af4da9a2..e2c43aecc7b2 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -45,8 +45,6 @@
};
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index e137bd4e26fd..370af7f69319 100644
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -277,14 +277,10 @@
serial@12000 {
status = "okay";
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
};
serial@12100 {
status = "okay";
- pinctrl-0 = <&pmx_uart1>;
- pinctrl-names = "default";
};
poweroff@12100 {
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 5bc57efbee99..14b12189d464 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -86,9 +86,7 @@
};
serial@12000 {
- status = "ok";
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
+ status = "okay";
};
sata@80000 {
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 414d2246b37c..21cb9aeb2455 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -36,13 +36,9 @@
};
serial@12000 {
status = "okay";
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
};
serial@12100 {
status = "okay";
- pinctrl-0 = <&pmx_uart1>;
- pinctrl-names = "default";
};
poweroff@12100 {
compatible = "qnap,power-off";
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index fff28b71b474..f92c8c4e3908 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -98,6 +98,10 @@
marvell,function = "twsi0";
};
+ /*
+ * Default UART pinctrl setting without RTS/CTS,
+ * overwrite marvell,pins on board level if required.
+ */
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
@@ -167,6 +171,8 @@
reg-shift = <2>;
interrupts = <33>;
clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_uart0>;
+ pinctrl-names = "default";
status = "disabled";
};
@@ -176,6 +182,8 @@
reg-shift = <2>;
interrupts = <34>;
clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_uart1>;
+ pinctrl-names = "default";
status = "disabled";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 10/15] ARM: dts: kirkwood: set default pinctrl for SPI0
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (8 preceding siblings ...)
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
2014-04-30 12:56 ` [PATCH 11/15] ARM: dts: kirkwood: set default pinctrl for NAND Sebastian Hesselbarth
` (5 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
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
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 11/15] ARM: dts: kirkwood: set default pinctrl for NAND
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (9 preceding siblings ...)
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
2014-04-30 12:56 ` [PATCH 12/15] ARM: dts: kirkwood: set default pinctrl for I2C0 Sebastian Hesselbarth
` (4 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
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
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 12/15] ARM: dts: kirkwood: set default pinctrl for I2C0
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (10 preceding siblings ...)
2014-04-30 12:56 ` [PATCH 11/15] ARM: dts: kirkwood: set default pinctrl for NAND Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 13/15] ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282 Sebastian Hesselbarth
` (3 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
There is only one valid pinctrl setting for I2C0 on Kirkwood. Now that we
have the setting in the common SoC pinctrl, move it to the I2C0 controller
node directly and remove it from the individual boards.
While at it, also fix up status = "okay" to "ok" on one board's I2C0 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-laplug.dts | 2 --
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 --
arch/arm/boot/dts/kirkwood-synology.dtsi | 2 --
arch/arm/boot/dts/kirkwood-topkick.dts | 4 +---
arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 --
arch/arm/boot/dts/kirkwood.dtsi | 2 ++
6 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 642755acf2fe..92c2d3c16546 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -42,8 +42,6 @@
};
i2c@11000 {
- pinctrl-0 = <&pmx_twsi0>;
- pinctrl-names = "default";
status = "okay";
eeprom@50 {
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index c10ff0f5290b..e6863ed87d76 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -42,8 +42,6 @@
};
i2c@11000 {
- pinctrl-0 = <&pmx_twsi0>;
- pinctrl-names = "default";
status = "okay";
eeprom@50 {
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index a21419f78bee..811e0971fc58 100644
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -257,8 +257,6 @@
i2c@11000 {
status = "okay";
clock-frequency = <400000>;
- pinctrl-0 = <&pmx_twsi0>;
- pinctrl-names = "default";
rs5c372: rs5c372@32 {
status = "disabled";
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index a4dd47acf98a..f5c8c0dd41dc 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -95,9 +95,7 @@
};
i2c@11000 {
- status = "ok";
- pinctrl-0 = <&pmx_twsi0>;
- pinctrl-names = "default";
+ status = "okay";
};
mvsdio@90000 {
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 539a2f80a3ad..df7f15276575 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -26,8 +26,6 @@
i2c@11000 {
status = "okay";
clock-frequency = <400000>;
- pinctrl-0 = <&pmx_twsi0>;
- pinctrl-names = "default";
s35390a: s35390a@30 {
compatible = "s35390a";
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index caafcde88f67..0399a096e324 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -170,6 +170,8 @@
interrupts = <29>;
clock-frequency = <100000>;
clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_twsi0>;
+ pinctrl-names = "default";
status = "disabled";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 13/15] ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (11 preceding siblings ...)
2014-04-30 12:56 ` [PATCH 12/15] ARM: dts: kirkwood: set default pinctrl for I2C0 Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 12:56 ` [PATCH 14/15] ARM: dts: kirkwood: set Guruplug ethernet PHY compatible Sebastian Hesselbarth
` (2 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
Currently, the only 6282-based Kirkwood boards that use I2C1 are Openblocks
A6/A7. Both use the same default I2C1 pinctrl setting from kirkwood-6282.dtsi.
Move the pinctrl setting to the I2C1 node directly and put a note in front of
the corresponding pinctrl node to overwrite the setting on board level.
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-6282.dtsi | 6 ++++++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 --
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 --
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index b869f48cac02..4680eec990f0 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -68,6 +68,10 @@
marvell,function = "sata1";
};
+ /*
+ * Default I2C1 pinctrl setting on mpp36/mpp37,
+ * overwrite marvell,pins on board level if required.
+ */
pmx_twsi1: pmx-twsi1 {
marvell,pins = "mpp36", "mpp37";
marvell,function = "twsi1";
@@ -101,6 +105,8 @@
interrupts = <32>;
clock-frequency = <100000>;
clocks = <&gate_clk 7>;
+ pinctrl-0 = <&pmx_twsi1>;
+ pinctrl-names = "default";
status = "disabled";
};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 00c2e5a9d863..3dcb5c26b78b 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -33,8 +33,6 @@
i2c@11100 {
status = "okay";
- pinctrl-0 = <&pmx_twsi1>;
- pinctrl-names = "default";
s35390a: s35390a@30 {
compatible = "s35390a";
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index bc07aa5e6698..4e10e92b7822 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -45,8 +45,6 @@
i2c@11100 {
status = "okay";
- pinctrl-0 = <&pmx_twsi1>;
- pinctrl-names = "default";
s24c02: s24c02@50 {
compatible = "24c02";
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 14/15] ARM: dts: kirkwood: set Guruplug ethernet PHY compatible
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (12 preceding siblings ...)
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 ` 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
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
Ethernet PHY compatible shall be "ethernet-phy-ieee802.3-c22" and
"ethernet-phy-idAAAA.BBBB" if PHY OUI id is known. We know it for
the PHY found on Guruplug, so set it accordingly.
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-guruplug-server-plus.dts | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 871a5f8afb01..f6f15e2910ed 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -101,12 +101,16 @@
status = "okay";
ethphy0: ethernet-phy@0 {
- compatible = "marvell,88e1121";
+ /* Marvell 88E1121R */
+ compatible = "ethernet-phy-id0141.0cb0",
+ "ethernet-phy-ieee802.3-c22";
reg = <0>;
};
ethphy1: ethernet-phy@1 {
- compatible = "marvell,88e1121";
+ /* Marvell 88E1121R */
+ compatible = "ethernet-phy-id0141.0cb0",
+ "ethernet-phy-ieee802.3-c22";
reg = <1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 15/15] ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (13 preceding siblings ...)
2014-04-30 12:56 ` [PATCH 14/15] ARM: dts: kirkwood: set Guruplug ethernet PHY compatible Sebastian Hesselbarth
@ 2014-04-30 12:56 ` Sebastian Hesselbarth
2014-04-30 16:49 ` [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Andrew Lunn
15 siblings, 0 replies; 30+ messages in thread
From: Sebastian Hesselbarth @ 2014-04-30 12:56 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
Ethernet PHYs found on Globalscale Guruplug are connected by RGMII-ID.
Set the corresponding phy-connection-type property accordingly.
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-guruplug-server-plus.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index f6f15e2910ed..c5a1fc75c7a3 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -105,6 +105,7 @@
compatible = "ethernet-phy-id0141.0cb0",
"ethernet-phy-ieee802.3-c22";
reg = <0>;
+ phy-connection-type = "rgmii-id";
};
ethphy1: ethernet-phy@1 {
@@ -112,6 +113,7 @@
compatible = "ethernet-phy-id0141.0cb0",
"ethernet-phy-ieee802.3-c22";
reg = <1>;
+ phy-connection-type = "rgmii-id";
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 00/15] Kirkwood DT fix and cleanup round 1
2014-04-30 12:56 [PATCH 00/15] Kirkwood DT fix and cleanup round 1 Sebastian Hesselbarth
` (14 preceding siblings ...)
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 ` Andrew Lunn
15 siblings, 0 replies; 30+ messages in thread
From: Andrew Lunn @ 2014-04-30 16:49 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Jason Cooper, Andrew Lunn, Gregory Clement,
Thomas Petazzoni, devicetree, linux-arm-kernel, linux-kernel
On Wed, Apr 30, 2014 at 02:56:27PM +0200, Sebastian Hesselbarth wrote:
> This is a patch set starting Kirkwood DT cleanup since over time some
> cleanup potential piled up on it. Also, now that Barebox is going to
> reuse the same DT code basis, we need some lowlevel property
> improvements, that we ignore(d) on Linux up to now.
>
> The patches are based on recent mvebu/dt to ease integration by Jason
> since there are some Kirkwood dts related patches already queued up
> for v3.16.
>
> The first patch is a real fix and should be treated accordingly. We
> moved pcie-controller nodes to mbus node a while ago. Somehow, we missed
> two boards that should have broken pcie since then. A formal Tested-by
> would be nice by someone who has one of the affected boards.
>
> Basically, cleanup patches 2-13 up to now comprise:
> - Patch 2 adds node labels for all common and SoC-specific nodes to ease
> further cleanup series I have in mind:
> MVEBU maintainers will know, current ocp@f1000000 isn't really correct
> but should be moved to mbus/internal-regs instead. Unfortunately, there
> are some 40+ boards replaying ocp bus node.
> I _plan_ to convert boards ocp nodes to node label references in
> subsequent patch sets to finally move the ocp bus nodes to
> mbus/internal-regs more easily.
> - Patch 3 adds stdout-path to all boards with ttyS0 bootargs:
> Linux currently doesn't really care about stdout-path property set, but
> Barebox does. ePAPR explicitly names it, so set it now and ease Barebox
> progress at least.
> - Patch 4 removes clock-frequency from UART nodes:
> Back when we didn't have DT clock providers for Kirkwood, TCLK was
> spread over UART nodes in board files. Just remove the now unnecessary
> clock-frequency property, as we reference TCLK in the SoCs UART nodes.
> - Patches 5-7 consolidate common pinctrl settings:
> First, rename the pinctrl node to a more appropriate name as recommended
> by ePAPR, then add a minimal stub to the toplevel SoC DT include. That
> stub then gets filled with common pinctrl settings that are currently
> spead over SoC-specific includes or even board files. Again, this also
> eases Barebox progress, as pinctrl for a bootloader is a really
> important property.
> - Patches 8-13 set default pinctrl properties for some nodes:
> With pinctrl settings in common SoC DT, we can now reference them in the
> device nodes also located there. If there are other possible pinctrl
> settings, put a note in front of the corresponding pinctrl node and
> overwrite the pinctrl setting in the board file.
> - Patches 14 and 15 set some lowlevel properties for Guruplug ethernet:
> While working with Barebox, I noticed missing phy-connection-type
> and non-standard PHY's compatible on Guruplug. This also applies to
> most of the other boards, but Guruplug is the only board I use Barebox
> on and have the required information.
>
> Overall commit stats aren't as bad as I initially thought:
> 218 insertions and 300 deletions still is ~25% less LOC :)
Hi Sebastian
Apart from the one patch i raised a question about:
Acked-by: Andrew Lunn <andrew@lunn.ch>
Over the weekend i will try to do some testing with the hardware i
have.
Thanks
Andrew
^ permalink raw reply [flat|nested] 30+ messages in thread