From patchwork Tue Jan 26 08:09:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 12045811 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 53FBEC433E0 for ; Tue, 26 Jan 2021 08:10:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 13398206FB for ; Tue, 26 Jan 2021 08:10:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13398206FB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=FTz62xeMdPtxnoUPDaVJ0CpmYBMVcQPb/6SjWDi9L34=; b=2ax3JHVmPVh5zxhZts29kis4X7 2ABRgbx4mMfCTnBXBJM6MC9dEElrF3hD5kfrGdcrb2wJRGLPINRDgYhmxebbk8wZm8lh+i65g0pvk 4TgW0VgamrLXGfIF6yKlYjXyn2nQCABG2SYINJ37VNZM6TecwqTw4HR4NL/82fyQ5YdXvIQtu4ixJ +AvryzyAnOT/qwKdnImaukAhUjxzDuvpAtD/ewBFp4n8cWI2GkyZ9k5lu/XTPb7TKlne8NG11gW2/ sj5sxRgkbgX/zzIhyMTprMCNEnspM6TidqehW5cFrhK8h3ggO7UZzY1KMB9p9xVu5MBWWBDwtNla0 7gHBTvzg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4JQL-0000kO-Rs; Tue, 26 Jan 2021 08:10:05 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4JQF-0000i4-Kp for linux-amlogic@lists.infradead.org; Tue, 26 Jan 2021 08:10:02 +0000 Received: by mail-wm1-x32c.google.com with SMTP id c128so1888285wme.2 for ; Tue, 26 Jan 2021 00:09:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKVzDfUlQORvUNQIyh1sGOYZQD9pBhXKJEodxKHGxUE=; b=FIogEhBVacSyx3uxTnBOjRkSnqfQvJa/Qf5CS/5ZgsfB4pQr+sePDse0GY2rMFTiyl f7VkQzsEhci/6CxECtBB5SMWVKuIV8sSvmOfqQzfEgKZMyZYM+KXR8rdGDegzssF92I7 4bFDwCVMi+SsBwHT5tbrlw958MYAG6fnvTptqZPcpVocBA8xtPjegGp/WFmT1t3hwmlV fAk4ZTwy+v0y36yz0hxbKwx5jDq2EXlwiT+mERdbmDJV0s7fvFZWnrSzCSdx6DYGzgWG qqwY2MkWxo2b8VKMqzBmi20cbBZzWr4402fu5eMeKXW6tq76fQ1cBIwAEaydSxcNlkev hXhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKVzDfUlQORvUNQIyh1sGOYZQD9pBhXKJEodxKHGxUE=; b=CAsx/pDe1Wkrg53BpIfArfLGu0xTVtrX+k3qJEPElhL4clbL326g3ncxj8ff63Lshg DkPxSd60klfleBYFcK44tOaNZiXDe5RHTijn4H2+sDzx/k8totpXW+QYNX0kLj3ll/GT ImYxnbZwhbaWjRkLfjVkm0c/w9D4TMIwsph2UvgT58iwN6Cq47y/2gNJcD8i5SWrPHRB PAlIY6/1W23Y0twkj/l8PWc4t963TFHUUIRwsa5CO1L7NqY5T1K7VWFyU+6JYeJbsCO7 WYqgnWfcURM1hJMONs44JemCkrrhix+vM0upJTqpu6voybMfPyvnMxV/VeDyONlwrlty CPAQ== X-Gm-Message-State: AOAM531XB9pQEgCAWVJIcdNSy3EtNHARoMMFYCaARJ113ftBHq/fgGOR 5v95xGNmAyeNt2YPthdIO6Qkpw== X-Google-Smtp-Source: ABdhPJzxiu4+Dwy4IN/+uDif4C1jKhZe+OrFq076G7xg19pOJbsxiSm/zf1EhIGBd+IGBWHNbYNy3g== X-Received: by 2002:a1c:1d12:: with SMTP id d18mr3381888wmd.121.1611648597861; Tue, 26 Jan 2021 00:09:57 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:90c:e290:485d:4b34:2d87:12d5]) by smtp.gmail.com with ESMTPSA id t25sm2061228wmj.39.2021.01.26.00.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 00:09:57 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH] Revert "arm64: dts: amlogic: add missing ethernet reset ID" Date: Tue, 26 Jan 2021 09:09:51 +0100 Message-Id: <20210126080951.2383740-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210126_030959_883512_4216614A X-CRM114-Status: GOOD ( 12.37 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , linux-kernel@vger.kernel.org, Corentin Labbe , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, =?utf-8?b?SsOpcsO0bWUgQnJ1bmV0?= Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org It has been reported on IRC and in KernelCI boot tests, this change breaks internal PHY support on the Amlogic G12A/SM1 Based boards. We suspect the added signal to reset more than the Ethernet MAC but also the MDIO/(RG)MII mux used to redirect the MAC signals to the internal PHY. This reverts commit f3362f0c18174a1f334a419ab7d567a36bd1b3f3 while we find and acceptable solution to cleanly reset the Ethernet MAC. Reported-by: Corentin Labbe Acked-by: Jérôme Brunet Signed-off-by: Neil Armstrong --- Hi Kevin, This has been reported to also break on 5.10, when this lands on 5.11, I'll send another patch for 5.10 because meson-axg.dtsi needs a conflict resolution on 5.11. Jerome gave me his ack off-list. Neil arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 --- 3 files changed, 7 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index ba1c6dfdc4b6..d945c84ab697 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -280,8 +280,6 @@ ethmac: ethernet@ff3f0000 { "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 9c90d562ada1..851eeb5e9de1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -224,8 +224,6 @@ ethmac: ethernet@ff3f0000 { "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; status = "disabled"; mdio0: mdio { diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 726b91d3a905..0edd137151f8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -13,7 +13,6 @@ #include #include #include -#include #include / { @@ -576,8 +575,6 @@ ethmac: ethernet@c9410000 { interrupt-names = "macirq"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>; status = "disabled"; };