From patchwork Fri Nov 22 10:27:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180051 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp79354ilf; Fri, 22 Nov 2019 03:26:40 -0800 (PST) X-Google-Smtp-Source: APXvYqymXIaifmZZ3TqU9fpISTxyR/s+FSg+9QoYYEkOtp37q//a/ht2lVSni5UKLQOytZ8rCPkf X-Received: by 2002:a05:6402:329:: with SMTP id q9mr422687edw.76.1574422000305; Fri, 22 Nov 2019 03:26:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574422000; cv=none; d=google.com; s=arc-20160816; b=hOTz4mqZGR5wrPOefIup2gUXK6jt5DL/IZ+jza+7jR95g7Y8xuRCdsfH5lqkK5hSQ9 UgzTld4yDhbyT7g1iPiXdcxN96f4n0SWrEkS3LXkP2jcKJ4xD33ZK0thzXXbzipCCQeI fEWwvZhHum1sR17szKO1kauUfQDXiJkXvKG9u34rBTKpIig8tdO8pVSKvcYulV3GA68t pV5M/hiIfn2/QsRw9M7ghszONADm1iyVXWuHY6sdhPacQr8FQT8EnkmVIrglDaQP8Q58 vELosEEstRGIgT/Wp6H5qhU0byHLUxVzLedMSBTK6C51STpRvVJuDzjokw7kTVLRBliW EetA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dXwcyjp8ybMyUgZ9HCsecp9D0ciZyehEG/Z+Dcw5X3k=; b=XGY1XTdQ5uoykV2wbMB5Bj4GYgBT9jPLWdODiE0BdpU1OuolKlMAR/UmFTG5gRaitd qcHGm7pdNKwYaiMqV2RQamyYahx3h1EZlx7BUmWO98fpXdFs+ZSkgm6YT87jLmrWgx3m BvvaIpYZa6Iqm8a4y4/vKA0CYf8OZORdHuw095rn//ApxVY6hrgIyriUht/VuUeMk74T YsLjggN6gKoLK0qUvTyNE4Qruet4GBCRZDqxjw/n0MAv7+kXfsVOWTCsep3ZQQylkieu Jp6/qECZyX5bNyB5nlZrDqfhkBf12qQIANyKMZ6psSavyuVSg6Kp75kXCSPA+Eqs138S ivHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AziTzzy1; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rn10si4122716ejb.325.2019.11.22.03.26.40; Fri, 22 Nov 2019 03:26:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AziTzzy1; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727603AbfKVL0h (ORCPT + 15 others); Fri, 22 Nov 2019 06:26:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:58072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726984AbfKVKeI (ORCPT ); Fri, 22 Nov 2019 05:34:08 -0500 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 E129920656; Fri, 22 Nov 2019 10:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418847; bh=wFarCmC1vgEJ83u0SNHI/6bTj2VuSACrgAQl9SOjl9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AziTzzy1jeP3ExBoO2HQG5T2OnVtjRuXxekg99FlgqQ2gBp0nLnzjyRSt91aLdeUl 749XEcT5C5/2a97SS2fNT9wIAnUoy/h5LAOgKguHt0B/rS2M1YNSyn9uVX+E7W9JFS nHW1oMkWXvipjQj2hcd2/z5BpnHTYw+pJL+3WEwQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Grygorii Strashko , Tony Lindgren , Sasha Levin Subject: [PATCH 4.4 070/159] ARM: dts: am335x-evm: fix number of cpsw Date: Fri, 22 Nov 2019 11:27:41 +0100 Message-Id: <20191122100756.409105340@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Grygorii Strashko [ Upstream commit dcbf6b18d81bcdc51390ca1b258c17e2e13b7d0c ] am335x-evm has only one CPSW external port physically wired, but DT defines 2 ext. ports. As result, PHY connection failure reported for the second ext. port. Update DT to reflect am335x-evm board HW configuration, and, while here, switch to use phy-handle instead of phy_id. Signed-off-by: Grygorii Strashko Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/am335x-evm.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index d9d00ab863a21..2b8614e406f03 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -697,6 +697,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -704,15 +705,14 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; status = "okay"; -}; -&cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; - phy-mode = "rgmii-txid"; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; }; -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; +&cpsw_emac0 { + phy-handle = <ðphy0>; phy-mode = "rgmii-txid"; };