From patchwork Wed Apr 21 20:34:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 12216983 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, 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 032A9C433B4 for ; Wed, 21 Apr 2021 20:35:08 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 A19C660551 for ; Wed, 21 Apr 2021 20:35:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A19C660551 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=s5lxCsd9srjqqvFfk0KSHm2Xo2RyMRrFLw6Q0wlTNW4=; b=E0s93f4WBDhvMxQqVLc+yIOrH FtVpKQbB9wkYEMR98Yx3gWNuxO3JORqoJeJ1K/+H/3gLdd10CMSqUZ0fWaNntcHJyHDgeuYVmr95s QQIm2TOJAkWFkk/co+QKRKqfBBUmmqmDq2jRRonX97aVu+vzuWYYyENjpZq4iI9CwaRT8WkNozNVI mrxz0ve63ovOtBFmcNKTYSf+ds2FuJn0iAJnFCbDN1p1YDqUbigbxCLHSvqVFZDeGe6rUM/VxVie8 7PySo7mlCQ4hlqIdmtpQLaPVmhx4xYcdcTGk0pd7O8AKdqS6SPQUk249Aw4EsJd4Mjb1U63ZCM5wM 2fJ0YJ4rg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZJYp-00F9cI-VC; Wed, 21 Apr 2021 20:35:00 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZJYK-00F9Mh-Ta for linux-rockchip@desiato.infradead.org; Wed, 21 Apr 2021 20:34:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=eyYYKBuSn9/rqlWKFXNALsqLxgALBvxdvI87GeINYNo=; b=OebR00xtdQf71VxmEnZAIYQmjf 3YrRhc7Blrd6kXP/SwiUD54xQb/7zHysgx21k90omUQcF1RKIGUwrH7qZ5odcwIg9A7zJFaRwZib5 zsaj2oSwbDEvbQ41B20acaaVJzk9tAMAEXV6nSireHgWQ9I0jKW34NNVIDbV9pu6JxcmYHITVe5gJ sSZQ6plArkxMAHe9ltQSQPIifq/dAO2f353qzfk5z7IPFulnOEINLlGJOyayNgwyuUgswESRz4CYY TTWKTk57OedXUDvHsPpaL3Een3oOhqQZtS+keBWrql1OZT2LkoqA/d2McGrBpEGgSOfvMJUrnhTCs YVQkYM0w==; Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZJYH-00DAok-PE for linux-rockchip@lists.infradead.org; Wed, 21 Apr 2021 20:34:27 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id 60F351F4268B From: Ezequiel Garcia To: netdev@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: Jose Abreu , Heiko Stuebner , "David S . Miller" , Jakub Kicinski , Peter Geis , Kever Yang , David Wu , Ezequiel Garcia , kernel@collabora.com Subject: [PATCH v2 1/3] net: stmmac: Don't set has_gmac if has_gmac4 is set Date: Wed, 21 Apr 2021 17:34:07 -0300 Message-Id: <20210421203409.40717-2-ezequiel@collabora.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210421203409.40717-1-ezequiel@collabora.com> References: <20210421203409.40717-1-ezequiel@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210421_133425_978884_46972538 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Some Rockchip platforms have a GMAC4 core, and therefore 'plat_stmmacenet_data.has_gmac' shouldn't be set if 'plat_stmmacenet_data.has_gmac4' is set. Signed-off-by: Ezequiel Garcia --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 6ef30252bfe0..c432a9592489 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1400,7 +1400,11 @@ static int rk_gmac_probe(struct platform_device *pdev) if (IS_ERR(plat_dat)) return PTR_ERR(plat_dat); - plat_dat->has_gmac = true; + /* If the stmmac is not already selected as gmac4, + * then make sure we fallback to gmac. + */ + if (!plat_dat->has_gmac4) + plat_dat->has_gmac = true; plat_dat->fix_mac_speed = rk_fix_speed; plat_dat->bsp_priv = rk_gmac_setup(pdev, plat_dat, data);