From patchwork Sat Apr 8 10:16:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralph Sennhauser X-Patchwork-Id: 9671001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD1FC6020F for ; Sat, 8 Apr 2017 10:17:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA00C2844B for ; Sat, 8 Apr 2017 10:17:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC43928471; Sat, 8 Apr 2017 10:17:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 450BA2844B for ; Sat, 8 Apr 2017 10:17:09 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=SM/HYghIhlUMn6A5wngjadGsfwNuU+O7U+3bu0mSHZM=; b=L1i kfZhazbnREZJjQZuxEoXWbv15wZJT03vEkk7QVOzE+rYbvoGf5peFHpjs1749lff8HAnORYVbUENP 6V9jfuMxiX8wuNOpUmhD+m6IZALTHA7A+DRzBmFwjfo7wuafhIDgNfZYPpAw2oV4K4W7VDugSAWRO l3DaCrWVNhbLheE1r64NgKvFxkTjQ15nH3059cwVLt7m7rbQfr5LuOamEA1X3KIcAAnH8vze8summ /J3I2QfM8qFmP0dUmI3PEm0BsdzWXm67S1NBVVyyNBowG2adHjX6ZcK3IklgqPHJxUMuidZ0hIG8Y 8wB3j/1m1exBOjzllGT/ByEx5q+1qsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cwnQV-0005lv-PM; Sat, 08 Apr 2017 10:17:03 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cwnQR-0005Yr-P5 for linux-arm-kernel@lists.infradead.org; Sat, 08 Apr 2017 10:17:01 +0000 Received: by mail-wm0-x242.google.com with SMTP id q125so1934146wmd.3 for ; Sat, 08 Apr 2017 03:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=QsDwMqMiDbn8bUXu7OMkz1g5UD9kMUBErEkv9wfIVSo=; b=BfUVQy0SHJU65OU7gPxK1mqCM9J76iP8hGr1LMe+n/ZKngfHqnyAk5IBNaRLWJ9/Sa gALgEgVdf4dctSYKrIBRRskL7nGoVo9lY6QyEHf5CRJUkrFL6ku1xI/MivC/V/mR93y4 PsdgCr9AtkIpE69VKUDxTdD/hjnurK4rWmwKY6vRh65R6hawSWHXu8G/3RCRjqtyFRVt PI67gmxXOTMyIWpPH0L7ksh1qwzEYHU8YnAxRrk3ig/J0txbGO0pEZPmhQvafwx2Q86X /qEsJvXDZkNmA+xmK/nuI3TDFA8iyhrA3FKFxWthi9biuBCGHYOvvPfsOgdZnbEbpJDX 1TcA== 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; bh=QsDwMqMiDbn8bUXu7OMkz1g5UD9kMUBErEkv9wfIVSo=; b=llDcpQrR29RgI3KuuXJO7BqYGurSD7Hcvyt9V8f9YvsqeEAGAx6azusNgTS3vaACRp W02nWiO0uY7H9TvOjF2GZc8lNEc+2MLJFUxiGkwDJetwVkidB4ONxvKcl/FxiND2qlPt TtlCh0/A7ozzJgOtO6sf/kCWvURn3nwxyX4XaHnuSBZYOmOu1Y8wV4pSGGMQ2+5zYbKx JhWb/ry1t/0zg7uMkJoiP94i3QSujJGAN0wBRa3Bvh/4ab5Gju7bGu4yUx0uI+bcapJ6 lkfLu4sNi0fzszghXw6qjyISz5OVdDw5dlQYeGx2lhhHMVYzqGOVQy6aIIYq28iqkYr3 tvIQ== X-Gm-Message-State: AN3rC/63kmWc60Khr/Z8jORLBIXBx++RBqkycnQKB9t+BVof9ExC964SL7lEsIRSLSoc4w== X-Received: by 10.28.238.213 with SMTP id j82mr525133wmi.43.1491646597333; Sat, 08 Apr 2017 03:16:37 -0700 (PDT) Received: from localhost.lan ([37.209.189.139]) by smtp.googlemail.com with ESMTPSA id w52sm9349412wrc.14.2017.04.08.03.16.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Apr 2017 03:16:36 -0700 (PDT) From: Ralph Sennhauser To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] ARM: dts: armada-38x: label USB and SATA nodes Date: Sat, 8 Apr 2017 12:16:26 +0200 Message-Id: <20170408101626.14032-1-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170408_031659_973182_E6ABF82F X-CRM114-Status: GOOD ( 11.79 ) 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: Mark Rutland , Andrew Lunn , Jason Cooper , devicetree@vger.kernel.org, Russell King , linux-kernel@vger.kernel.org, Gregory Clement , Rob Herring , Ralph Sennhauser , Sebastian Hesselbarth MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Recently most nodes got labels to make them referenceable. The USB 3.0 nodes as well as the nodes for the SATA controllers were left out, rectify the omission. The labels "sataX" are already used by some boards for the SATA ports, therefore use "ahciX" to label the SATA controller nodes. To avoid potential confusion by labeling an USB3.0 controller "usb2" use usb3_X as labels. This also coincides with the node names themselves (usb@xxxxx vs usb3@xxxxx). Signed-off-by: Ralph Sennhauser --- Hi everybody, Using satacX for controllers with satacXpY for ports might have been a possiblity, since ahciX is already used similarly (to avoid a conflict with current use of sataX) ahciX seems the better choice. Works well me thinks. The usb3_X labels still seem the best choice even though they aren't perfectly consitent, however, I don't see an alternative which would fit this requirement either. Regards Ralph --- Changes v1 -> v2: * use ahciX instead of satacX for the SATA controller nodes (suggested by Andrew Lunn) arch/arm/boot/dts/armada-38x.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index ba27ec1..8b165c3 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -530,7 +530,7 @@ interrupts = ; }; - sata@a8000 { + ahci0: sata@a8000 { compatible = "marvell,armada-380-ahci"; reg = <0xa8000 0x2000>; interrupts = ; @@ -546,7 +546,7 @@ status = "disabled"; }; - sata@e0000 { + ahci1: sata@e0000 { compatible = "marvell,armada-380-ahci"; reg = <0xe0000 0x2000>; interrupts = ; @@ -590,7 +590,7 @@ status = "disabled"; }; - usb3@f0000 { + usb3_0: usb3@f0000 { compatible = "marvell,armada-380-xhci"; reg = <0xf0000 0x4000>,<0xf4000 0x4000>; interrupts = ; @@ -598,7 +598,7 @@ status = "disabled"; }; - usb3@f8000 { + usb3_1: usb3@f8000 { compatible = "marvell,armada-380-xhci"; reg = <0xf8000 0x4000>,<0xfc000 0x4000>; interrupts = ;