From patchwork Tue Nov 19 05:19:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179708 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp171555ilf; Mon, 18 Nov 2019 21:53:09 -0800 (PST) X-Google-Smtp-Source: APXvYqyflGS454ISHa3lIyzzyutbk7dJxRCGk0AM8oFrpN2cRiASx+b0Jt876UVhMvAXH0OtQrMI X-Received: by 2002:a17:906:e8f:: with SMTP id p15mr32762199ejf.113.1574142676743; Mon, 18 Nov 2019 21:51:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142676; cv=none; d=google.com; s=arc-20160816; b=PTSRCsSKE4KrN4WYsGmJgaudgayYrpNwWu3uf4FfaV4ITpBrbqWtLVCNL/A9HNpwOi 5ZoRC2JJK1FhtSRFHqSKItPPGLT4g9CFEBpLRp+HBxisc4jvLRTzIIl2stMKSHxHmyQ3 qLETUhFkI7EZldLdUWDIOg5xn4xQtVmkpBCDq6Oo78Mqdjg5aafxrDCl9t24CpNuSGWE b5xS9RWBf/NznR5/FF5OTfm4Wa05vpM3z0oWz1JzNUxe1LRbJtwwe3AYXn7pjYxC7VLl fZ2NnlE/N6GDEr8ZpazTuL1ZfcospSOEklMa5AEc/gatbS2FBAn4IP9oxiN409tLDIhJ 65Bg== 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=r3oyrnNC0f8RY4ZOo6C5s4ypsWZKrPDOIQzNM7r4CE8=; b=ZPcToJwAJlNOOt4IKz7//w9IpMmCcQSppHxPMcf8f5ABGfs1/saqWCaWuJDI3k+lOU GuZgj2lxCFTiburZ2KqIiCUeN4zdpWMK7+FLVxC5nb9dLz9UfWCcjI3w6tDX53A444U0 15RCTS0u4iTE2xpUykp21ueShtTxbkVnjuMzHyp+rItEAfCs0RXwFSv+QHkDvJ7wmnLd dBWvE6iTL2yDWirn8qk7eg8891OG5Pi6POR8iHiw/zvbuuwN6D5GZoA/toBzPEwCUrw4 RjcnHql4KJEEUd+pGSKA7ypIrot43lrcRk0s0EezhasZCCMKCdrV+Q9nKrDrD870eJIR PRXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QWLCsn2O; 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 g27si13525615ejc.219.2019.11.18.21.51.15; Mon, 18 Nov 2019 21:51:16 -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=QWLCsn2O; 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 S1731752AbfKSFvM (ORCPT + 26 others); Tue, 19 Nov 2019 00:51:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:48530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731151AbfKSFvL (ORCPT ); Tue, 19 Nov 2019 00:51:11 -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 DEB18208C3; Tue, 19 Nov 2019 05:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142670; bh=q4tBSuVCw5ZqWJJuSnB2wXUj3FJfplMx+MeJUnBneKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QWLCsn2Ow2A03p8zvpZtuJ0z8o/R5O12B4FMI3CDapMdR3qVnhJphg/trM8WOHv0Q MuvqqhWpki/T6jdbX3aunBRPNv7xwMMO7LWTU3DIqBghSMxb3xceKkyZitrBDDrPWE fOyBaYNqKk+B+VO5ixbEbfOAAtd2HUkH8mHwoZmU= 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.14 159/239] ARM: dts: am335x-evm: fix number of cpsw Date: Tue, 19 Nov 2019 06:19:19 +0100 Message-Id: <20191119051333.264951714@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@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 478434ebff92d..27ff3e689e96e 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -724,6 +724,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -731,15 +732,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"; };