From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Gregory Clement <gregory.clement@bootlin.com>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Jens Axboe <axboe@kernel.dk>,
Hans de Goede <hdegoede@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Marc Zyngier <marc.zyngier@arm.com>
Cc: devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
Antoine Tenart <antoine.tenart@bootlin.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Nadav Haklai <nadavh@marvell.com>,
linux-ide@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 10/10] arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts
Date: Wed, 6 Mar 2019 11:21:46 +0100 [thread overview]
Message-ID: <20190306102146.13005-11-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20190306102146.13005-1-miquel.raynal@bootlin.com>
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
There are two SATA ports per CP110. Each of them has a dedicated
interrupt. Describe the real hardware by adding two SATA ports to the
CP110 SATA node and enabling them in all the DTs including it
(7040-db/8040-db/8040-clearfog).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
arch/arm64/boot/dts/marvell/armada-7040-db.dts | 7 ++++++-
.../dts/marvell/armada-8040-clearfog-gt-8k.dts | 5 ++++-
arch/arm64/boot/dts/marvell/armada-8040-db.dts | 14 ++++++++++++--
arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 16 ++++++++++++++--
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 412efdb46e7c..54c1c0ddc813 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -194,7 +194,12 @@
};
&cp0_sata0 {
- status = "okay";
+ sata-port@0 {
+ status = "okay";
+ };
+ sata-port@1 {
+ status = "okay";
+ };
};
&cp0_usb3_0 {
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
index 5b4a9609e31f..16fc76ef7804 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
@@ -335,7 +335,10 @@
&cp1_sata0 {
pinctrl-0 = <&cp0_pci1_reset_pins>;
- status = "okay";
+
+ sata-port@1 {
+ status = "okay";
+ };
};
&cp1_mdio {
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 1bac437369a1..988cc7dc15d9 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -147,7 +147,12 @@
/* CON4 on CP0 expansion */
&cp0_sata0 {
- status = "okay";
+ sata-port@0 {
+ status = "okay";
+ };
+ sata-port@1 {
+ status = "okay";
+ };
};
/* CON9 on CP0 expansion */
@@ -279,7 +284,12 @@
/* CON4 on CP1 expansion */
&cp1_sata0 {
- status = "okay";
+ sata-port@0 {
+ status = "okay";
+ };
+ sata-port@1 {
+ status = "okay";
+ };
};
/* CON9 on CP1 expansion */
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index b9d9f31e3ba1..f27edddcacd1 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -292,10 +292,22 @@
"generic-ahci";
reg = <0x540000 0x30000>;
dma-coherent;
- interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&CP110_LABEL(clk) 1 15>,
<&CP110_LABEL(clk) 1 16>;
- status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ sata-port@0 {
+ reg = <0>;
+ interrupts = <109 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ sata-port@1 {
+ reg = <1>;
+ interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
};
CP110_LABEL(xor0): xor@6a0000 {
--
2.19.1
next prev parent reply other threads:[~2019-03-06 10:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 10:21 [PATCH v2 00/10] Enable per-port SATA interrupts and drop an hack in the IRQ subsystem Miquel Raynal
2019-03-06 10:21 ` [PATCH v2 01/10] ata: libahci: Ensure the host interrupt status bits are cleared Miquel Raynal
2019-03-07 16:25 ` Marc Zyngier
2019-03-07 17:19 ` Miquel Raynal
2019-03-06 10:21 ` [PATCH v2 02/10] ata: ahci: Support per-port interrupts Miquel Raynal
2019-03-06 15:01 ` Hans de Goede
2019-03-07 7:58 ` Miquel Raynal
2019-03-06 10:21 ` [PATCH v2 03/10] dt-bindings: ata: Update ahci bindings with possible " Miquel Raynal
2019-03-12 19:05 ` Rob Herring
2019-03-06 10:21 ` [PATCH v2 04/10] ata: ahci: mvebu: Rename a platform data flag Miquel Raynal
2019-03-06 10:21 ` [PATCH v2 05/10] ata: ahci: mvebu: Add a parameter to a platform data callback Miquel Raynal
2019-03-06 10:21 ` [PATCH v2 06/10] dt-bindings: ata: Update ahci_mvebu bindings Miquel Raynal
2019-03-12 19:06 ` Rob Herring
2019-03-06 10:21 ` [PATCH v2 07/10] ata: ahci: mvebu: Support A8k compatible Miquel Raynal
2019-03-06 10:21 ` [PATCH v2 08/10] ata: ahci: mvebu: Add support for A8k legacy bindings Miquel Raynal
2019-03-07 16:31 ` Marc Zyngier
2019-03-06 10:21 ` [PATCH v2 09/10] irqchip/irq-mvebu-icu: Remove the double SATA ports interrupt hack Miquel Raynal
2019-03-06 10:21 ` Miquel Raynal [this message]
2019-03-06 10:30 ` [PATCH v2 10/10] arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts Baruch Siach
2019-03-06 10:34 ` Miquel Raynal
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=20190306102146.13005-11-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=andrew@lunn.ch \
--cc=antoine.tenart@bootlin.com \
--cc=axboe@kernel.dk \
--cc=baruch@tkos.co.il \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=hdegoede@redhat.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ide@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=maxime.chevallier@bootlin.com \
--cc=nadavh@marvell.com \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=tglx@linutronix.de \
--cc=thomas.petazzoni@bootlin.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).