Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D339C4338F for ; Fri, 20 Aug 2021 20:53:42 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7ACB56115B for ; Fri, 20 Aug 2021 20:53:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7ACB56115B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4C2482DF6; Fri, 20 Aug 2021 22:53:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id E104B82DE4; Fri, 20 Aug 2021 22:53:02 +0200 (CEST) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E4DD682DB2 for ; Fri, 20 Aug 2021 22:52:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from toolbox.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MZTNi-1mW75v26cw-00WX6r; Fri, 20 Aug 2021 22:52:45 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , Igor Opaniuk , Max Krummenacher , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v1 3/7] verdin-imx8mm: fix ethernet Date: Fri, 20 Aug 2021 22:52:26 +0200 Message-Id: <20210820205230.1369683-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:AK7acBrcXN1IsbD09X1Y9bh3sAgIURIoS/pZ/Y2MdqbXs3nFIee MoXR2mO8JNL/RzG+5khoYIcNBprGm7nkGEmMOdKFAVx8gGtVsbvyLA8jA6XJr/OyIfDoknG TW0O8idPy0mrtDOUK1PAqQoSnWISYYQ6eDQSWUVKNtHNsVD/Uz7kyilXLecupu0J+3ltpkQ UoX6SxpKCK2UXyj9nsfTA== X-UI-Out-Filterresults: notjunk:1;V03:K0:zSMcsBW7KbA=:noBJeEf4PV2pBJfG6focly r4cOBBPWlvGl7XkilN1jXDKSK9CLWbIeCLJ138NkZ0x7Qu4MmDrgKMpRe5v16RYVsT6mtY04I WDu93Mbz6X5QUGoA6h+0HOvR+ineN6hjoMKdoUtu9hwdboi584WH+sjttpOPw4Uyi8TlmJ0hr Y64HdeBZ4hmLftOyZy5QfzmeaaAsDiKdqosBfnTKD5U0foyaDdgf7ojBA6cxb/QydrylMsxcT q57ES+9H26FKcKrjiLRWTLsz1tbrwmEanqqvYbBMPUvnOqfnXNR9DdY8YoJ4Xh+Ie9npJDG3d YYq1uHO7t7ttiXPmo8TPP2VvnrQsFL8/4rXNOHwSaq421HGmEM3dsvfKAkgTFZ5p5OSEPZFn5 EOU+yYZmG3cRzs6k2jLuVREjwYXAN30UQTWpF0CmzlN3NWODZJGncXcUNT+qH148RfGRN0wTg +vSJkboKOnuFNBYYP54kz/eSnldcDTlPRIdQ7aAgCzPp+R2KPvJ4XYllXFublngMZAIeaEjr/ ybx9BlHb6+svE+TfOz44+S43cMTqTvz6XPoaWSSWG4J7D1bKvB2TCzilUSk3c7KJ3y1/kppoF spqJuGd4YZmDxVKgjS/YGbNM0smO/UFphmYnPUF0amsOcIYRk9nRMzEThoXvuTb6AXrr57IzG LGC3MEEVDHX/9s6qZ8RQeMHbSWFYq8ImpseCaZWJ1mg9+zoeEOn8pQt2/0UaMK0MzSH9JOl4q C9XLdEcr8tvGIxOsolB0mbUmdm6LNrFSyJHy8iXrbNbbesryWvcD5deAF0kXX8gs7MikjSZxm SuiBVwig3MMBQl2izIYmzfwYxSktLy1yKEQV05nH5fGHohczqMc22OeImj82lZnakiN06Qu X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Turns out Microship (formerly Micrel) meanwhile integrated proper support for the DLL setup on their KSZ9131. Unfortunately, this conflicts with our previous board code doing that. Fix this by getting rid of our board code and just relying on the generic implementation relying on rgmii-id being used as phy-mode. Fixes: commit c6df0e2ffdc4 ("net: phy: micrel: add support for DLL setup on ksz9131") Signed-off-by: Marcel Ziswiler --- arch/arm/dts/imx8mm-verdin.dts | 2 +- board/toradex/verdin-imx8mm/verdin-imx8mm.c | 64 --------------------- 2 files changed, 1 insertion(+), 65 deletions(-) diff --git a/arch/arm/dts/imx8mm-verdin.dts b/arch/arm/dts/imx8mm-verdin.dts index fb0756d6e19..ac2a4b69d3c 100644 --- a/arch/arm/dts/imx8mm-verdin.dts +++ b/arch/arm/dts/imx8mm-verdin.dts @@ -160,7 +160,7 @@ &fec1 { fsl,magic-packet; phy-handle = <ðphy0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-supply = <®_ethphy>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_fec1>; diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c index 76f4a1e209a..1644f4b3081 100644 --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c @@ -36,70 +36,6 @@ static int setup_fec(void) return 0; } - -int board_phy_config(struct phy_device *phydev) -{ - int tmp; - - switch (ksz9xx1_phy_get_id(phydev) & MII_KSZ9x31_SILICON_REV_MASK) { - case PHY_ID_KSZ9031: - /* - * The PHY adds 1.2ns for the RXC and 0ns for TXC clock by - * default. The MAC and the layout don't add a skew between - * clock and data. - * Add 0.3ns for the RXC path and 0.96 + 0.42 ns (1.38 ns) for - * the TXC path to get the required clock skews. - */ - /* control data pad skew - devaddr = 0x02, register = 0x04 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_CTRL_SIG_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x0070); - /* rx data pad skew - devaddr = 0x02, register = 0x05 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_RX_DATA_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x7777); - /* tx data pad skew - devaddr = 0x02, register = 0x06 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_TX_DATA_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x0000); - /* gtx and rx clock pad skew - devaddr = 0x02,register = 0x08 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_CLOCK_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x03f4); - break; - case PHY_ID_KSZ9131: - default: - /* read rxc dll control - devaddr = 0x2, register = 0x4c */ - tmp = ksz9031_phy_extended_read(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_RXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC); - /* disable rxdll bypass (enable 2ns skew delay on RXC) */ - tmp &= ~MII_KSZ9131_RXTXDLL_BYPASS; - /* rxc data pad skew 2ns - devaddr = 0x02, register = 0x4c */ - tmp = ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_RXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC, tmp); - /* read txc dll control - devaddr = 0x02, register = 0x4d */ - tmp = ksz9031_phy_extended_read(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_TXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC); - /* disable txdll bypass (enable 2ns skew delay on TXC) */ - tmp &= ~MII_KSZ9131_RXTXDLL_BYPASS; - /* rxc data pad skew 2ns - devaddr = 0x02, register = 0x4d */ - tmp = ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_TXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC, tmp); - break; - } - - if (phydev->drv->config) - phydev->drv->config(phydev); - return 0; -} #endif int board_init(void) -- 2.26.2