From patchwork Mon Jul 31 14:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 128768 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2084858vqg; Mon, 31 Jul 2023 08:19:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlExX45S82C6VGMQ0mine5kTVo4JlJaI5HG+MdqFIx+JvjDEyguJzA4eAurtHatmDuN+Pi0n X-Received: by 2002:a05:6a20:4329:b0:137:93d7:6ab7 with SMTP id h41-20020a056a20432900b0013793d76ab7mr8330657pzk.30.1690816740986; Mon, 31 Jul 2023 08:19:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690816740; cv=none; d=google.com; s=arc-20160816; b=D0FwLpmaQcOmia4t3I7ZjXBC3IrizBEFQzz4JIrxna2AB6J14MNh5CtbtXly4YN7mc chn0JFvZZftkMW+AnYFGvx6/Er/Gb+LDvatmFuFZ2vzeIGwGC189SP6eNY0VBN98nHVn oB0+KblpPj2zd2ZDSdBd/+lN9URCG35vh/RvxbueT0YEJFEO5Ro8ZVA5mVm1/N3RsfOc vEG7OYE0tLbg8uAGMTfgpdfxxGenWJBzD10fN/qeP55TvtMDboZ+0h/0o1hxYxw28/Fg 4bo0OiCv6DayUGPuZ45lLSVQXPRn8jEMf2tW82SDLDR5nF0g58qaWlAfp0q6T4A+tuai Jxpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=fHXG4RamseFy/V+KE4SoJklrEY4Fnpkc/KjMLHsjOrQ=; fh=nJAMMyHG9OsOTtgP23EXXqI8Gv+nE0a1QuwwnE2CGAU=; b=j3sDT085xNB7kFL48CcqUxl8tQ7zbBvRtdCvgBkmJ/89F6UvbovGRsp3JOKz+6VLGJ HJr+xsWtzeSgV4Mzs05ZbgzJb353lXhuJWIuN7GATV6TNquUe2yfS4Cw6EltpFc/ZzO9 NF85n+aK9QMhQOrqB7k9WqDAQSpT3CAveIOm5uBjfWEtiW3rdNKKqz3pSlX4z/auQl9l rM2481AyHTajS7CM48BBCAN2pJJfmfKaqvgriieVxFSrl69Sdfbmwo7xKm8+MyW168Sr j7EeWy33iPGIiAwBD91hTNobF1+rLTnW73nTlqKSmDzysS/zPIPPTghcPOEt9DrY+QGw 3FyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FYPvCNFw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 199-20020a6301d0000000b00563de9d4ed4si379523pgb.828.2023.07.31.08.18.47; Mon, 31 Jul 2023 08:19:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FYPvCNFw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232114AbjGaOlf (ORCPT + 99 others); Mon, 31 Jul 2023 10:41:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232525AbjGaOl3 (ORCPT ); Mon, 31 Jul 2023 10:41:29 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5865418E for ; Mon, 31 Jul 2023 07:41:27 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3177f520802so3054435f8f.1 for ; Mon, 31 Jul 2023 07:41:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690814486; x=1691419286; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fHXG4RamseFy/V+KE4SoJklrEY4Fnpkc/KjMLHsjOrQ=; b=FYPvCNFw+2opIRx02R1hlwDcGY1fYmW97ZkhRIOuNgS+KrLK0zxak+/t9a0P4atwmh wXR2JNnQ/limiipfI6Y23JnXnz9IcUOu3eLZ6HjwbfZGb66ROMLLGpdpnM+87iBmiaP5 v/Txoo3sLmHPfZAORjbWy1Ka2YPu/hu19k3xVeVBRY/XmiIo0Q7pgqfiiOzJ6IJ+xAVk TrEFxLtyCjSSJmOEnmzkCBfPDKXFQy+XqXk0vQdvveilM25+Ch+OjIL37Hp+S5VKlfCc rXBWlHv2QkDG2rRboAL5lYAmIRlxNwBJEwodT4RAFRg/vtiNHwdwLT1gDeDYPUlLGDoX GDcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690814486; x=1691419286; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fHXG4RamseFy/V+KE4SoJklrEY4Fnpkc/KjMLHsjOrQ=; b=dIjvc150csmLLJvs6J46IePZfsez6zN2TLPoqhrSSpPPo+X5ije/nr4RH/HLJBJOh6 vmzHsXOsXl4s9+uTtrQ8CWyMot4J0quMawhB/nWCOcxq304KJIfVCMFOuqo6IWDcdFmK cyJ8hhRVZc7zlzNiPS5o8HFzKYansIbfkZroiw0mE3tJnI8qIFZd4JbNF6VGor/z7tIg QXWP0n33mmZXbQQezNcbSU2XzeUVjKxNMM2j7/KYLGMxurmXo8oQUxVArnTY3dXxBm9m LSIp/mr7bj0NbgDqwdzDnpQvQlwF+awfECRxfxJFk72oYxQqG//ZH0x7RypR/YnLC0/K wQpQ== X-Gm-Message-State: ABy/qLasWCJ+h843fMMmt8mYOoEQ0jbte2rl0VUFB670qGIfR0lNoLPF KEI7oDPiqeSUaE/R2LijkcIMVw== X-Received: by 2002:adf:fc50:0:b0:317:a499:72c8 with SMTP id e16-20020adffc50000000b00317a49972c8mr30257wrs.1.1690814485807; Mon, 31 Jul 2023 07:41:25 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id r18-20020adfce92000000b0031272fced4dsm13257372wrn.52.2023.07.31.07.41.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 07:41:25 -0700 (PDT) From: Neil Armstrong Date: Mon, 31 Jul 2023 16:41:10 +0200 Subject: [PATCH net-next v3 1/2] net: stmmac: dwmac-oxnas: remove obsolete dwmac glue driver MIME-Version: 1.0 Message-Id: <20230731-topic-oxnas-upstream-remove-v3-1-a1bddb085629@linaro.org> References: <20230731-topic-oxnas-upstream-remove-v3-0-a1bddb085629@linaro.org> In-Reply-To: <20230731-topic-oxnas-upstream-remove-v3-0-a1bddb085629@linaro.org> To: Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-oxnas@groups.io, devicetree@vger.kernel.org, Neil Armstrong , Linus Walleij , Arnd Bergmann , Daniel Golle , Andy Shevchenko X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=9157; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=KeK91Ff9kAz/F8VcpGA5H65IebgU7OcdG/h/JNKzMs4=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkx8gSmgB3tDKsuresBAH0IVYea2GMt9ADt1rMlpoN RJKPUliJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZMfIEgAKCRB33NvayMhJ0Qs8EA CKLwMg/bBsdpuutx1LspD0a7lJ1atynFGsHzC9LrXKAZpVIWiDwDvFpoQWBr9PxWuINErZmWUNUv1a C+s4UkX5pVS97M80DodFze9uMsDCkM+/aQgxQ/uIn51lqMu8Xn4Kn/vymR1u1lyoa6kUj0Q9cfw+hf GFfub0odCOTWxv7jO1GA9rsAnCfQAvBtWtLkfWdurn6IOXbMmlp4phO1DzCtY/byZ9bEl25PcbaEDN /NIyCbJSN0attaH2+4m3CJfaC2QDlKLLn59V78hJ1LESSk2c+ZydyZzqdozNts2NxfoCmm+3Z5d1vS Q7SfDjQroJ2br8s6XjvFOTNjKfDsqUf/xXqcyVbcJcnWbd9gAG7MKjO19mGry1KU7xIvptmQqH7Raa 7lzXtn85Tg48tcOoue/hdUU6/S+eFNb4K6B6bsEduJS5puaAFSw08zvSIL8/0bdkw9evx4YWt1BUbj 4uX/VSUnIR+093eDLk121E6lMKXnUGxgDGqBKF3DzIr2qiih3gcpsWDGncftpTTWbgVjWBakb7VSNN fGvYZpF9IhfMNe8sDOEODH6NGzwR/0BSyJS3PwkmC9dBYq9y8s9GX+Su51mZEYUfmIcKxrMvYyRqIv bTjOkg0tm3131+sW79l3RD6gUc6dlScu/ukBODqbr2MbLl1MrBXW2iKoFN+g== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772949855356089039 X-GMAIL-MSGID: 1772949855356089039 Due to lack of maintenance and stall of development for a few years now, and since no new features will ever be added upstream, remove support for OX810 and OX820 ethernet. Acked-by: Linus Walleij Acked-by: Arnd Bergmann Acked-by: Daniel Golle Acked-by: Andy Shevchenko Signed-off-by: Neil Armstrong --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 - drivers/net/ethernet/stmicro/stmmac/Makefile | 1 - drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 244 ---------------------- 3 files changed, 256 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index 5583f0b055ec..06c6871f8788 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -121,17 +121,6 @@ config DWMAC_MESON the stmmac device driver. This driver is used for Meson6, Meson8, Meson8b and GXBB SoCs. -config DWMAC_OXNAS - tristate "Oxford Semiconductor OXNAS dwmac support" - default ARCH_OXNAS - depends on OF && COMMON_CLK && (ARCH_OXNAS || COMPILE_TEST) - select MFD_SYSCON - help - Support for Ethernet controller on Oxford Semiconductor OXNAS SoCs. - - This selects the Oxford Semiconductor OXNASSoC glue layer support for - the stmmac device driver. This driver is used for OX820. - config DWMAC_QCOM_ETHQOS tristate "Qualcomm ETHQOS support" default ARCH_QCOM diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile index 7dd3d388068b..5b57aee19267 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -19,7 +19,6 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o obj-$(CONFIG_DWMAC_LPC18XX) += dwmac-lpc18xx.o obj-$(CONFIG_DWMAC_MEDIATEK) += dwmac-mediatek.o obj-$(CONFIG_DWMAC_MESON) += dwmac-meson.o dwmac-meson8b.o -obj-$(CONFIG_DWMAC_OXNAS) += dwmac-oxnas.o obj-$(CONFIG_DWMAC_QCOM_ETHQOS) += dwmac-qcom-ethqos.o obj-$(CONFIG_DWMAC_ROCKCHIP) += dwmac-rk.o obj-$(CONFIG_DWMAC_SOCFPGA) += dwmac-altr-socfpga.o diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c deleted file mode 100644 index f91753565d60..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c +++ /dev/null @@ -1,244 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Oxford Semiconductor OXNAS DWMAC glue layer - * - * Copyright (C) 2016 Neil Armstrong - * Copyright (C) 2014 Daniel Golle - * Copyright (C) 2013 Ma Haijun - * Copyright (C) 2012 John Crispin - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "stmmac_platform.h" - -/* System Control regmap offsets */ -#define OXNAS_DWMAC_CTRL_REGOFFSET 0x78 -#define OXNAS_DWMAC_DELAY_REGOFFSET 0x100 - -/* Control Register */ -#define DWMAC_CKEN_RX_IN 14 -#define DWMAC_CKEN_RXN_OUT 13 -#define DWMAC_CKEN_RX_OUT 12 -#define DWMAC_CKEN_TX_IN 10 -#define DWMAC_CKEN_TXN_OUT 9 -#define DWMAC_CKEN_TX_OUT 8 -#define DWMAC_RX_SOURCE 7 -#define DWMAC_TX_SOURCE 6 -#define DWMAC_LOW_TX_SOURCE 4 -#define DWMAC_AUTO_TX_SOURCE 3 -#define DWMAC_RGMII 2 -#define DWMAC_SIMPLE_MUX 1 -#define DWMAC_CKEN_GTX 0 - -/* Delay register */ -#define DWMAC_TX_VARDELAY_SHIFT 0 -#define DWMAC_TXN_VARDELAY_SHIFT 8 -#define DWMAC_RX_VARDELAY_SHIFT 16 -#define DWMAC_RXN_VARDELAY_SHIFT 24 -#define DWMAC_TX_VARDELAY(d) ((d) << DWMAC_TX_VARDELAY_SHIFT) -#define DWMAC_TXN_VARDELAY(d) ((d) << DWMAC_TXN_VARDELAY_SHIFT) -#define DWMAC_RX_VARDELAY(d) ((d) << DWMAC_RX_VARDELAY_SHIFT) -#define DWMAC_RXN_VARDELAY(d) ((d) << DWMAC_RXN_VARDELAY_SHIFT) - -struct oxnas_dwmac; - -struct oxnas_dwmac_data { - int (*setup)(struct oxnas_dwmac *dwmac); -}; - -struct oxnas_dwmac { - struct device *dev; - struct clk *clk; - struct regmap *regmap; - const struct oxnas_dwmac_data *data; -}; - -static int oxnas_dwmac_setup_ox810se(struct oxnas_dwmac *dwmac) -{ - unsigned int value; - int ret; - - ret = regmap_read(dwmac->regmap, OXNAS_DWMAC_CTRL_REGOFFSET, &value); - if (ret < 0) - return ret; - - /* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */ - value |= BIT(DWMAC_CKEN_GTX) | - /* Use simple mux for 25/125 Mhz clock switching */ - BIT(DWMAC_SIMPLE_MUX); - - regmap_write(dwmac->regmap, OXNAS_DWMAC_CTRL_REGOFFSET, value); - - return 0; -} - -static int oxnas_dwmac_setup_ox820(struct oxnas_dwmac *dwmac) -{ - unsigned int value; - int ret; - - ret = regmap_read(dwmac->regmap, OXNAS_DWMAC_CTRL_REGOFFSET, &value); - if (ret < 0) - return ret; - - /* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */ - value |= BIT(DWMAC_CKEN_GTX) | - /* Use simple mux for 25/125 Mhz clock switching */ - BIT(DWMAC_SIMPLE_MUX) | - /* set auto switch tx clock source */ - BIT(DWMAC_AUTO_TX_SOURCE) | - /* enable tx & rx vardelay */ - BIT(DWMAC_CKEN_TX_OUT) | - BIT(DWMAC_CKEN_TXN_OUT) | - BIT(DWMAC_CKEN_TX_IN) | - BIT(DWMAC_CKEN_RX_OUT) | - BIT(DWMAC_CKEN_RXN_OUT) | - BIT(DWMAC_CKEN_RX_IN); - regmap_write(dwmac->regmap, OXNAS_DWMAC_CTRL_REGOFFSET, value); - - /* set tx & rx vardelay */ - value = DWMAC_TX_VARDELAY(4) | - DWMAC_TXN_VARDELAY(2) | - DWMAC_RX_VARDELAY(10) | - DWMAC_RXN_VARDELAY(8); - regmap_write(dwmac->regmap, OXNAS_DWMAC_DELAY_REGOFFSET, value); - - return 0; -} - -static int oxnas_dwmac_init(struct platform_device *pdev, void *priv) -{ - struct oxnas_dwmac *dwmac = priv; - int ret; - - /* Reset HW here before changing the glue configuration */ - ret = device_reset(dwmac->dev); - if (ret) - return ret; - - ret = clk_prepare_enable(dwmac->clk); - if (ret) - return ret; - - ret = dwmac->data->setup(dwmac); - if (ret) - clk_disable_unprepare(dwmac->clk); - - return ret; -} - -static void oxnas_dwmac_exit(struct platform_device *pdev, void *priv) -{ - struct oxnas_dwmac *dwmac = priv; - - clk_disable_unprepare(dwmac->clk); -} - -static int oxnas_dwmac_probe(struct platform_device *pdev) -{ - struct plat_stmmacenet_data *plat_dat; - struct stmmac_resources stmmac_res; - struct oxnas_dwmac *dwmac; - int ret; - - ret = stmmac_get_platform_resources(pdev, &stmmac_res); - if (ret) - return ret; - - plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); - if (IS_ERR(plat_dat)) - return PTR_ERR(plat_dat); - - dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL); - if (!dwmac) { - ret = -ENOMEM; - goto err_remove_config_dt; - } - - dwmac->data = (const struct oxnas_dwmac_data *)of_device_get_match_data(&pdev->dev); - if (!dwmac->data) { - ret = -EINVAL; - goto err_remove_config_dt; - } - - dwmac->dev = &pdev->dev; - plat_dat->bsp_priv = dwmac; - plat_dat->init = oxnas_dwmac_init; - plat_dat->exit = oxnas_dwmac_exit; - - dwmac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, - "oxsemi,sys-ctrl"); - if (IS_ERR(dwmac->regmap)) { - dev_err(&pdev->dev, "failed to have sysctrl regmap\n"); - ret = PTR_ERR(dwmac->regmap); - goto err_remove_config_dt; - } - - dwmac->clk = devm_clk_get(&pdev->dev, "gmac"); - if (IS_ERR(dwmac->clk)) { - ret = PTR_ERR(dwmac->clk); - goto err_remove_config_dt; - } - - ret = oxnas_dwmac_init(pdev, plat_dat->bsp_priv); - if (ret) - goto err_remove_config_dt; - - ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); - if (ret) - goto err_dwmac_exit; - - - return 0; - -err_dwmac_exit: - oxnas_dwmac_exit(pdev, plat_dat->bsp_priv); -err_remove_config_dt: - stmmac_remove_config_dt(pdev, plat_dat); - - return ret; -} - -static const struct oxnas_dwmac_data ox810se_dwmac_data = { - .setup = oxnas_dwmac_setup_ox810se, -}; - -static const struct oxnas_dwmac_data ox820_dwmac_data = { - .setup = oxnas_dwmac_setup_ox820, -}; - -static const struct of_device_id oxnas_dwmac_match[] = { - { - .compatible = "oxsemi,ox810se-dwmac", - .data = &ox810se_dwmac_data, - }, - { - .compatible = "oxsemi,ox820-dwmac", - .data = &ox820_dwmac_data, - }, - { } -}; -MODULE_DEVICE_TABLE(of, oxnas_dwmac_match); - -static struct platform_driver oxnas_dwmac_driver = { - .probe = oxnas_dwmac_probe, - .remove_new = stmmac_pltfr_remove, - .driver = { - .name = "oxnas-dwmac", - .pm = &stmmac_pltfr_pm_ops, - .of_match_table = oxnas_dwmac_match, - }, -}; -module_platform_driver(oxnas_dwmac_driver); - -MODULE_AUTHOR("Neil Armstrong "); -MODULE_DESCRIPTION("Oxford Semiconductor OXNAS DWMAC glue layer"); -MODULE_LICENSE("GPL v2"); From patchwork Mon Jul 31 14:41:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 128785 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2126126vqg; Mon, 31 Jul 2023 09:30:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlF9hufROuH5eSKPBBPanKqHdD/NbA61Lkc2jtyxT17zxoIQXs66O6ofEwISZteQ+DN9z89Z X-Received: by 2002:a05:6a00:13a8:b0:687:3f06:5939 with SMTP id t40-20020a056a0013a800b006873f065939mr3259193pfg.32.1690821004560; Mon, 31 Jul 2023 09:30:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690821004; cv=none; d=google.com; s=arc-20160816; b=B+P4MNbdnr1jYXew9sQqMnbi0F5fUaEE4X7A7bVkBJ4nMTT51ktkzVCuTFj0I/g49Q Bn3485oNY9siFWvogLDiaT6CWWEEACMAv0T0TA/WBPAfs2l9kjA/XXKcSGootxcUuvym nxwf4aWJqdD1yweNLvX1X+rmTh7P+m/mWrfU4BjVtVS8x+OhOXPAIIMJcrwjJKl1/O1Z egYckEmw1eR22VS2QEf26jur4yHaLOfyhfzfA/mKdkqyo8IFYcwzLHET7M8lJMK6yQ45 sGDmE/eXKG22ENGGzoh3dUxwDokOjaHrc2lgGpDBzD10WsQ+Wo2i0z3d/xIRkaByhm2X CPOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=JAubY8Z1P2UokdHiqhtu3vCSehB8nCL6u2kffHNDAxs=; fh=UeQpUL43RqagaJG/kJyrd0EGVesBN7IwGb9bb+M1Xbw=; b=N4YgAPxKhoCFKLeQDHaB7rN1hB02v+puj2hAnT3MFNlfQkWmHitJUq5LsvmYKKb/wP 8psiJwYCON6xnRBwfUelT/Ik7EZXhKz+WQPLgpfbW4etM4GvBgAN7xyAwD+v/4jIU33+ chBHRiXffUvSw6f1NS+Ypr4MGK7w17rjuFDZyeHvxwNm+fYMEU9/6CM2XtWnJiuSP+QR CeoxQx5wm242V6qo48//JQrpARFn0WmbfKYejdu7FXE3AbZR11dP+6Pw8Ews/rXaCpqi VUjgnwPPDFELPbOH95T4W8/p8u50fK6IlihY7J+crxsSUjIrDeOBMBKm6f7/pUNdEZzg ym+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AUF4ov8I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y36-20020a056a00182400b0066883879b57si7692002pfa.51.2023.07.31.09.29.50; Mon, 31 Jul 2023 09:30:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AUF4ov8I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232801AbjGaOli (ORCPT + 99 others); Mon, 31 Jul 2023 10:41:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232643AbjGaOla (ORCPT ); Mon, 31 Jul 2023 10:41:30 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7368DD3 for ; Mon, 31 Jul 2023 07:41:28 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-314417861b9so3856443f8f.0 for ; Mon, 31 Jul 2023 07:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690814487; x=1691419287; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JAubY8Z1P2UokdHiqhtu3vCSehB8nCL6u2kffHNDAxs=; b=AUF4ov8Iixud6J9zS0ULeeMO0eGWm7mW0mi4AXM3WL+a9wZt/bx8vnCP17yRww0ckd B2MzuDfhDPGNbMghHBjjXeOStooe53yEvB15BF95vrGnsWUu+pmi+4rlhnQgxSWaE2J6 PYSajlMOlZY5+Dzouc9h+zzISVwDajpYQ4uOc5kaY/E4cefPoxPJ3FPj4aFQte9kkFvk u+QVytIhgwo7FBgYvNzFN5/SadKO61r18SVjhIGUJmqG2lL1BaXjrYEd40dqttVXBFA0 iblUpwBRf4G7xZz5qAMOT1i7/la3O+wYwQV2pT70lTWGxfrAsXZIixXkne8VQRWfQzYg gk8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690814487; x=1691419287; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JAubY8Z1P2UokdHiqhtu3vCSehB8nCL6u2kffHNDAxs=; b=Nfd0eiMuJa5gR/JaFyvndYk/aTjW8OkyWCmL9Ea3yM9NqSu4jAJE1t/8kLEyaQTQwx 6dYJ0yJK19J+XBHRi+snLjGvY43FY8snn8aC5ajXpC5NLIXkSW94uzjjjnwWodCoS7HN vUT0DiEg9I6qlC9JniAtanmamDWK+XIBoZyrRESQv9A343Wxv+hMZRNoPCPPG1b31n3Q irD9nFZBgmBXczRDjgl7wVJt+NR5NFD1JXEKyv9hQRDje9PhIUa3zpA6IvJbuhiLsBNi roQkQBxaQClt38yJH/l/pOQhoar5IXVy7+4GSMaxGYVRl5bGqFN2EX/Wg4RdvcJuQBTI Vw/g== X-Gm-Message-State: ABy/qLZjzRTr4mTmyF1w5j4cirELN605V5iAp3ItLBCSCa/GqjojfByR oR3dxBwGm8hrXRtfzi1kWVW7LA== X-Received: by 2002:adf:f043:0:b0:316:f5b1:98c with SMTP id t3-20020adff043000000b00316f5b1098cmr27062wro.24.1690814486994; Mon, 31 Jul 2023 07:41:26 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id r18-20020adfce92000000b0031272fced4dsm13257372wrn.52.2023.07.31.07.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 07:41:26 -0700 (PDT) From: Neil Armstrong Date: Mon, 31 Jul 2023 16:41:11 +0200 Subject: [PATCH net-next v3 2/2] dt-bindings: net: oxnas-dwmac: remove obsolete bindings MIME-Version: 1.0 Message-Id: <20230731-topic-oxnas-upstream-remove-v3-2-a1bddb085629@linaro.org> References: <20230731-topic-oxnas-upstream-remove-v3-0-a1bddb085629@linaro.org> In-Reply-To: <20230731-topic-oxnas-upstream-remove-v3-0-a1bddb085629@linaro.org> To: Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-oxnas@groups.io, devicetree@vger.kernel.org, Neil Armstrong , Linus Walleij , Arnd Bergmann , Daniel Golle , Conor Dooley X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2203; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=WWAewszZaAHurbGkUxcBGJ6GDkRuE9cM+WDXKbpY0xY=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkx8gS1TRmFKi1+xt8uDPsnx1sL0IzKB9M5omlr9Sy rUuNrEWJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZMfIEgAKCRB33NvayMhJ0btUEA DEk4H3MLBfZh8zYgTUsqf0fYd7vq08z2cXu+hFnxsas87nXiUF1kr1y5uLkwlON1K8YZ0D8oX0jjWi Sqb3xSYL9bDBdQ8pgF3oYzliqGCcETsaGCmfvLIHM+iNxZgYmaDdGkbvyhotY97V68vDwQqwmXoFiL WxiwEGiRCZj/mlL2ZO0U0So8wC3Ml/x1JrWkVcFuqNeF4Nv1d1NoijKajk5ZxkOkBT8ldgZngxW678 RBfaTexnBMPQl+U7VZbiDOrYrrE65JBtup4q8V7+UxlzGACwEpBfgu7HkmxfGVZT4mv3yIVu3w4bX7 EBEs5x8NjbX2tXMu8IyY3ebxUbeWakn1LWqjeshqVrEjM1rtIVXFpLUEWpm1hYLAPSFFCs5q2s0WUb K+bc/EmtQ+tOsbfkaKLqXCdpmWbDLfZ+vNzLG5/Ou0BF1YjZxKxqWUEUGSVa1yKjhCTFMIp+QbRaah eyhmQGS3VHoaCi0OhDsV+FSe0Dt4clq8eXzZeLkV8yrlqj5ZeIV7NRzj32Uqwt908h6/ojkyO8E3cg rD1YpIwcj0D10xwVZe7q4lsbc18NVFPLHbArTVsY21qTA3f/eugNYmxPUSiz+AjWh6jtX+XGGL+9z4 4f+lk3fEOJua2zq2tbv/NAB8r6PD3WdB9YCIrORWgDddyzed4ps5dUnEBZbQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772954325803849196 X-GMAIL-MSGID: 1772954325803849196 Due to lack of maintenance and stall of development for a few years now, and since no new features will ever be added upstream, remove the OX810 and OX820 dwmac glue. Acked-by: Linus Walleij Acked-by: Arnd Bergmann Acked-by: Daniel Golle Acked-by: Conor Dooley Signed-off-by: Neil Armstrong --- .../devicetree/bindings/net/oxnas-dwmac.txt | 41 ---------------------- 1 file changed, 41 deletions(-) diff --git a/Documentation/devicetree/bindings/net/oxnas-dwmac.txt b/Documentation/devicetree/bindings/net/oxnas-dwmac.txt deleted file mode 100644 index 27db496f1ce8..000000000000 --- a/Documentation/devicetree/bindings/net/oxnas-dwmac.txt +++ /dev/null @@ -1,41 +0,0 @@ -* Oxford Semiconductor OXNAS DWMAC Ethernet controller - -The device inherits all the properties of the dwmac/stmmac devices -described in the file stmmac.txt in the current directory with the -following changes. - -Required properties on all platforms: - -- compatible: For the OX820 SoC, it should be : - - "oxsemi,ox820-dwmac" to select glue - - "snps,dwmac-3.512" to select IP version. - For the OX810SE SoC, it should be : - - "oxsemi,ox810se-dwmac" to select glue - - "snps,dwmac-3.512" to select IP version. - -- clocks: Should contain phandles to the following clocks -- clock-names: Should contain the following: - - "stmmaceth" for the host clock - see stmmac.txt - - "gmac" for the peripheral gate clock - -- oxsemi,sys-ctrl: a phandle to the system controller syscon node - -Example : - -etha: ethernet@40400000 { - compatible = "oxsemi,ox820-dwmac", "snps,dwmac-3.512"; - reg = <0x40400000 0x2000>; - interrupts = , - ; - interrupt-names = "macirq", "eth_wake_irq"; - mac-address = [000000000000]; /* Filled in by U-Boot */ - phy-mode = "rgmii"; - - clocks = <&stdclk CLK_820_ETHA>, <&gmacclk>; - clock-names = "gmac", "stmmaceth"; - resets = <&reset RESET_MAC>; - - /* Regmap for sys registers */ - oxsemi,sys-ctrl = <&sys>; - -};