Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1696628

[PATCH 2/3] ARM: dts: NSP: Rearrage USB entries

Path csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From Jon Mason <jon.mason@broadcom.com>
Newsgroups linux.kernel
Subject [PATCH 2/3] ARM: dts: NSP: Rearrage USB entries
Date Wed, 26 Jul 2017 00:10:01 +0200
Message-ID <u7gbD-eH-9@gated-at.bofh.it> (permalink)
References <u7gbD-eH-5@gated-at.bofh.it>
X-Original-To Florian Fainelli <f.fainelli@gmail.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>
Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pRNSvvJEV9rlzwTnY36+ejYe6zGdL+X1Kc5D2syrWFo=; b=Vru0pzaINUxFE1OP2BZyzE96XVxjp9VG/DoPqs7zTyUuUvRktldTVFYLfCgJg4W+2F 5jnUbK5ojYKeD9nnJIa0w2fosGjyEEY9euVodUhMQrz6PJTchcHTJfTERKW6D46pF2ST 4lZRz+7OtHfcaYod7guyNe0UhGERa3j+6pY4w=
X-Google-Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pRNSvvJEV9rlzwTnY36+ejYe6zGdL+X1Kc5D2syrWFo=; b=bbkOP6r0ZncGWk4UXl4hAYH+MKLoWnrT94glD53lqxMxlLc16yNPoPPZzn+Z1+K+cY ZikuE2pQTht1fBB6DXRqukqDxx64RxCQzxnyLRucntSXbnV4clrnIJJvttEhtmVyzOWP SuEpKQkFOPJzykI9LRrW9Dq7EgiTgg3oq8mMPWSxDUzJvbtsp0MpZwE3bBFiOONmKNRR qTLLLp49MH751c4yCYiW/bxkUAKodOj09/yKtjq8+PCN2oyksz/2ZE/+OMa86oEizArr wGZlMp6MLjWLFYfDz7cqhLTssORVTEUGyofJMS78ldRioUWN3H//pgXLw+IXrq/21izp 4XPg==
X-Gm-Message-State AIVw113bF3fGTPQ93uh1fcbRcmStxZ+XlUzwSXbxkp+OuqYL4pVIIjrD MjffXI0Yaiwvd316
X-Received by 10.200.2.172 with SMTP id p44mr16590409qtg.46.1501020381974; Tue, 25 Jul 2017 15:06:21 -0700 (PDT)
X-Mailer git-send-email 2.7.4
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 61
Organization linux.* mail to news gateway
X-Original-Cc bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
X-Original-Date Tue, 25 Jul 2017 18:06:11 -0400
X-Original-Message-ID <1501020372-19607-3-git-send-email-jon.mason@broadcom.com>
X-Original-References <1501020372-19607-1-git-send-email-jon.mason@broadcom.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1696628

Show key headers only | View raw


The rest of the DTSI file is in incrementing addresses, but the USB
OHCI/ECHI entries are out of sequence.  Move them to put them in the
proper place.

Signed-off-by: Jon Mason <jon.mason@broadcom.com>
---
 arch/arm/boot/dts/bcm-nsp.dtsi | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index c8d734d9f5fc..770aa2e7970c 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -303,6 +303,22 @@
 			#size-cells = <0>;
 		};
 
+		ehci0: usb@2a000 {
+			compatible = "generic-ehci";
+			reg = <0x2a000 0x100>;
+			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+			dma-coherent;
+			status = "disabled";
+		};
+
+		ohci0: usb@2b000 {
+			compatible = "generic-ohci";
+			reg = <0x2b000 0x100>;
+			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+			dma-coherent;
+			status = "disabled";
+		};
+
 		crypto@2f000 {
 			compatible = "brcm,spum-nsp-crypto";
 			reg = <0x2f000 0x900>;
@@ -327,22 +343,6 @@
 			status = "disabled";
 		};
 
-		ehci0: usb@2a000 {
-			compatible = "generic-ehci";
-			reg = <0x2a000 0x100>;
-			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
-			dma-coherent;
-			status = "disabled";
-		};
-
-		ohci0: usb@2b000 {
-			compatible = "generic-ohci";
-			reg = <0x2b000 0x100>;
-			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
-			dma-coherent;
-			status = "disabled";
-		};
-
 		rng: rng@33000 {
 			compatible = "brcm,bcm-nsp-rng";
 			reg = <0x33000 0x14>;
-- 
2.7.4

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/3] ARM: dts: NSP: dma-coherent and USB3 changes Jon Mason <jon.mason@broadcom.com> - 2017-07-26 00:10 +0200
  [PATCH 3/3] ARM: dts: NSP: Add USB3 and USB3 PHY to NSP Jon Mason <jon.mason@broadcom.com> - 2017-07-26 00:10 +0200
  [PATCH 2/3] ARM: dts: NSP: Rearrage USB entries Jon Mason <jon.mason@broadcom.com> - 2017-07-26 00:10 +0200
  [PATCH 1/3] ARM: dts: NSP: Add dma-coherent to relevant DT entries Jon Mason <jon.mason@broadcom.com> - 2017-07-26 00:10 +0200
    Re: [PATCH 1/3] ARM: dts: NSP: Add dma-coherent to relevant DT  entries Robin Murphy <robin.murphy@arm.com> - 2017-07-26 12:20 +0200
    Re: [PATCH 1/3] ARM: dts: NSP: Add dma-coherent to relevant DT  entries Florian Fainelli <f.fainelli@gmail.com> - 2017-07-29 02:10 +0200

csiph-web