From patchwork Tue Nov 19 05:18:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179658 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp158337ilf; Mon, 18 Nov 2019 21:37:22 -0800 (PST) X-Google-Smtp-Source: APXvYqxC3r+I47dXPPb1RSbl7XpsVm/a+mQnOd5F8OjNPOigfGxjtFbD9ccGaxPXNt8/UEWhu0wV X-Received: by 2002:a17:906:2615:: with SMTP id h21mr32632184ejc.212.1574141842539; Mon, 18 Nov 2019 21:37:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141842; cv=none; d=google.com; s=arc-20160816; b=kiJZJs9WhcaSg9FZIBSUgRt2u/nEuAcR3CPTUeDZLs54IHtNMU5hFeIBmQ66uWmlKP tAcLS0eJmwlhhoSBUxjb8LY0H3iIRq88Y1d8d7frTjyDpIQ33fPk1SryHHNnyB298sdn 1Vmylk3+ETRBp2+7XhJj9ZXf99fOLibnGnVBeY7CgXqSW3hTwjvv0jYShqfWqZBslBIR gryUbPYkv1WZJxob4YjaPsE0GjLjH7K1aji+S5A/2qd2aQdtQdirpqml4MvduHLu1I/5 ZQX55iOQTD2pTAH/YXEDXQlAaNcXwjU10pBVhelDglcYGg+DEqCju8kPM4FCivC1Eo+b oXGA== 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=5LhnykrKd4/2kcH/uJTSJVXfpfxjNmkpRkkOXDQIZes=; b=gAqopWpwQq3860jpjy1pLWZ+ggQPX29yW2Pp+q0YphRJ0VPStj4c2g5KpSEvHTaYMP 1/FTt0vtyxEeckhTSnc6S+25rUJfG4liUt52twvMYT7re+5mlbfX13lVDx6XCwFmRdTH DhvUxZTmSjio1hf1fpkcGAdR9HxYmQF7kjpra/3wu5JeNNulR8LEfYtku0W6pdiU9T9m Kn/R7lw2xU7FQolluipj2pV1eWC7laok2NVPbPUDhYDw31Wuo9DNyKTk1Gl6PCATv4Jy lo1SYd93cnP8yrUmKf1FaRYoepkbmWAjO8UXouSwX48REZ5nq/JQ5yqEOLCHlqp0l15G 3E0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dvQKEFJx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 d20si13083669ejk.173.2019.11.18.21.37.22; Mon, 18 Nov 2019 21:37:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=dvQKEFJx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729452AbfKSFhT (ORCPT + 26 others); Tue, 19 Nov 2019 00:37:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:58942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727137AbfKSFhN (ORCPT ); Tue, 19 Nov 2019 00:37:13 -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 E492221823; Tue, 19 Nov 2019 05:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141833; bh=VHqwNr/2MI7GULDENmCysXqgEJ5Gz68MXJ5DolXPSlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dvQKEFJxYricu7D1larYF6UuD0qcjc1yHzVqO7SllOlh3tsPoYdPaVIjua7qOwQtM 0NiLHmMqBpX9w2TSZdBBXud6+t5S/3gzL+leHTGOrivdnmnS62U2EI4xKPNyw5ZjPg 9s72HrrN5YPu/l8Pq5SZr8AdymGusLQF5LhxL+KU= 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.19 296/422] ARM: dts: am335x-evm: fix number of cpsw Date: Tue, 19 Nov 2019 06:18:13 +0100 Message-Id: <20191119051418.171853121@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 20bbb899b3b76..cc59e42c91342 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -731,6 +731,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -738,15 +739,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"; };