From: "Pali Rohár" <pali@kernel.org>
To: "Jason Cooper" <jason@lakedaemon.net>,
"Andrew Lunn" <andrew@lunn.ch>,
"Gregory Clement" <gregory.clement@bootlin.com>,
"Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Andrew Murray" <amurray@thegoodpenguin.co.uk>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Remi Pommarel" <repk@triplefau.lt>,
"Marek Behún" <marek.behun@nic.cz>,
"Tomasz Maciej Nowak" <tmn505@gmail.com>,
Xogium <contact@xogium.me>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org
Subject: [PATCH v4 11/12] arm64: dts: marvell: armada-37xx: Move PCIe comphy handle property
Date: Thu, 30 Apr 2020 10:06:24 +0200 [thread overview]
Message-ID: <20200430080625.26070-12-pali@kernel.org> (raw)
In-Reply-To: <20200430080625.26070-1-pali@kernel.org>
From: Marek Behún <marek.behun@nic.cz>
Move the comphy handle property of the PCIe node from board specific
device tree files (EspressoBin and Turris Mox) to the generic
armada-37xx.dtsi.
This is correct since this is the only possible PCIe PHY configuration
on Armada 37xx, so when PCIe is enabled on any board, this handle is
correct.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 1 -
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 1 -
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index c92ad664cb0e..b97218c72727 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -44,7 +44,6 @@
/* J9 */
&pcie0 {
status = "okay";
- phys = <&comphy1 0>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>;
reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index e496bd9d4737..15c1cf5c5b69 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -134,7 +134,6 @@
status = "okay";
max-link-speed = <2>;
reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;
- phys = <&comphy1 0>;
/* enabled by U-Boot if PCIe module is present */
status = "disabled";
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 7909c146eabf..5aaad64a793d 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -493,6 +493,7 @@
<0 0 0 2 &pcie_intc 1>,
<0 0 0 3 &pcie_intc 2>,
<0 0 0 4 &pcie_intc 3>;
+ phys = <&comphy1 0>;
pcie_intc: interrupt-controller {
interrupt-controller;
#interrupt-cells = <1>;
--
2.20.1
next prev parent reply other threads:[~2020-04-30 8:07 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 8:06 [PATCH v4 00/12] PCI: aardvark: Fix support for Turris MOX and Compex wifi cards Pali Rohár
2020-04-30 8:06 ` [PATCH v4 01/12] PCI: aardvark: Train link immediately after enabling training Pali Rohár
2020-05-04 15:50 ` Bjorn Helgaas
2020-05-07 21:05 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 02/12] PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register Pali Rohár
2020-05-07 21:07 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 03/12] PCI: of: Zero max-link-speed value is invalid Pali Rohár
2020-05-07 21:07 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 04/12] PCI: aardvark: Improve link training Pali Rohár
2020-05-07 21:10 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 05/12] PCI: aardvark: Issue PERST via GPIO Pali Rohár
2020-04-30 8:22 ` Pali Rohár
2020-05-07 21:20 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 06/12] PCI: aardvark: Add FIXME comment for PCIE_CORE_CMD_STATUS_REG access Pali Rohár
2020-05-07 21:20 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 07/12] PCI: aardvark: Add PHY support Pali Rohár
2020-05-07 21:23 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 08/12] PCI: aardvark: Replace custom macros by standard linux/pci_regs.h macros Pali Rohár
2020-05-04 15:52 ` Bjorn Helgaas
2020-05-07 21:24 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 09/12] dt-bindings: PCI: aardvark: Describe new properties Pali Rohár
2020-05-07 21:25 ` Rob Herring
2020-04-30 8:06 ` [PATCH v4 10/12] arm64: dts: marvell: armada-37xx: Set pcie_reset_pin to gpio function Pali Rohár
2020-04-30 8:06 ` Pali Rohár [this message]
2020-04-30 8:06 ` [PATCH v4 12/12] arm64: dts: marvell: armada-37xx: Move PCIe max-link-speed property Pali Rohár
2020-05-04 15:50 ` Bjorn Helgaas
2020-05-08 13:11 ` [PATCH v4 00/12] PCI: aardvark: Fix support for Turris MOX and Compex wifi cards Tomasz Maciej Nowak
2020-05-13 11:16 ` Pali Rohár
2020-05-13 11:33 ` Lorenzo Pieralisi
2020-05-13 11:59 ` Pali Rohár
2020-05-13 11:56 ` Thomas Petazzoni
2020-05-17 15:57 ` Gregory CLEMENT
2020-05-18 10:30 ` Pali Rohár
2020-05-18 13:46 ` Lorenzo Pieralisi
2020-05-18 13:50 ` Marek Behun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200430080625.26070-12-pali@kernel.org \
--to=pali@kernel.org \
--cc=amurray@thegoodpenguin.co.uk \
--cc=andrew@lunn.ch \
--cc=bhelgaas@google.com \
--cc=contact@xogium.me \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.behun@nic.cz \
--cc=repk@triplefau.lt \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tmn505@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).