From nobody Sun Sep 22 15:33:51 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B885C433FE for ; Fri, 12 Nov 2021 09:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1116660EFD for ; Fri, 12 Nov 2021 09:39:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234846AbhKLJma (ORCPT ); Fri, 12 Nov 2021 04:42:30 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:45038 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S234780AbhKLJmZ (ORCPT ); Fri, 12 Nov 2021 04:42:25 -0500 X-UUID: 0f6cde485def4fa28a3dc270f211c399-20211112 X-UUID: 0f6cde485def4fa28a3dc270f211c399-20211112 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 549680085; Fri, 12 Nov 2021 17:39:31 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Fri, 12 Nov 2021 17:39:29 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 12 Nov 2021 17:39:28 +0800 From: Biao Huang To: , Jakub Kicinski , Rob Herring CC: Matthias Brugger , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Biao Huang , , , , , , , , , , Subject: [PATCH v3 2/7] net-next: stmmac: dwmac-mediatek: Reuse more common features Date: Fri, 12 Nov 2021 17:39:13 +0800 Message-ID: <20211112093918.11061-3-biao.huang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112093918.11061-1-biao.huang@mediatek.com> References: <20211112093918.11061-1-biao.huang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch makes dwmac-mediatek reuse more features supported by stmmac_platform.c. Signed-off-by: Biao Huang Acked-by: AngeloGioacchino Del Regno --- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-mediatek.c index 157ff655c85e..6ea972e96665 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c @@ -335,22 +335,20 @@ static int mediatek_dwmac_init(struct platform_device= *pdev, void *priv) const struct mediatek_dwmac_variant *variant =3D plat->variant; int ret; =20 - ret =3D dma_set_mask_and_coherent(plat->dev, DMA_BIT_MASK(variant->dma_bi= t_mask)); - if (ret) { - dev_err(plat->dev, "No suitable DMA available, err =3D %d\n", ret); - return ret; - } - - ret =3D variant->dwmac_set_phy_interface(plat); - if (ret) { - dev_err(plat->dev, "failed to set phy interface, err =3D %d\n", ret); - return ret; + if (variant->dwmac_set_phy_interface) { + ret =3D variant->dwmac_set_phy_interface(plat); + if (ret) { + dev_err(plat->dev, "failed to set phy interface, err =3D %d\n", ret); + return ret; + } } =20 - ret =3D variant->dwmac_set_delay(plat); - if (ret) { - dev_err(plat->dev, "failed to set delay value, err =3D %d\n", ret); - return ret; + if (variant->dwmac_set_delay) { + ret =3D variant->dwmac_set_delay(plat); + if (ret) { + dev_err(plat->dev, "failed to set delay value, err =3D %d\n", ret); + return ret; + } } =20 ret =3D clk_bulk_prepare_enable(plat->num_clks_to_config, plat->clks); @@ -423,15 +421,15 @@ static int mediatek_dwmac_probe(struct platform_devic= e *pdev) return PTR_ERR(plat_dat); =20 plat_dat->interface =3D priv_plat->phy_mode; - plat_dat->has_gmac4 =3D 1; - plat_dat->has_gmac =3D 0; - plat_dat->pmt =3D 0; + plat_dat->use_phy_wol =3D 1; plat_dat->riwt_off =3D 1; plat_dat->maxmtu =3D ETH_DATA_LEN; + plat_dat->addr64 =3D priv_plat->variant->dma_bit_mask; plat_dat->bsp_priv =3D priv_plat; plat_dat->init =3D mediatek_dwmac_init; plat_dat->exit =3D mediatek_dwmac_exit; plat_dat->clks_config =3D mediatek_dwmac_clks_config; + mediatek_dwmac_init(pdev, priv_plat); =20 ret =3D stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); --=20 2.25.1