From patchwork Mon Feb 13 22:25:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban X-Patchwork-Id: 727610 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vMgCX4bNPz9s7Z for ; Tue, 14 Feb 2017 09:27:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750983AbdBMW1S (ORCPT ); Mon, 13 Feb 2017 17:27:18 -0500 Received: from smtp6-g21.free.fr ([212.27.42.6]:17049 "EHLO smtp6-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750753AbdBMW1S (ORCPT ); Mon, 13 Feb 2017 17:27:18 -0500 Received: from localhost.localdomain (unknown [78.54.29.3]) (Authenticated sender: albeu) by smtp6-g21.free.fr (Postfix) with ESMTPA id 92FEF780371; Mon, 13 Feb 2017 23:26:55 +0100 (CET) From: Alban To: linux-kernel@vger.kernel.org Cc: Alban Bedel , Rob Herring , Mark Rutland , Ralf Baechle , Antony Pavlov , devicetree@vger.kernel.org, linux-mips@linux-mips.org Subject: [PATCH v5 3/3] MIPS: ath79: Fix the USB PHY reset names Date: Mon, 13 Feb 2017 23:25:46 +0100 Message-Id: <1487024746-32082-3-git-send-email-albeu@free.fr> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487024746-32082-1-git-send-email-albeu@free.fr> References: <1487024746-32082-1-git-send-email-albeu@free.fr> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Alban Bedel The binding for the USB PHY went thru before the driver. However the new version of the driver now use the PHY core support for reset, and this expect the reset to be named "phy". So remove the "usb-" prefix from the the reset names. Signed-off-by: Alban Bedel Acked-by: Rob Herring --- Changelog: v5: * Also fix the AR9331 dtsi --- Documentation/devicetree/bindings/phy/phy-ath79-usb.txt | 4 ++-- arch/mips/boot/dts/qca/ar9132.dtsi | 2 +- arch/mips/boot/dts/qca/ar9331.dtsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt b/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt index cafe219..c3a29c5 100644 --- a/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt +++ b/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt @@ -3,7 +3,7 @@ Required properties: - compatible: "qca,ar7100-usb-phy" - #phys-cells: should be 0 -- reset-names: "usb-phy"[, "usb-suspend-override"] +- reset-names: "phy"[, "suspend-override"] - resets: references to the reset controllers Example: @@ -11,7 +11,7 @@ Example: usb-phy { compatible = "qca,ar7100-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; + reset-names = "phy", "suspend-override"; resets = <&rst 4>, <&rst 3>; #phy-cells = <0>; diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi index 302f0a8..808c2bb 100644 --- a/arch/mips/boot/dts/qca/ar9132.dtsi +++ b/arch/mips/boot/dts/qca/ar9132.dtsi @@ -160,7 +160,7 @@ usb_phy: usb-phy { compatible = "qca,ar7100-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; + reset-names = "phy", "suspend-override"; resets = <&rst 4>, <&rst 3>; #phy-cells = <0>; diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi index cf47ed4..4ffa3e8 100644 --- a/arch/mips/boot/dts/qca/ar9331.dtsi +++ b/arch/mips/boot/dts/qca/ar9331.dtsi @@ -145,7 +145,7 @@ usb_phy: usb-phy { compatible = "qca,ar7100-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; + reset-names = "phy", "suspend-override"; resets = <&rst 4>, <&rst 3>; #phy-cells = <0>;