From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B7E6D116F1 for ; Mon, 1 Dec 2025 14:52:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/ZePLFt/CA+QUEL+otOMKlVzB55vCwiU65i0y/6iPWM=; b=nTpHRxeQ/7T5bb BUArQQasB6WrrmUEU+lRyJG43VYr+cIjp97fuaR56a1opycpzVe/gITUbyCVhM4xegb21BzvqVC0M ZrJ8ZHqEYVrxFUaGfcc03HteXpOlSqpCJE+yxEpBzbglNcjOoRAES5PYatch9WEaRx79LKgpia/PJ dHWYapO1SRHp9WVV+t6aOatcofaX1WnPGpTZYpErH5YKZsJGMbdE6WuXRyW28ITniXcRkcAVmbocI 8RL0l3BJVgoEHkKB622d6d10YOUNKuGbVy47nRVxcEgkGAjYUd2VIVxK7DI/WAfwHXcNXiqlHfOhU lrw4C6XyhKVZBj/UjarA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vQ5GJ-000000047nO-13AP; Mon, 01 Dec 2025 14:52:23 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vQ5GE-000000047hz-3X0z; Mon, 01 Dec 2025 14:52:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eFOskbUwm0fPWhzGP4f7FXT0H9qDoZ8nRAhr5ePVCIY=; b=ffqi2pQj6r1TeInhkYYP5R8gdg KK/hAw6UziM6aCDGs9RIKd6hmw+YAOiRzcBPe2bhZQlMec3uMP+FTc/Ja2ZBcWxZVwWshDrX3Ebz8 yOqW8sXSM5RP9z57zlVEbLMiy/AvYaKdPEqCEPxcD8RxxVoq15TK6lgOdrVdbSayGwCayH82tIFR4 F8ykDTiW1pHhdP0caaOyAmTvcG3DbYGL51ict1xF8aWORp5WZlIA9azwPrtpyeq2LGoAuzpyif5rO rGpK1POfrCuNcVj3JkXA+xgfZDHDcq1Qh7phDOxA2dqGF76xyZscaRBYH2Cq47ijQ4OGO6ZvN4qq3 bd4wf4MA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:49784 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vQ5Fi-000000000hn-0Bxs; Mon, 01 Dec 2025 14:51:46 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vQ5Fa-0000000GNwT-48iR; Mon, 01 Dec 2025 14:51:39 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Heiko Stuebner , Jakub Kicinski , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni Subject: [PATCH RFC net-next 11/15] net: stmmac: rk: convert px30 MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 01 Dec 2025 14:51:38 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251201_065218_905103_E199F52B X-CRM114-Status: GOOD ( 10.37 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Signed-off-by: Russell King (Oracle) --- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index c26bd22658c6..4c80a73bbf74 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -237,49 +237,19 @@ static void rk_gmac_integrated_fephy_powerdown(struct rk_priv_data *priv, #define PX30_GRF_GMAC_CON1 0x0904 -/* PX30_GRF_GMAC_CON1 */ -#define PX30_GMAC_SPEED_10M GRF_CLR_BIT(2) -#define PX30_GMAC_SPEED_100M GRF_BIT(2) - static void px30_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int px30_set_speed(struct rk_priv_data *bsp_priv, - phy_interface_t interface, int speed) -{ - struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED].clk; - struct device *dev = bsp_priv->dev; - unsigned int con1; - long rate; - - if (!clk_mac_speed) { - dev_err(dev, "%s: Missing clk_mac_speed clock\n", __func__); - return -EINVAL; - } - - if (speed == 10) { - con1 = PX30_GMAC_SPEED_10M; - rate = 2500000; - } else if (speed == 100) { - con1 = PX30_GMAC_SPEED_100M; - rate = 25000000; - } else { - dev_err(dev, "unknown speed value for RMII! speed=%d", speed); - return -EINVAL; - } - - regmap_write(bsp_priv->grf, PX30_GRF_GMAC_CON1, con1); - - return clk_set_rate(clk_mac_speed, rate); -} - static const struct rk_gmac_ops px30_ops = { .set_to_rmii = px30_set_to_rmii, - .set_speed = px30_set_speed, + .set_speed = rk_set_clk_mac_speed, .phy_intf_sel_grf_reg = PX30_GRF_GMAC_CON1, .phy_intf_sel_mask = GENMASK_U16(6, 4), + + .speed_grf_reg = PX30_GRF_GMAC_CON1, + .mac_speed_mask = BIT_U16(2), }; #define RK3128_GRF_MAC_CON0 0x0168 -- 2.47.3 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip