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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 3502CC433DF for ; Mon, 3 Aug 2020 12:44:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D95D2054F for ; Mon, 3 Aug 2020 12:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596458675; bh=vAxzeYpt3RHpAX4UhPRpNJ9KK0OUFER8Jhy8mlyxlIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Pxn1Yxv7by1UITVoqCVmwohs9e7gJP7GNJ4LIdwNJS/Dc32crTh4DtHyJnj44j9Qo iDG08m3oW/ixyLkNC19lVuS+sGM5+yzrabYqaYhj1gy8CMJqVd1Di+O1H4H1urQzKv PVPD+vXY5Aee67aLKF9JKlFqtuIRjCL7n2bB1dV8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728177AbgHCMoe (ORCPT ); Mon, 3 Aug 2020 08:44:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:54100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728127AbgHCM2G (ORCPT ); Mon, 3 Aug 2020 08:28:06 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2D838204EC; Mon, 3 Aug 2020 12:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596457685; bh=vAxzeYpt3RHpAX4UhPRpNJ9KK0OUFER8Jhy8mlyxlIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rcI5EngO4o1puj6d+qsr7IKl0Pc/ZqN8F9/Of5Kyg4AZpasqMVfZMCTfbNpPiNHAx O4ksXs4ytwGK2HeJzYeRUm25sncOCR23uUdKH4p6q78kEj5vbKkL9Ar2Jvy/vVjfIy lo7KrVZg8W3cIZFo7Gyot55fuQfHLNNq52g5aboc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King , Andrew Lunn , Gregory CLEMENT , Sasha Levin Subject: [PATCH 5.4 38/90] ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds Date: Mon, 3 Aug 2020 14:19:00 +0200 Message-Id: <20200803121859.460654407@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200803121857.546052424@linuxfoundation.org> References: <20200803121857.546052424@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King [ Upstream commit 09781ba0395c46b1c844f47e405e3ce7856f5989 ] To support the change in "phy: armada-38x: fix NETA lockup when repeatedly switching speeds" we need to update the DT with the additional register. Fixes: 14dc100b4411 ("phy: armada38x: add common phy support") Signed-off-by: Russell King Reviewed-by: Andrew Lunn Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- arch/arm/boot/dts/armada-38x.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 3f4bb44d85f00..669da3a33d82c 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -339,7 +339,8 @@ comphy: phy@18300 { compatible = "marvell,armada-380-comphy"; - reg = <0x18300 0x100>; + reg-names = "comphy", "conf"; + reg = <0x18300 0x100>, <0x18460 4>; #address-cells = <1>; #size-cells = <0>; -- 2.25.1