From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miquel Raynal 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 Message-ID: <20190306102146.13005-11-miquel.raynal@bootlin.com> References: <20190306102146.13005-1-miquel.raynal@bootlin.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20190306102146.13005-1-miquel.raynal@bootlin.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Mark Rutland , Jens Axboe , Hans de Goede , Thomas Gleixner , Marc Zyngier Cc: devicetree@vger.kernel.org, Baruch Siach , Antoine Tenart , Maxime Chevallier , Nadav Haklai , linux-ide@vger.kernel.org, Thomas Petazzoni , Miquel Raynal , linux-arm-kernel@lists.infradead.org List-Id: linux-ide@vger.kernel.org From: Thomas Petazzoni 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 Signed-off-by: Miquel Raynal --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5EEFC43381 for ; Wed, 6 Mar 2019 10:23:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75A9C20675 for ; Wed, 6 Mar 2019 10:23:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Zi9qtyEK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75A9C20675 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k3JT7s2AelwVZj7OedCd2oX7KzsqYFbImQqlo1XsAXA=; b=Zi9qtyEKZbFHxq 2RK6O9Hix6UBOokfYersmG5ar5knlULSDv5I6s9I2dj6SxzFOmvmStzJmgnD6x/SvmqWIY5G8wGSB ppYnvKRAVtmZC0fe3oKRloN4QItpKtUOTXFlOYwlxpA8Nxao6fnxiskQXpyAZsJ1GBVHs2+FL/CGS CL8R11JtYNMKpQGstj8Ock2IvAAn2cgBUWzrD0VSDEAFc1HBZuzJMuhrqcA6esW7QCzvluMIiGpfH 5fzQgCFOVFpsyp8qqExKENr1hAdFpShdfK0f8XyLdvlyhRJNl4rFIc6TePcSXQ1dulKt8QZe8Zczn nuswUfCP0JVkNzz8GPBw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1TiJ-0004Ca-B8; Wed, 06 Mar 2019 10:23:51 +0000 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1Tgx-0002S8-Tl for linux-arm-kernel@lists.infradead.org; Wed, 06 Mar 2019 10:22:48 +0000 X-Originating-IP: 90.88.150.179 Received: from localhost.localdomain (aaubervilliers-681-1-31-179.w90-88.abo.wanadoo.fr [90.88.150.179]) (Authenticated sender: miquel.raynal@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id ECE65FF813; Wed, 6 Mar 2019 10:22:22 +0000 (UTC) From: Miquel Raynal To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Mark Rutland , Jens Axboe , Hans de Goede , Thomas Gleixner , Marc Zyngier 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 Message-Id: <20190306102146.13005-11-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190306102146.13005-1-miquel.raynal@bootlin.com> References: <20190306102146.13005-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190306_022228_842545_91C934D9 X-CRM114-Status: GOOD ( 12.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Baruch Siach , Antoine Tenart , Maxime Chevallier , Nadav Haklai , linux-ide@vger.kernel.org, Thomas Petazzoni , Miquel Raynal , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Thomas Petazzoni 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 Signed-off-by: Miquel Raynal --- 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel