From patchwork Thu Feb 9 09:16:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Volmat X-Patchwork-Id: 13134236 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 A3D38C61DA4 for ; Thu, 9 Feb 2023 09:21:42 +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: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=jzXuv/wIYRgMoenuZWlsy2hPZQ4ibJ4sof7Vvgo+0ME=; b=ClgOAfXdAJdQ+y QIJJsJ7FjIyAPAuqBAUYe3YiCRKci7Rh8+/5sgMvZ4IpvyFXG8vqBSF2V0EEXNreqYCdypQgthlny H1Q3gU+dNSZzfiCGfojsFKf2lkSBuTY8bTRq8mRBmmHhxCPcha5pH0k4xQ8CPe9MMHwNXioyQIasi Ee4q/LGxXgcNPmoeIlUX+HOUmSFB6tbFWKteBXpCvcX72GxmJwJxzt2cANFFPZ0nyhO2KCh/QtR9i 07t1xDqK+Qd/G5+z36PMcLCJcKF8UtIKh1haP+jXoHOtxAi+LdMY2jG6Rky5V6o0ptblpRmrBu/KL 2EEZ1rSmJVt2WK5PJQZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQ36d-000kwU-T8; Thu, 09 Feb 2023 09:20:40 +0000 Received: from mr85p00im-ztdg06021801.me.com ([17.58.23.195]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQ358-000k3L-30 for linux-arm-kernel@lists.infradead.org; Thu, 09 Feb 2023 09:19:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1675934345; bh=Yv+aNQTOHIB7qRjwbmhigngM9kFtfMeoMgBiuYQtyTc=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=oBFHuOqplvPaB63OfWHRSYdmhJyYEYuM64AGUaaBl1O9cDGOgkRm1Md9X2qfrF4Yb cNz0TzPvmowvMZJclQB7q20wOlUdM9FyImDauKzGV8RQBoi95qNIoPHcV5yfLNh+r/ vrOgEvUpTrDjsa+N3wKz7AMoBx0vdz2xODUb2uLlX5u3FoUlSP/DAJotIuTq7ffHmx loB19SNpknN+bJRB6rQSAzEjc8fYLEaKmd8bFy5WboTd2EiURLhGE+8JGhRPH32TJQ jo56V1Jy4Nfph7kVKWThxswd2D1+l+pHOAjF5LzmoSfiCXh11WUKgMOc9pE5RRtW24 PKcyexmRmtGtA== Received: from localhost (mr38p00im-dlb-asmtp-mailmevip.me.com [17.57.152.18]) by mr85p00im-ztdg06021801.me.com (Postfix) with ESMTPSA id F2AFAD02A13; Thu, 9 Feb 2023 09:19:04 +0000 (UTC) From: Alain Volmat To: Jonathan Corbet , Rob Herring , Krzysztof Kozlowski , Thomas Gleixner , Marc Zyngier , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Patrice Chotard , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , "Rafael J . Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Michael Turquette , Stephen Boyd , Philipp Zabel Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, Alain Volmat Subject: [PATCH 07/11] net: ethernet: stmmac: dwmac-sti: remove stih415/stih416/stid127 Date: Thu, 9 Feb 2023 10:16:55 +0100 Message-Id: <20230209091659.1409-8-avolmat@me.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230209091659.1409-1-avolmat@me.com> References: <20230209091659.1409-1-avolmat@me.com> MIME-Version: 1.0 X-Proofpoint-GUID: cbkkKnxBitPfqUkYra3jifKFBB60-BQq X-Proofpoint-ORIG-GUID: cbkkKnxBitPfqUkYra3jifKFBB60-BQq X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E425=2C18=2E0?= =?utf-8?q?=2E816=2C17=2E11=2E62=2E513=2E0000000_definitions=3D2022-01-18=5F?= =?utf-8?q?01=3A2022-01-14=5F01=2C2022-01-18=5F01=2C2021-12-02=5F01_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 bulkscore=0 adultscore=0 clxscore=1015 spamscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2302090088 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230209_011906_186924_50D0B015 X-CRM114-Status: GOOD ( 13.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove no more supported platforms (stih415/stih416 and stid127) Signed-off-by: Alain Volmat Acked-by: Jakub Kicinski --- .../net/ethernet/stmicro/stmmac/dwmac-sti.c | 60 +------------------ 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c index 710d7435733e..3b424f4f95f9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c @@ -35,7 +35,7 @@ #define IS_PHY_IF_MODE_GBIT(iface) (IS_PHY_IF_MODE_RGMII(iface) || \ iface == PHY_INTERFACE_MODE_GMII) -/* STiH4xx register definitions (STiH415/STiH416/STiH407/STiH410 families) +/* STiH4xx register definitions (STiH407/STiH410 families) * * Below table summarizes the clock requirement and clock sources for * supported phy interface modes with link speeds. @@ -75,27 +75,6 @@ #define STIH4XX_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7) #define STIH4XX_ETH_SEL_TXCLK_NOT_CLK125 BIT(6) -/* STiD127 register definitions - *----------------------- - * src |BIT(6)| BIT(7)| - *----------------------- - * MII | 1 | n/a | - *----------------------- - * RMII | n/a | 1 | - * clkgen| | | - *----------------------- - * RMII | n/a | 0 | - * phyclk| | | - *----------------------- - * RGMII | 1 | n/a | - * clkgen| | | - *----------------------- - */ - -#define STID127_RETIME_SRC_MASK GENMASK(7, 6) -#define STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7) -#define STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK BIT(6) - #define ENMII_MASK GENMASK(5, 5) #define ENMII BIT(5) #define EN_MASK GENMASK(1, 1) @@ -194,36 +173,6 @@ static void stih4xx_fix_retime_src(void *priv, u32 spd) stih4xx_tx_retime_val[src]); } -static void stid127_fix_retime_src(void *priv, u32 spd) -{ - struct sti_dwmac *dwmac = priv; - u32 reg = dwmac->ctrl_reg; - u32 freq = 0; - u32 val = 0; - - if (dwmac->interface == PHY_INTERFACE_MODE_MII) { - val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK; - } else if (dwmac->interface == PHY_INTERFACE_MODE_RMII) { - if (!dwmac->ext_phyclk) { - val = STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK; - freq = DWMAC_50MHZ; - } - } else if (IS_PHY_IF_MODE_RGMII(dwmac->interface)) { - val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK; - if (spd == SPEED_1000) - freq = DWMAC_125MHZ; - else if (spd == SPEED_100) - freq = DWMAC_25MHZ; - else if (spd == SPEED_10) - freq = DWMAC_2_5MHZ; - } - - if (freq) - clk_set_rate(dwmac->clk, freq); - - regmap_update_bits(dwmac->regmap, reg, STID127_RETIME_SRC_MASK, val); -} - static int sti_dwmac_set_mode(struct sti_dwmac *dwmac) { struct regmap *regmap = dwmac->regmap; @@ -407,14 +356,7 @@ static const struct sti_dwmac_of_data stih4xx_dwmac_data = { .fix_retime_src = stih4xx_fix_retime_src, }; -static const struct sti_dwmac_of_data stid127_dwmac_data = { - .fix_retime_src = stid127_fix_retime_src, -}; - static const struct of_device_id sti_dwmac_match[] = { - { .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data}, - { .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data}, - { .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data}, { .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data}, { } };