Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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
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
Cc: Pawel Moll
Cc: Mark Rutland
Cc: Ian Campbell
Cc: Kumar Gala
Cc: Russell King
Cc: Jason Cooper
Cc: Andrew Lunn
Cc: Gregory Clement
Cc: Thomas Petazzoni
Cc: devicet...@vger.kernel.org
Cc: linux-arm-ker...@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@f100 {
pinctrl@1 {
pmx_usb_led: pmx-usb-led {
@@ -73,14 +83,6 @@
ehci@5 {
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@f100 {
pinctrl: pinctrl@1 {
@@ -51,14 +61,6 @@
status = "okay";
nr-ports = <2>;
};
-
- pcie-controller {
- status = "okay";
-
- pcie@1,0 {
- status = "okay";
- };
- };
};
gpio_poweroff {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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.hesselba...@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...@kernel.org
Cc: Pawel Moll pawel.m...@arm.com
Cc: Mark Rutland mark.rutl...@arm.com
Cc: Ian Campbell ijc+devicet...@hellion.org.uk
Cc: Kumar Gala ga...@codeaurora.org
Cc: Russell King li...@arm.linux.org.uk
Cc: Jason Cooper ja...@lakedaemon.net
Cc: Andrew Lunn and...@lunn.ch
Cc: Gregory Clement gregory.clem...@free-electrons.com
Cc: Thomas Petazzoni thomas.petazz...@free-electrons.com
Cc: devicet...@vger.kernel.org
Cc: linux-arm-ker...@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@f100 {
pinctrl@1 {
pmx_usb_led: pmx-usb-led {
@@ -73,14 +83,6 @@
ehci@5 {
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@f100 {
pinctrl: pinctrl@1 {
@@ -51,14 +61,6 @@
status = okay;
nr-ports = 2;
};
-
- pcie-controller {
- status = okay;
-
- pcie@1,0 {
- status = okay;
- };
- };
};
gpio_poweroff {
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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
> ---
> Cc: Rob Herring
> Cc: Pawel Moll
> Cc: Mark Rutland
> Cc: Ian Campbell
> Cc: Kumar Gala
> Cc: Russell King
> Cc: Jason Cooper
> Cc: Andrew Lunn
> Cc: Gregory Clement
> Cc: Thomas Petazzoni
> Cc: devicet...@vger.kernel.org
> Cc: linux-arm-ker...@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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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.hesselba...@gmail.com --- Cc: Rob Herring robh...@kernel.org Cc: Pawel Moll pawel.m...@arm.com Cc: Mark Rutland mark.rutl...@arm.com Cc: Ian Campbell ijc+devicet...@hellion.org.uk Cc: Kumar Gala ga...@codeaurora.org Cc: Russell King li...@arm.linux.org.uk Cc: Jason Cooper ja...@lakedaemon.net Cc: Andrew Lunn and...@lunn.ch Cc: Gregory Clement gregory.clem...@free-electrons.com Cc: Thomas Petazzoni thomas.petazz...@free-electrons.com Cc: devicet...@vger.kernel.org Cc: linux-arm-ker...@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. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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
---
Cc: Rob Herring
Cc: Pawel Moll
Cc: Mark Rutland
Cc: Ian Campbell
Cc: Kumar Gala
Cc: Russell King
Cc: Jason Cooper
Cc: Andrew Lunn
Cc: Gregory Clement
Cc: Thomas Petazzoni
Cc: devicet...@vger.kernel.org
Cc: linux-arm-ker...@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@f100 {
pinctrl@1 {
pmx_usb_led: pmx-usb-led {
@@ -73,14 +83,6 @@
ehci@5 {
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@f100 {
pinctrl: pinctrl@1 {
@@ -51,14 +61,6 @@
status = "okay";
nr-ports = <2>;
};
-
- pcie-controller {
- status = "okay";
-
- pcie@1,0 {
- status = "okay";
- };
- };
};
gpio_poweroff {
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes
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.hesselba...@gmail.com
---
Cc: Rob Herring robh...@kernel.org
Cc: Pawel Moll pawel.m...@arm.com
Cc: Mark Rutland mark.rutl...@arm.com
Cc: Ian Campbell ijc+devicet...@hellion.org.uk
Cc: Kumar Gala ga...@codeaurora.org
Cc: Russell King li...@arm.linux.org.uk
Cc: Jason Cooper ja...@lakedaemon.net
Cc: Andrew Lunn and...@lunn.ch
Cc: Gregory Clement gregory.clem...@free-electrons.com
Cc: Thomas Petazzoni thomas.petazz...@free-electrons.com
Cc: devicet...@vger.kernel.org
Cc: linux-arm-ker...@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@f100 {
pinctrl@1 {
pmx_usb_led: pmx-usb-led {
@@ -73,14 +83,6 @@
ehci@5 {
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@f100 {
pinctrl: pinctrl@1 {
@@ -51,14 +61,6 @@
status = okay;
nr-ports = 2;
};
-
- pcie-controller {
- status = okay;
-
- pcie@1,0 {
- status = okay;
- };
- };
};
gpio_poweroff {
--
1.9.1
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
