From patchwork Fri Nov 22 10:27:17 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: 179973 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp25601ilf; Fri, 22 Nov 2019 02:43:19 -0800 (PST) X-Google-Smtp-Source: APXvYqx23t6DeTBgwDJUJH7x3QuLGlKFY1MApBQkS5nUMd6LSQLlOjkdY0GqKOSjJIiXGE1eE0Xp X-Received: by 2002:aa7:df8e:: with SMTP id b14mr224759edy.59.1574419399183; Fri, 22 Nov 2019 02:43:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419399; cv=none; d=google.com; s=arc-20160816; b=rxvswex+Kcxts3Nb1Jv5aY4n047e5AjMlVMt3wO+NpsaEo9VA/tgFcqI+KhymtwmG9 283/FgOF1jrih9J4lBZfjI2sfhnECylK+bp3czF6STySYWQIZ8y0iY0Ub/d3w7BCnitF 7mxoirtymXbyjz25XBpIfxzoYwEhuNjlapeOdOMZLYQAYIFEZxXH/dcaJ/N74rf/RHYx DxBS4Q4IDMfvB109K+7TAYycHIR/J03/zsZ2IEMXDj75EpcGugl22Xy6JwUCT2tyzS7/ yt8pHq1qFEdiGnkX+kvxaBgHgEjQOeOuUWyiYR9l3tBxblYZ3ko5jdQ72LVhECwvY7sv N/lw== 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=o7sjLLQZIXaCICQsK3aXSvKmKYweHPNvDNDb5NV2te4=; b=Jg/xFg7B1gIeRMwtIf10+ATRGQD99sE7uAgWtthxg1VU6exgQ2GgvTNlTECwIxLIjI CHaDU0ONDt2WD2gv5CcHCFIOz1cSW2VHsFHUH/h7P0RGohNgHEilcFubHFH/gVCMZc0F +WJF2ZSaLq5+whrAcn4K0evH5w3XVuqxou24Ho0BJ86lVUhn5vxNDIlLB+/+pzVYAcv1 1WD6AUmkDBrGfSwWQl6Hvg/Rb+4RYOeQPFGY/PAHUF8Amf29oS/9ZD3VvkvGZrZ4sxnv bVz4SJXZl6fXdKYG+EqKNPERYlw8GKGnMpGNeXUfMee3NmEfPomG6upGe3i5CeuD0Rlz zpdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZtbLd7Ef; 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 h49si795175edh.2.2019.11.22.02.43.19; Fri, 22 Nov 2019 02:43:19 -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=ZtbLd7Ef; 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 S1729196AbfKVKnQ (ORCPT + 15 others); Fri, 22 Nov 2019 05:43:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:48814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729194AbfKVKnP (ORCPT ); Fri, 22 Nov 2019 05:43:15 -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 7D53120718; Fri, 22 Nov 2019 10:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419395; bh=ikEzlp6skgbt7ucgJUk6QMGS3qo27ru8EhTypd6fYVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZtbLd7Ef0iV6zj+jJot5crIla8FyM82q7U+Mqon0O5KB11vQZS0IjeSSBh5W6VJnN Kib2lVX553VyKo7BSJhKaJD9oQX7QnPiTuBf6XmxE0s2Fy207NH24Ik51+5RjA55Kb vNM4FVjHF6+62TGvxea1Fh8WHtYu4xhCZ2U7jx3A= 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.9 097/222] ARM: dts: am335x-evm: fix number of cpsw Date: Fri, 22 Nov 2019 11:27:17 +0100 Message-Id: <20191122100910.440822090@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 e82432c79f85f..3f3ad09c7cd5f 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -701,6 +701,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -708,15 +709,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"; };