Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3083812ybj; Mon, 23 Sep 2019 14:32:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqx9GNkR1R0BkfmW8HQ9Vly9jkLSSJuuuX72Gm7j61qLZnKniNA7r4Z5TyRnE8deM4bhVdn7 X-Received: by 2002:aa7:c657:: with SMTP id z23mr2326956edr.234.1569274331519; Mon, 23 Sep 2019 14:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569274331; cv=none; d=google.com; s=arc-20160816; b=u830OJLsBic+qWC3AnEmR/y8MFFBUXwLRDFjHt42p3ToJTmRqOUI63se25BdoGuB0w /aCugR6NwNZae31X4FRAW6zvOuIA4zNrM96ibYC098oOKxyl7A0tV58hUgUgYJhu/tw8 IjYP5BzVBCChnyzCl1WqbY2efDqhAazxrNDzyNpeg0RxHl0+Cp9pRAP7WvB3VFRORjIB 2GmIyZfuTAbrszZiZedVSvAXUsD785hUeZAdkJ+Eyt5JgpjXT5HjtpKBUHV8utDcBfD+ s8rJrpT5Sd74IGZmDDfHXudzXPPU1WP8JAdeCiZLsQGvkan63vimxo0q2SUX75vxZ4oY oeyg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hsymEG0XqGg5P/mPcdxxp3X44l7mFLacs7FvWC48FO0=; b=0AP8ebS4//hX/LF8sp0nNWZT7w+5qw1LLkxBCDOjIY2sRcWJ9QAvy+dnbCnO3iAr98 bznoUkN9Y8JMyBdqwaDuK37eWoHmDmGHDxrfuQ1/WN+SezA6oD0RzQry/zVUsmfqt8C3 C1zv6futtf4++PlvJBejFW/OviyVemuSzKEsTj3Pu6EANE+LK/HnOJNRjQpcV8oEs6UV i2TNRiWqY44M690eRloxmlqcgrB5K0FZJBXLZiiIX+2zIBhSGVT8lXUrNbg1iohsR9pV bONEx3O1A3rZGbOlZmnNLy8GWCgE5lcnBH3CbTXLAGrmAhR87B/Y4rfLKZOJ6FdefuWx mMmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wo2+l2ko; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y20si7490111edo.436.2019.09.23.14.31.47; Mon, 23 Sep 2019 14:32:11 -0700 (PDT) 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=wo2+l2ko; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390226AbfIVSqr (ORCPT + 99 others); Sun, 22 Sep 2019 14:46:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:42970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390057AbfIVSqm (ORCPT ); Sun, 22 Sep 2019 14:46:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D46C6208C2; Sun, 22 Sep 2019 18:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178001; bh=Obtjp4ZwBmT/y2TVxxCzMnVGIK54jgwwUKhCZT0umyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wo2+l2ko6hl07Ck97ORlyh+Cks+oMevLoSAELWdw8L9XLWBMLPr4GF+UYuIVnlAFw tIUterq1w8susn0/WH+s+Z1QWxYCMPGEkqZ+hjpAv+2X2oCRmzMeGRDoSqYnik1t2v 7SbsVXF6P+wDijtSHLtlHDR5jA508tMkDjUqPxUc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Andr=C3=A9=20Draszik?= , Ilya Ledvich , Igor Grinberg , Rob Herring , Mark Rutland , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sasha Levin Subject: [PATCH AUTOSEL 5.3 090/203] ARM: dts: imx7d: cl-som-imx7: make ethernet work again Date: Sun, 22 Sep 2019 14:41:56 -0400 Message-Id: <20190922184350.30563-90-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: AndrĂ© Draszik [ Upstream commit 9846a4524ac90b63496580b7ad50674b40d92a8f ] Recent changes to the atheros at803x driver caused ethernet to stop working on this board. In particular commit 6d4cd041f0af ("net: phy: at803x: disable delay only for RGMII mode") and commit cd28d1d6e52e ("net: phy: at803x: Disable phy delay for RGMII mode") fix the AR8031 driver to configure the phy's (RX/TX) delays as per the 'phy-mode' in the device tree. This now prevents ethernet from working on this board. It used to work before those commits, because the AR8031 comes out of reset with RX delay enabled, and the at803x driver didn't touch the delay configuration at all when "rgmii" mode was selected, and because arch/arm/mach-imx/mach-imx7d.c:ar8031_phy_fixup() unconditionally enables TX delay. Since above commits ar8031_phy_fixup() also has no effect anymore, and the end-result is that all delays are disabled in the phy, no ethernet. Update the device tree to restore functionality. Signed-off-by: AndrĂ© Draszik CC: Ilya Ledvich CC: Igor Grinberg CC: Rob Herring CC: Mark Rutland CC: Shawn Guo CC: Sascha Hauer CC: Pengutronix Kernel Team CC: Fabio Estevam CC: NXP Linux Team CC: devicetree@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts index e61567437d73c..62d5e9a4a7818 100644 --- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts +++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts @@ -44,7 +44,7 @@ <&clks IMX7D_ENET1_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <100000000>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy0>; fsl,magic-packet; status = "okay"; @@ -70,7 +70,7 @@ <&clks IMX7D_ENET2_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <100000000>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy1>; fsl,magic-packet; status = "okay"; -- 2.20.1