From patchwork Sun May 21 12:48:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralph Sennhauser X-Patchwork-Id: 9739043 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 AE02460328 for ; Sun, 21 May 2017 12:53:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C83E28634 for ; Sun, 21 May 2017 12:53:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F7B1286D7; Sun, 21 May 2017 12:53:31 +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=ham 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 20EEC28634 for ; Sun, 21 May 2017 12:53:31 +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: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=/VbmWJ8YsUkaEypy40ZjmhG7OIgTu1sliZtrTVcQOz4=; b=uRZw1+k+Ka1B7SLFRchecD1CyW Y5c2s2sfbTCVwxNyYdPbhHAavhb1989HJU6kuy6Z/wpEbxhiTYTRcegAdouF5ouaxKE5l1ZK70+ut znFwlSh25pCkPm9NHrd2AfiBtLyYZYo8zAK7RfyWwRrc5Q4tx6KWSs4r1+KXWnSu5O6PuHcDVRBgw zD97/Iq6otxl5f4gh7lkG2tB9AfHkdiz8U9EYpZM+DSp4pl4xIgI/m6cCjy5GSkNRdoGDs7hLxxh4 lw5qD3ykTPxRLXnDVceh4sxkOB3WtXLMwKVMddH4w5v9V1P5+cdGs6QdYEgEeyTLgkRCfT7GlKxq4 eR8mOPRA==; 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 1dCQMU-0001AU-3Y; Sun, 21 May 2017 12:53:30 +0000 Received: from mail-vk0-x244.google.com ([2607:f8b0:400c:c05::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dCQJ1-0004qV-Hz for linux-arm-kernel@lists.infradead.org; Sun, 21 May 2017 12:49:57 +0000 Received: by mail-vk0-x244.google.com with SMTP id x71so3908647vkd.2 for ; Sun, 21 May 2017 05:49:35 -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:in-reply-to:references; bh=7xqyp4Gvkx7UCyNXIFcGXY0LOP7KvJLtrXv7owUuHxQ=; b=mS5TlS+wPSEhsa1dI+edugXpXdtaBgrIof/IOPRWX298XK+i6q6wjNf7s/Ub2oC4eJ 9bMABUYPIYWfOgV7De8nf0MBVXtM4lpvG8BDiCGPxhgGjWb52pAEiDLnuyDxorhwmu2y zlavBLPOXUFzJ70J6H5AedvoxC7mdBjMv62uUMrI+R4WRrkQvb2nXX5dYnTcqurrSXJP 6pru5FhcOijru6+gHeUK2odhhrV2vCecjUSnSLlILDDdQCXBDSCvHJP+h5y9ySb+jEBy x4bhlz1pYwV296BsER1xyKqkUsp1nUstiqwqXsUtApaIXblXhdZIliuKK2YQLhO3HvD/ 6K7Q== 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=7xqyp4Gvkx7UCyNXIFcGXY0LOP7KvJLtrXv7owUuHxQ=; b=j22+fnqhQOMx/9XsYbENLc4lpCfU6IBc/BblZZ4rJ7ohf1wywe0XQuJZ3+UkjbuFW8 FF6M10KB/yMc+4zEbMYhZ+4Aq8+NS4QwCoekO4omfZ3xrw3H1J0Err3hTBmF94/CGgnz qQBaW97HEGGZ9TYPRqWt/8I6+7VW9XKO534nt+bkbuF7qFmc8ghCGy9d1CAzVx7Jx6Zd LrmZgltfRW5KgMC2JyPOTEq/x6/aTNJJhC1/imjK44t2WqYzbsu6OsJf4bPhGnJsaluM +jCaYE9TMDkSmKutX99nmWE4jzOkidXd2XCID9etqRhbk3wf+qOy+WIJmD5cc67yr60G lwww== X-Gm-Message-State: AODbwcClGeQ+1NKYA3pFc19W1pZxYfdM45soWsQomMb28uGTaFqr6Hpn gxSCwqkYQFu20g== X-Received: by 10.31.74.66 with SMTP id x63mr6124676vka.74.1495370975248; Sun, 21 May 2017 05:49:35 -0700 (PDT) Received: from localhost.lan ([37.209.189.139]) by smtp.googlemail.com with ESMTPSA id q17sm2803410uab.7.2017.05.21.05.49.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 May 2017 05:49:34 -0700 (PDT) From: Ralph Sennhauser To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup Date: Sun, 21 May 2017 14:48:55 +0200 Message-Id: <20170521124903.11050-7-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170521124903.11050-1-ralph.sennhauser@gmail.com> References: <20170521124903.11050-1-ralph.sennhauser@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170521_054955_713952_5F9771C2 X-CRM114-Status: GOOD ( 11.26 ) 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, Ralph Sennhauser , Rob Herring , Gregory Clement , Imre Kaloz , 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 Now that we use the reference for the USB3.0 port update the node name and labels for the phy and vbus to match the label used by armada-38x.dtsi. Signed-off-by: Ralph Sennhauser --- Notes: Going by documentation regulator-name is only of informative nature so changing it should be a non issue. --- arch/arm/boot/dts/armada-385-linksys.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index 932fca4..6cc1ec7 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -63,16 +63,16 @@ MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>; }; - usb3_phy: usb3_phy { + usb3_1_phy: usb3_1-phy { compatible = "usb-nop-xceiv"; - vcc-supply = <®_xhci0_vbus>; + vcc-supply = <&usb3_1_vbus>; }; - reg_xhci0_vbus: xhci0-vbus { + usb3_1_vbus: usb3_1-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; - pinctrl-0 = <&xhci0_vbus_pins>; - regulator-name = "xhci0-vbus"; + pinctrl-0 = <&usb3_1_vbus_pins>; + regulator-name = "usb3_1-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; @@ -371,7 +371,7 @@ marvell,function = "gpio"; }; - xhci0_vbus_pins: xhci0-vbus-pins { + usb3_1_vbus_pins: usb3_1-vbus-pins { marvell,pins = "mpp50"; marvell,function = "gpio"; }; @@ -393,5 +393,5 @@ &usb3_1 { status = "okay"; - usb-phy = <&usb3_phy>; + usb-phy = <&usb3_1_phy>; };