From patchwork Sat Mar 9 12:26:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587635 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3DE62E62E; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; cv=none; b=Sbr8d3EskbOfZfS4KkhBqTk/Nfx1hYx1lEyqvEFnpUUFk+lL7Fh3XqUYisvNvlTrFCrUo2gAkOz+jOsWakhNS0Dm5wfhuZ2ZATN8yU7Z6mszxZoD5vleWaC4d0sjoUdNtw+eh6QS3NWX2w5E07li+LGjkL4HEh6SjdW0VbVNBJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; c=relaxed/simple; bh=3nX8fP3l7Bt65toEN0CdGwFHFH0sX3inF2oQP8On+7k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E+1UwmhLJMKdGNhJ9LqOSbHlFWbWAeLchAKZ5c6YlBWTNWnOjUpJvSInvis6BMCPcTCy7pfSdgnzOEZ7j/W0ImuvEoJlHXlE2aWvoNjE4Tp/p9G3SUrlhzJBfd7iEe9sk2/oouQzFsJH8Uq1vdddgpzuuuN1yzsNVfQeZeu/L+M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SUg6BTz+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SUg6BTz+" Received: by smtp.kernel.org (Postfix) with ESMTPS id 4A526C433F1; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=3nX8fP3l7Bt65toEN0CdGwFHFH0sX3inF2oQP8On+7k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=SUg6BTz+hfzZwXiweTExFrFFIsPIDDmuVUklzpnPm+WVIB/prcXjLm3c7OqM9AQV8 EViBaDpBExNB5xYli/QAxHqaT0TyatXoey9376IcQRYlmGawoAR7xHSXsykjN83KWz GwZBKetcQaNHbKcOrzb2KYZw3oG/I97O7Eu3124DNOZvDZa5r5AJpqaKrpidnSrFVQ AN0ehakiGKlsLfENEIvltprsZF6xkFUHLjnRfrCyX5ZZArqtBl3sW9i0UYIm63BMjs oaH3HeLDaylwDoAO5hTPaLfuDPmKKZsrSTLpOtw+70Rt+AwJlO3eWRg3o4J64ieIte 0fTCmTx9TTRjg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C35CC54E41; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:23 +0800 Subject: [PATCH net-next v11 1/9] dt-bindings: net: hisilicon-femac-mdio: convert to YAML Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-1-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=2517; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=stv+a/mRLJaLswc2WeXjirfjJSRDl5txIs38K87wIhs=; b=gcQC6s+n06y/+mv1mNh2BrkMEe7l2s5JN065KVb42ZiTw6KKBgar7F4E2yzYPwvZgpMo3h2ox Hz65pGecKvODqgvw2HcXTlAx/bU0mTNl/BF5bWAKkHdf5RE/vSJANN/ X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen convert the old text binding to modern YAML based binding. No semantic change. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Yang Xiwen --- .../bindings/net/hisilicon,hisi-femac-mdio.yaml | 44 ++++++++++++++++++++++ .../bindings/net/hisilicon-femac-mdio.txt | 22 ----------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml new file mode 100644 index 000000000000..36def9d5eecd --- /dev/null +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/hisilicon,hisi-femac-mdio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: HiSilicon FEMAC MDIO bus + +maintainers: + - Yang Xiwen + +allOf: + - $ref: mdio.yaml# + +properties: + compatible: + const: hisilicon,hisi-femac-mdio + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + +required: + - compatible + - reg + - clocks + +unevaluatedProperties: false + +examples: + - | + mdio@10091100 { + compatible = "hisilicon,hisi-femac-mdio"; + reg = <0x10091100 0x20>; + clocks = <&clk_mdio>; + #address-cells = <1>; + #size-cells = <0>; + + phy@1 { + reg = <1>; + }; + }; diff --git a/Documentation/devicetree/bindings/net/hisilicon-femac-mdio.txt b/Documentation/devicetree/bindings/net/hisilicon-femac-mdio.txt deleted file mode 100644 index 23a39a309d17..000000000000 --- a/Documentation/devicetree/bindings/net/hisilicon-femac-mdio.txt +++ /dev/null @@ -1,22 +0,0 @@ -Hisilicon Fast Ethernet MDIO Controller interface - -Required properties: -- compatible: should be "hisilicon,hisi-femac-mdio". -- reg: address and length of the register set for the device. -- clocks: A phandle to the reference clock for this device. - -- PHY subnode: inherits from phy binding [1] -[1] Documentation/devicetree/bindings/net/phy.txt - -Example: -mdio: mdio@10091100 { - compatible = "hisilicon,hisi-femac-mdio"; - reg = <0x10091100 0x10>; - clocks = <&crg HI3516CV300_MDIO_CLK>; - #address-cells = <1>; - #size-cells = <0>; - - phy0: phy@1 { - reg = <1>; - }; -}; From patchwork Sat Mar 9 12:26:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587632 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3D9E2D05C; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; cv=none; b=Oyk/A8BWD+zEol1I5GJgVM26sr5ql5wPZrJE93RwG0bQP8/CpB8epzRdDtxh+fqxjDQ8UAMleffZo4YGmWG+hbCPri8ZjHiUjyu9ftHHPVaNRETFmm1g9eRYyXhJJyjuWJPkB77W5s3q2UXEH8Zxp2zo3S3GDe0LCasUy4AaVO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; c=relaxed/simple; bh=7PtIg95ncCvxMHh4b5Xw5GAtbDAZ3d89g3e/YJ0Tj88=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aUiYJDXeKu4iVoHnNOoXdAkMiwsV9e5xKnvEdJKV7R9T4RXodj68ZN9H2COwEERdfuFcRQA/BILSX4AAjmPaK+fx/jjsdxempVYtN77Tn70oge91NgZL9IiSDdNmrYr6o7KTvryxpHc+xNWsCJRUdE/ApunuchuvU6JWRvVnodM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Buc5nCdH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Buc5nCdH" Received: by smtp.kernel.org (Postfix) with ESMTPS id 56A97C43390; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=7PtIg95ncCvxMHh4b5Xw5GAtbDAZ3d89g3e/YJ0Tj88=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Buc5nCdHqRJJnnQTDybTOkvl6KvTbX1JuPfeREiCCYihniikrIfBOJG0R8FyuX/e/ N8JHNNCENENOVTTo/Rou/WfxH7L03GzcZi60eXu88rQRXlIAcED/lpPBCVLldoeNCp SWsJ/YGwiOAr1y0vQn6fX4VrlE0nqtkJrJyzbg+B+5cuHoFaMCSQOd/WLRlIOirWdW CfucG1Eu4m2+YHihmoz6IknBZpN96bt4vvadJUfc0eSdfP/p3l6xY5NtrFsZ5Qprq9 EovnF0Q7rcFxejJeaQCam+tRH33vmI1NYwaL9/AsiPZVsFCy9ftzjgdjy0aSEpL5OR B3dBWxHe1tAcA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37B38C54E4A; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:24 +0800 Subject: [PATCH net-next v11 2/9] dt-bindings: net: hisilicon,hisi-femac-mdio: remove clocks Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-2-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=1118; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=zFRj07D287wM/dCKue4SsEqnuuC7qPQ9ydZbNJ2lxsQ=; b=/Wr0Wapem+14yZEJl1OghbGR2tE6gSM+BhDcrr6KVIqfeDNmXIw/RtVleGMIOHW3Fx9e2Gdk/ zmCVOjOnlilCSIhsjDIlEA7TPJBEGaeSiJp3D+oedfsBBSGT4u7iHKI X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen This integrated MDIO bus does not have a dedicated clock. Remove it. The old binding is wrong. Acked-by: Krzysztof Kozlowski Signed-off-by: Yang Xiwen --- Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml index 36def9d5eecd..dea1bcc27381 100644 --- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml @@ -19,13 +19,9 @@ properties: reg: maxItems: 1 - clocks: - maxItems: 1 - required: - compatible - reg - - clocks unevaluatedProperties: false @@ -34,7 +30,6 @@ examples: mdio@10091100 { compatible = "hisilicon,hisi-femac-mdio"; reg = <0x10091100 0x20>; - clocks = <&clk_mdio>; #address-cells = <1>; #size-cells = <0>; From patchwork Sat Mar 9 12:26:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587634 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3D5D1BDF4; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; cv=none; b=qrP+GD1ySEC8zsKe3BF+FVSddxDwYqlVu8JE0oAgt2vfuIgJzsqXq+SJunn9VfUaVLf4VoMsTNsi0jU6pUScXghDQ5UGbWNo1I9YPBnUMiyMxPyKgUgUMDi5iYkyb21ub3z/wGZqg5wATIf/AOck/GRojV8tqEuomTlxQrq37Xc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; c=relaxed/simple; bh=vu47BKfN+xFcRDfbkn3C1v8zrm2ugq1RBZELrpt63GU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SRGqKMT3YATZ7ifFq5jAcWxYUzRnzvA9bh2HzmGxYASZWYoBb18+4hz1fFiGItMYI9p/SJP1+/O4azOc/O1Fq+MuSBlLcP8eCKAd58Z1BqPlfwaImS+3M9TVTKThiU4dqoMS7Zk2hdy38jgUwXdaZI+76LAeQeI0o0mE8sPdOho= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jEmSCC2S; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jEmSCC2S" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5CEE6C43394; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=vu47BKfN+xFcRDfbkn3C1v8zrm2ugq1RBZELrpt63GU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=jEmSCC2SENEWen1V9DhU5fFMpl/UXTtE3OiHifdzZFNXFkdMNcvc59yOvl/RsXxZu nT5PwSAL+uFGcBLQUXsg/k5Tfd83rGagkiaJ+JDyQEZgeSNLPT2mr73qI3a2uyxo3q nfIPHJepeevpw8aUGFjDC7ByFwyVd4p7xc1xm2NV+Ov/s8fcpoifNc4ZYy9DojlR6y fbcre/aDWhaGig25mKh71rGWDkpxWyIYV7L56Q3Bd+9FILik1eNFG6o1Iu+BrTbjnN m3anBq/t8/0SP6j+mzocezokKDPY86kHqKjRnJO+qBZQhe/iVEEyVWzjOdu3NesMg6 jnQ15M7+aWNvg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42090C54E5E; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:25 +0800 Subject: [PATCH net-next v11 3/9] net: mdio: hisi-femac: remove clock Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-3-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=1802; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=kdWAr70dNlF5sryokQxZlrJGOk8Z9nw7ekwi0I/9miA=; b=n0cNZEyWaBCasSNGFil4kBr+yYUF469ImAqOE6NClZ6Ygoq857b6FoLJ6n146CnOZ/nTb7Yfy zb5nAEpsvPhAJoxzkJWVWUbGFufu6zc6lKefWD7yrtHbmdY8h4iBK9J X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen This integrated MDIO bus does not have a dedicated clock, remove it. Signed-off-by: Yang Xiwen --- drivers/net/mdio/mdio-hisi-femac.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/net/mdio/mdio-hisi-femac.c b/drivers/net/mdio/mdio-hisi-femac.c index 6703f626ee83..faf4688eb1ab 100644 --- a/drivers/net/mdio/mdio-hisi-femac.c +++ b/drivers/net/mdio/mdio-hisi-femac.c @@ -5,7 +5,6 @@ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd. */ -#include #include #include #include @@ -21,7 +20,6 @@ #define BIT_WR_DATA_OFFSET 16 struct hisi_femac_mdio_data { - struct clk *clk; void __iomem *membase; }; @@ -93,26 +91,14 @@ static int hisi_femac_mdio_probe(struct platform_device *pdev) goto err_out_free_mdiobus; } - data->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(data->clk)) { - ret = PTR_ERR(data->clk); - goto err_out_free_mdiobus; - } - - ret = clk_prepare_enable(data->clk); - if (ret) - goto err_out_free_mdiobus; - ret = of_mdiobus_register(bus, np); if (ret) - goto err_out_disable_clk; + goto err_out_free_mdiobus; platform_set_drvdata(pdev, bus); return 0; -err_out_disable_clk: - clk_disable_unprepare(data->clk); err_out_free_mdiobus: mdiobus_free(bus); return ret; @@ -121,10 +107,8 @@ static int hisi_femac_mdio_probe(struct platform_device *pdev) static void hisi_femac_mdio_remove(struct platform_device *pdev) { struct mii_bus *bus = platform_get_drvdata(pdev); - struct hisi_femac_mdio_data *data = bus->priv; mdiobus_unregister(bus); - clk_disable_unprepare(data->clk); mdiobus_free(bus); } From patchwork Sat Mar 9 12:26:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587636 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C83BA383BE; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; cv=none; b=CG+4wcUS59uln3B0nsXvuuUjQ3cdMzOCQA9kS6a0MDceBdfeQ1Yu3XA8cQ0rQOd+hpUGe6lLgOgUVdleS1uR2yIOFXntbtLMJSlOOWR9rVDPLkP4S35Ti2tcL6utJBQv4ua4Wxm3PVpBaVDhGadkSuGxCvmLVGmNSUnnwCWPP5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987184; c=relaxed/simple; bh=e0q0yGSRFFLkhf3KJ0mtgBe9DUGdlUyvkBBfylc5F/Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fTP5KYXutclOqA/ynrcXlMHVDXvZvEVz7Hak8yGO5uCKipkQWMzu+3BndtqFc6raI7GvExx8tGIDLbHhFO2a72NS0De4Z/Kjs0SqrQ2SaFwqseCf/LbyPKRisUFHPsxBwMluxp8NCIxB/o4RGkOr8sNb3P0c5dSwYhK/O50RQus= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SsG6KwUX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SsG6KwUX" Received: by smtp.kernel.org (Postfix) with ESMTPS id 69FA8C433B2; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=e0q0yGSRFFLkhf3KJ0mtgBe9DUGdlUyvkBBfylc5F/Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=SsG6KwUXMb0GuZ0YTQ3sHlRPnz521INSJLNpij/FwFsBKtgSV/8IplPQBTvOxrYi7 WEH5VtI6Wn080L0fH7iiTeR6Vl5ay5uqGildkojzir3nfRZAZBOXKRbEql2x4nQWO4 ExaV9hGEUjg6pa5NFc4e3HNhShvim0lLbbjn3plUQ5Cg+k53uiHrl3boySfZ7fqH3g tLzdzz/u8gnXja9jThyraM/ePxxxSpeHy2RtrHG+kNaykBMLmhtNHnWT4poK/XwGjP QzgS4iui8kBJbdkl/FeKBliO3g7S+ZSrlAI8q2wcMhUma9UuO0GUlCSTAH0+zxOsst v/xAd4INmidww== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F191C54E5D; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:26 +0800 Subject: [PATCH net-next v11 4/9] dt-bindings: net: convert hisi-femac.txt to YAML Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-4-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=5287; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=FclGbNt5IHnTCzv0cmPEOdaR/+V9vDaeVaHJ31VX4FE=; b=f1/QbCf0lOoaAD0ITLMjJRxOButfePhQsNssr3b0UuyBDzIS6NhXGX0PI9Jqt+2uiXWS0+6E7 /A2VbO5H3GcDCLBBV8f3vdLmX0UkG4inWfB4ukUv1yL3KDTdmw7Pp0j X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen Convert the old text binding to new YAML. While at it, make some changes to the binding: - The version numbers are not documented publicly. The version also does not change programming interface. Remove it until it's really needed. - A few clocks are missing in old binding file. Add them to match the real hardware. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Yang Xiwen --- .../bindings/net/hisilicon,hisi-femac.yaml | 87 ++++++++++++++++++++++ .../devicetree/bindings/net/hisilicon-femac.txt | 41 ---------- 2 files changed, 87 insertions(+), 41 deletions(-) diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml new file mode 100644 index 000000000000..3344d3bfefb8 --- /dev/null +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml @@ -0,0 +1,87 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/hisilicon,hisi-femac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Hisilicon Fast Ethernet MAC controller + +maintainers: + - Yang Xiwen + +allOf: + - $ref: ethernet-controller.yaml + +properties: + compatible: + enum: + - hisilicon,hi3516cv300-femac + + reg: + items: + - description: The first region is the MAC core register base and size. + - description: The second region is the global MAC control register. + + interrupts: + maxItems: 1 + + clocks: + items: + - description: MAC main clock + - description: MAC bus interface clock + - description: PHY clock + + clock-names: + items: + - const: mac + - const: macif + - const: phy + + resets: + items: + - description: MAC reset signal + - description: PHY reset signal + + reset-names: + items: + - const: mac + - const: phy + + hisilicon,phy-reset-delays-us: + description: PHY reset timing requirement (in micro seconds). + The integrated PHY usually have a special reset timing sequence and must + interact with MAC controller to accomplish the entire reset procedure. So + these properties belong to MAC controller, not PHY. + items: + - description: pre-reset delay for PHY + - description: reset pulse for PHY + - description: post-reset delay for PHY + +required: + - compatible + - reg + - interrupts + - clocks + - resets + - reset-names + - phy-mode + - phy-handle + - hisilicon,phy-reset-delays-us + +unevaluatedProperties: false + +examples: + - | + ethernet@10090000 { + compatible = "hisilicon,hi3516cv300-femac"; + reg = <0x10090000 0x1000>, <0x10091300 0x200>; + interrupts = <12>; + clocks = <&clk_femac>, <&clk_femacif>, <&clk_fephy>; + clock-names = "mac", "macif", "phy"; + resets = <&crg 0xec 0>, <&crg 0xec 3>; + reset-names = "mac", "phy"; + mac-address = [00 00 00 00 00 00]; + phy-mode = "mii"; + phy-handle = <&fephy>; + hisilicon,phy-reset-delays-us = <10000 20000 20000>; + }; diff --git a/Documentation/devicetree/bindings/net/hisilicon-femac.txt b/Documentation/devicetree/bindings/net/hisilicon-femac.txt deleted file mode 100644 index 5f96976f3cea..000000000000 --- a/Documentation/devicetree/bindings/net/hisilicon-femac.txt +++ /dev/null @@ -1,41 +0,0 @@ -Hisilicon Fast Ethernet MAC controller - -Required properties: -- compatible: should contain one of the following version strings: - * "hisilicon,hisi-femac-v1" - * "hisilicon,hisi-femac-v2" - and the soc string "hisilicon,hi3516cv300-femac". -- reg: specifies base physical address(s) and size of the device registers. - The first region is the MAC core register base and size. - The second region is the global MAC control register. -- interrupts: should contain the MAC interrupt. -- clocks: A phandle to the MAC main clock. -- resets: should contain the phandle to the MAC reset signal(required) and - the PHY reset signal(optional). -- reset-names: should contain the reset signal name "mac"(required) - and "phy"(optional). -- phy-mode: see ethernet.txt [1]. -- phy-handle: see ethernet.txt [1]. -- hisilicon,phy-reset-delays-us: triplet of delays if PHY reset signal given. - The 1st cell is reset pre-delay in micro seconds. - The 2nd cell is reset pulse in micro seconds. - The 3rd cell is reset post-delay in micro seconds. - -The MAC address will be determined using the optional properties -defined in ethernet.txt[1]. - -[1] Documentation/devicetree/bindings/net/ethernet.txt - -Example: - hisi_femac: ethernet@10090000 { - compatible = "hisilicon,hi3516cv300-femac","hisilicon,hisi-femac-v2"; - reg = <0x10090000 0x1000>,<0x10091300 0x200>; - interrupts = <12>; - clocks = <&crg HI3518EV200_ETH_CLK>; - resets = <&crg 0xec 0>,<&crg 0xec 3>; - reset-names = "mac","phy"; - mac-address = [00 00 00 00 00 00]; - phy-mode = "mii"; - phy-handle = <&phy0>; - hisilicon,phy-reset-delays-us = <10000 20000 20000>; - }; From patchwork Sat Mar 9 12:26:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587639 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A37E3B190; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; cv=none; b=isQSlBh9a+Ha6TvqqdqDI4je1Q7gk8B6+6zxysfBLnrvPybKhQdlYMeFH8qg4Uq6bC9aNr30Lbt0xvrtVKKueJUNI/EEtufBkRQyy0xLSv6lYo5JtG3vjEYbLqcMdGhY8AB9pULTpgUOvSrDn5er3jyTpUFIV4BZAaEzQ1hmN90= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; c=relaxed/simple; bh=S/doFh+gAKWZAIIBgfTAfdC4/d/iX9a1igOHcKDtz+w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lt9/bkdnlvpyLMHgP8aQgbqiWpBrrVvELobUIw+5Cu3P3YLm6nXG5k/Qp8BKD4UnFS4F+qF+XKHX20p/oK2cSWbg/dJgpynS1F3cJ0x81K0acl0NPo0bFVPJmJhSftLBa8ErrYFErlM3cKP8cJzYAY0AAB+7z/UJtAxJFsiR81g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tV8fOuGY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tV8fOuGY" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6E6E0C43141; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=S/doFh+gAKWZAIIBgfTAfdC4/d/iX9a1igOHcKDtz+w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=tV8fOuGYO9o5NS7Db+RIGTgHQ5OddoRjPblkjQM1gbEc9LjkV0dhMm7TNOEldvjjK DNVYRtdgb8Kw62mLa1/sTejcScQrT4sqQOsGegApKGwEpUL/tdeqeUjm1k5C4uN5o1 asdGoVBCeuCloLD1v5hIeCZGGhYlqPt94TixludZcQaseSxiih8wrx8oumv0ImV0oi Nn92relKbuobJZDHC7n/TotnOsaupZ+Fq16CNkOEPUL7IVp23yXIU51LOpTBa8CiKS TUNaQN4ykaZPOMr3gPgC3j+76sztofllc3pbC28QXxcfo6b951ht57CxQ8eRs3+o3o rnGg2dzXRylmw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BFB5C54798; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:27 +0800 Subject: [PATCH net-next v11 5/9] dt-bindings: net: hisi-femac: add mandatory MDIO bus subnode Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-5-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=2289; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=4fkGrr79J0kJPETyUJ+upr3jatyv9l4bbxNa0d6pOpo=; b=2GHYPHV/hc07ybivl621iErFTLb+UDsZtdcnRa5QfnSLwu268J7fiAlr09l9J1B5BUcYdGKlL P5KL9rPfxEwCkuLzgSJZu2pSnAON0YJixUW6m/GdgoL8kUnprhBseMe X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen FEMAC core always has an integrated MDIO bus mapped in its address space. Add required properties '#address-cells', 'size-cells', 'ranges' and MDIO bus subnode. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Yang Xiwen --- .../bindings/net/hisilicon,hisi-femac.yaml | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml index 3344d3bfefb8..5cd2331668bc 100644 --- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml @@ -22,6 +22,15 @@ properties: - description: The first region is the MAC core register base and size. - description: The second region is the global MAC control register. + ranges: + maxItems: 1 + + '#address-cells': + const: 1 + + '#size-cells': + const: 1 + interrupts: maxItems: 1 @@ -57,9 +66,16 @@ properties: - description: reset pulse for PHY - description: post-reset delay for PHY +patternProperties: + 'mdio@[0-9a-f]+': + $ref: hisilicon,hisi-femac-mdio.yaml# + required: - compatible - reg + - ranges + - '#address-cells' + - '#size-cells' - interrupts - clocks - resets @@ -75,6 +91,9 @@ examples: ethernet@10090000 { compatible = "hisilicon,hi3516cv300-femac"; reg = <0x10090000 0x1000>, <0x10091300 0x200>; + ranges = <0x0 0x10090000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; interrupts = <12>; clocks = <&clk_femac>, <&clk_femacif>, <&clk_fephy>; clock-names = "mac", "macif", "phy"; @@ -84,4 +103,15 @@ examples: phy-mode = "mii"; phy-handle = <&fephy>; hisilicon,phy-reset-delays-us = <10000 20000 20000>; + + mdio@1100 { + compatible = "hisilicon,hisi-femac-mdio"; + reg = <0x1100 0x20>; + #address-cells = <1>; + #size-cells = <0>; + + phy@1 { + reg = <1>; + }; + }; }; From patchwork Sat Mar 9 12:26:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587637 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A40F3B1B2; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; cv=none; b=hzod2C8/j94/aDWbIurruG8pEsXqrlAQ80QrlSSxC4Gydfgm/yB3EtJOEj+/4VmI8DT55c+UnTUlkrt4LtCQrKjRyAHf5NhuUcNO+a8Rehfu9MorodHeaB4EJWabAhDH5sWLmxmSOYMNk0hXF71/RgRW+mnelV1DbefOhCwoXes= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; c=relaxed/simple; bh=oBChcKDw+6U+UAr+/pADMmiV+fMrY7ICx+nCf9RkwKs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LjphhoXanWhf5cNY70qHEqhsE1ak/kfzHJcrxNThYmf+AHpxPYHc9diqn8i58bEaiOd2ujsT3ooQajC3T1cNT2bFSLT3yZ8kbP1nW0ms0xEshDz84eLywnUxLCEyHdmUnEXZjCvI3Eqez8Y+Ughh5nliCR59b5gYvVk+Ukbe2HI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I7EWOsf5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I7EWOsf5" Received: by smtp.kernel.org (Postfix) with ESMTPS id 7E09CC43143; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=oBChcKDw+6U+UAr+/pADMmiV+fMrY7ICx+nCf9RkwKs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=I7EWOsf5RGzBAEwkO9wBeBa8pJpzFvW3EXM+8AYqjCd3TzR3IhPCP01LOCM9pP78i bQmRAcyV2txXqxkfm71HiRDktTXCDVYi9IR+8Vc4dwGByUodfTUZoTVvkw4QdVFh/n iuUnUeSGLOepCddYePMPzZB1sKjl/Lhy4qnsv+2WYPOfzMyTdLGVLo9W3f5zsRC6Ip DLAPhMgyR95pf9U/SMMjE4a9KJGMVfSVU6rFhLH8/YwwdXvwLKg1dvH83oaMzpNbHX knfalzAh+QHuibtmlIwNIz8dfgqPQ+yb2zli7dkyPFgiOd0J+vvCVXo0LuiqIbabQ9 eoVs6+o+sp+dg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67D27C54E60; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:28 +0800 Subject: [PATCH net-next v11 6/9] dt-bindings: net: hisi-femac: add binding for Hi3798MV200 FEMAC core Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-6-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=1084; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=hXp0Z2gvwz2pQUJk1rM9MLAwqqkrhWdCoaJN9CeMwpY=; b=cACK4WVwd77tA+6JbzmRELGdMLxFXzx69Kv8fUPuW1iOEasbq89YHN7hxCsq1yFIYWoOXnmG5 mwBVTCLp1mADW3bfa1Pt/lokq6/OQfJEeGdiIHHsLKWEA3kWY4nKPzR X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen HiSilicon FEMAC core is also found on Hi3798MV200 SoC. Document it in binding. While at it, make "hisilicon,hi3516cv200-femac" as the fallback compatible. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Yang Xiwen --- Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml index 5cd2331668bc..cee10d263d0b 100644 --- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml @@ -14,8 +14,12 @@ allOf: properties: compatible: - enum: - - hisilicon,hi3516cv300-femac + oneOf: + - items: + - enum: + - hisilicon,hi3798mv200-femac + - const: hisilicon,hi3516cv300-femac + - const: hisilicon,hi3516cv300-femac reg: items: From patchwork Sat Mar 9 12:26:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587638 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A43C3B2A2; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; cv=none; b=ezS3Cd2R40fCH6ZG5ExSE740dL8dc/GWJfuWaSEI9Mv5OFHZKfrpouyTx2/CcP0UyHoJtaKTrU9VoPPNEKyeSTUFBcBD3IMKWC/aArKTZwu12BpmVVFjQEIFZ6m6Mu61dxzoloQap4P9nQqIwjdweN0kJDh3WZj4Sqpo0eWnp2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; c=relaxed/simple; bh=DhcpedOubnECe7b/cBTge5kBP9lF6IUP3AO1TZvZq2E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SJjOqmuREG3rtCcKAZfC2JjgnfTTFkY4VXPQr6JIqnvCBdMQnrHO6B/RmSEKTDzOtdAC0BnKIkiS9p6Ml4Jk0CRhxogAaEonvIv98L2D5u9chXZu/7sbNB8wS3IXY5X+PITdqU5tiZqxTwToz+S4tRr4BDODDYlEciBowHFl8xY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O0wwS4yk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O0wwS4yk" Received: by smtp.kernel.org (Postfix) with ESMTPS id 889D6C4167D; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=DhcpedOubnECe7b/cBTge5kBP9lF6IUP3AO1TZvZq2E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=O0wwS4ykxVaHbE1lCiX1nrqZxwU4tAbPV1MqLiPm1buwBjb2POXRZvTNX9OlQdDsL s4pIKlI5bvbSt/hAg6a6na15k6MCoDmDFCeJcDn7mHjmul1cnrOG+sLGfMvNY1v+gN /kKySe98duOkuZNjbQ3lW1Bpychpps6OAgADOb1QxZXwcr39SY18wEbqvnLWXjSfDX IPqM+A+u4ERoybh7ZCSKSdV2wynIiKuL9KpuJDTNqSXYd4DcQtvpgJj0ZbtjIazsp9 LN+HDF9CMvqdAuG+qGdJOZSfAfc7lXTywbbedXxW8M9YDn3PzvwOe+gXh4p0sJCxEh Dbqn+RsX+fqJg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7481CC54E41; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:29 +0800 Subject: [PATCH net-next v11 7/9] net: hisi_femac: remove unused compatible strings Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-7-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=1001; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=lph+izMyuosipNJp3zUzxyABy7CFBGcgm+YFHBiI/s4=; b=maPjusymXxjRu5XBJlLbrFweG2oWMw4bQlpoFi9RcUFR7mKmhqMnGnjM6fkdL60jThnoVX4E6 ibtkym5ToY1Bj7Yqm43TABNEk7P5DY7dUahxBsFOSaeH0svAn/tTHWC X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen It's hard to get the version number for each FEMAC core and it's unknown how the version can be used. Remove them until it's really needed. While at it, remove fallback compatibles and only use SoC compatible. Acked-by: Krzysztof Kozlowski Signed-off-by: Yang Xiwen --- drivers/net/ethernet/hisilicon/hisi_femac.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index 2406263c9dd3..9bf4beba7987 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -945,8 +945,6 @@ static int hisi_femac_drv_resume(struct platform_device *pdev) #endif static const struct of_device_id hisi_femac_match[] = { - {.compatible = "hisilicon,hisi-femac-v1",}, - {.compatible = "hisilicon,hisi-femac-v2",}, {.compatible = "hisilicon,hi3516cv300-femac",}, {}, }; From patchwork Sat Mar 9 12:26:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587640 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A3C33B19C; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; cv=none; b=RfwIcjy/shU6rghGJiu7/K9d3U6Bxr2dNgF/ogSswvMFVa3l3VLMULNGsRQ0hvOPY3edyyscCkSCpM5r4zouvyycoTEJc4LpBwO5J0tvZ2erig29d9v8o8vg9PCFjgKMAYHq3vP1o/Q/3fxKoaC3PWUdaWDotcfyw92f0eOok7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; c=relaxed/simple; bh=AqAfgJ6EUxDmQBRGx5L1+oOWyE/tweeVqLto7Qz/y4E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DnzKmD2WWnN9+lCTNO8f6FWFXjzmL3luzIQHAAwlSePyaqbXuj4ZFyJAa3yf3WacMe7MQpUjwHdykagdd71dplStv4fcLvnpEIif2NPhtDa1U9jIVPBCZINK3yhpy0G0VBzsKrZEaLswVaThl+GH/bahaF/M99BnskHWHtwhuCo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ollMaeFy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ollMaeFy" Received: by smtp.kernel.org (Postfix) with ESMTPS id A2294C3277F; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=AqAfgJ6EUxDmQBRGx5L1+oOWyE/tweeVqLto7Qz/y4E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ollMaeFyKT8AAc7tDIW+uIxXfM9rDiAFO+UyDOn+0LT77MqUR0Xm1Ol4fG97W+xke JTu/40N6NZUpth02PjJ9DRIV6RcDMmiKEE/zrOmX9Ng2LUlTIyIp3oX+mtqjSu1c3z 3pokergAVTGVED4wbGoMQyq0ri833Dur0PYGteF5iXrgwG+HKiTJiVyQ79fs1gu33x imH+cLIOivvevoaceh2KnqTvhfjh+N5DdbGjYNKBtVgBhwN/kUD8NVRbRPF/NTLs44 ItLg/M3ELxmyKue4OpH7wlUafBKN9z3yzNjI4zzjvWSj8FefYeW6d1NVBPF4noG9Hi vvSxZkEq1nXXQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F02DC54798; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:30 +0800 Subject: [PATCH net-next v11 8/9] net: hisi_femac: add support for hisi_femac core on Hi3798MV200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-8-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=6571; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=Xjv8gzL6GSUrM4to0ifxUGjtBEHMNbtOR85LYYa8BQw=; b=9czE6UmwhxRd7txod+z/bHyHJdM/QWSKRiG7qVoubBs/b+0xK4yIVbj2jTGXiGt6Kw09RH1im JPiTHXrKt3IAizOrG8JTHld1r6mvbeSE/U3aL15xcILIrob88dRDhAy X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen Register the sub MDIO bus if it is found. Also implement the internal PHY reset procedure as needed. Note it's unable to put the MDIO bus node outside of MAC controller (i.e. at the same level in the parent bus node). Because we need to control all clocks and resets in FEMAC driver due to the phy reset procedure. So the clocks can't be assigned to MDIO bus device, which is an essential resource for the MDIO bus to work. Signed-off-by: Yang Xiwen --- drivers/net/ethernet/hisilicon/hisi_femac.c | 73 +++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index 9bf4beba7987..e873a4140a62 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -10,8 +10,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -97,6 +99,13 @@ enum phy_reset_delays { DELAYS_NUM, }; +enum clk_type { + CLK_MAC, + CLK_MACIF, + CLK_PHY, + CLK_NUM, +}; + struct hisi_femac_queue { struct sk_buff **skb; dma_addr_t *dma_phys; @@ -108,7 +117,7 @@ struct hisi_femac_queue { struct hisi_femac_priv { void __iomem *port_base; void __iomem *glb_base; - struct clk *clk; + struct clk_bulk_data *clks; struct reset_control *mac_rst; struct reset_control *phy_rst; u32 phy_reset_delays[DELAYS_NUM]; @@ -116,6 +125,7 @@ struct hisi_femac_priv { struct device *dev; struct net_device *ndev; + struct platform_device *mdio_pdev; struct hisi_femac_queue txq; struct hisi_femac_queue rxq; @@ -693,6 +703,7 @@ static const struct net_device_ops hisi_femac_netdev_ops = { static void hisi_femac_core_reset(struct hisi_femac_priv *priv) { reset_control_assert(priv->mac_rst); + usleep_range(200, 300); reset_control_deassert(priv->mac_rst); } @@ -712,6 +723,10 @@ static void hisi_femac_sleep_us(u32 time_us) static void hisi_femac_phy_reset(struct hisi_femac_priv *priv) { + /* MAC clock must be disabled before PHY reset + */ + clk_disable(priv->clks[CLK_MAC].clk); + clk_disable(priv->clks[CLK_MACIF].clk); /* To make sure PHY hardware reset success, * we must keep PHY in deassert state first and * then complete the hardware reset operation @@ -727,6 +742,9 @@ static void hisi_femac_phy_reset(struct hisi_femac_priv *priv) reset_control_deassert(priv->phy_rst); /* delay some time to ensure later MDIO access */ hisi_femac_sleep_us(priv->phy_reset_delays[POST_DELAY]); + + clk_enable(priv->clks[CLK_MAC].clk); + clk_enable(priv->clks[CLK_MACIF].clk); } static void hisi_femac_port_init(struct hisi_femac_priv *priv) @@ -768,11 +786,12 @@ static void hisi_femac_port_init(struct hisi_femac_priv *priv) static int hisi_femac_drv_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct device_node *node = dev->of_node; + struct device_node *node = dev->of_node, *mdio_np; struct net_device *ndev; struct hisi_femac_priv *priv; struct phy_device *phy; int ret; + bool mdio_registered = false; ndev = alloc_etherdev(sizeof(*priv)); if (!ndev) @@ -797,17 +816,16 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) goto out_free_netdev; } - priv->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get clk\n"); - ret = -ENODEV; + ret = devm_clk_bulk_get_all(&pdev->dev, &priv->clks); + if (ret < 0 || ret != CLK_NUM) { + dev_err(dev, "failed to get clk bulk: %d\n", ret); goto out_free_netdev; } - ret = clk_prepare_enable(priv->clk); + ret = clk_bulk_prepare_enable(CLK_NUM, priv->clks); if (ret) { - dev_err(dev, "failed to enable clk %d\n", ret); - goto out_free_netdev; + dev_err(dev, "failed to enable clk bulk: %d\n", ret); + goto out_disable_clk; } priv->mac_rst = devm_reset_control_get(dev, "mac"); @@ -830,11 +848,29 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) hisi_femac_phy_reset(priv); } + // Register the optional MDIO bus + for_each_available_child_of_node(node, mdio_np) { + if (of_node_name_prefix(mdio_np, "mdio")) { + priv->mdio_pdev = of_platform_device_create(mdio_np, NULL, dev); + of_node_put(mdio_np); + if (!priv->mdio_pdev) { + dev_err(dev, "failed to register MDIO bus device\n"); + ret = -ENODEV; + goto out_disable_clk; + } + mdio_registered = true; + break; + } + } + + if (!mdio_registered) + dev_warn(dev, "MDIO subnode not found. This is usually a bug.\n"); + phy = of_phy_get_and_connect(ndev, node, hisi_femac_adjust_link); if (!phy) { dev_err(dev, "connect to PHY failed!\n"); ret = -ENODEV; - goto out_disable_clk; + goto out_unregister_mdio_bus; } phy_attached_print(phy, "phy_id=0x%.8lx, phy_mode=%s\n", @@ -885,8 +921,10 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) out_disconnect_phy: netif_napi_del(&priv->napi); phy_disconnect(phy); +out_unregister_mdio_bus: + platform_device_unregister(priv->mdio_pdev); out_disable_clk: - clk_disable_unprepare(priv->clk); + clk_bulk_disable_unprepare(CLK_NUM, priv->clks); out_free_netdev: free_netdev(ndev); @@ -902,7 +940,8 @@ static void hisi_femac_drv_remove(struct platform_device *pdev) unregister_netdev(ndev); phy_disconnect(ndev->phydev); - clk_disable_unprepare(priv->clk); + platform_device_unregister(priv->mdio_pdev); + clk_bulk_disable_unprepare(CLK_NUM, priv->clks); free_netdev(ndev); } @@ -919,7 +958,7 @@ static int hisi_femac_drv_suspend(struct platform_device *pdev, netif_device_detach(ndev); } - clk_disable_unprepare(priv->clk); + clk_bulk_disable_unprepare(CLK_NUM, priv->clks); return 0; } @@ -928,8 +967,14 @@ static int hisi_femac_drv_resume(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct hisi_femac_priv *priv = netdev_priv(ndev); + int ret; + + ret = clk_bulk_prepare_enable(CLK_NUM, priv->clks); + if (ret) { + dev_err(&pdev->dev, "failed to enable clk bulk: %d\n", ret); + return ret; + } - clk_prepare_enable(priv->clk); if (priv->phy_rst) hisi_femac_phy_reset(priv); From patchwork Sat Mar 9 12:26:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13587641 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D3513C6BA; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; cv=none; b=S/yZ+Cs4tB41vU7G5Gx0Hm/ghGAOeOfHf/1Y3utD0qAlEb3eEwWhEMVkx5xvLqUDEI4UEk/zbiMLVB2NSuXDXlweu+acK3X21NL5Cdi4u4gekg80LHYrQ5PoeWwBiQekM4Iiie/J/a/03gLsoSz3eJfn95qndemflA4F/8cmG9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709987185; c=relaxed/simple; bh=lSKWeMSp6hiaBqDIHd2zETyiJuHGSONXfIQS0i6E3Cw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=llHmoPg+r6VNsIJgv56Ad+h63IUPwMTBk4rzevymv9WNTD3HvO6DrjVg5AmQ6te6buGML1+qjp9/2x43236Nv9lSRq2WvUG5ZPDRF6nU18Ww2ty631xFUqoFMHddStlU8V4IlCz+DFtrLLTY8OHC1b6rmJ+uhyYsaHaeSluKiDg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tG6Yu/Fp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tG6Yu/Fp" Received: by smtp.kernel.org (Postfix) with ESMTPS id A8EEAC32786; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709987184; bh=lSKWeMSp6hiaBqDIHd2zETyiJuHGSONXfIQS0i6E3Cw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=tG6Yu/Fp1cau7HoYkFQrIpJgUoMW5Sk9IqwQYnl6XYYMj+vFak63YeCTS9v6qR1W4 GKMAmFzuK1dxdZiD8u7mSSAH9WMSYG2J2HGzLotUnR9KCgWFXa04ExRH9m/1g+Mbvb kQnjjUyZtcqI6oeMaBF418s7zMHN//amODoH4PX/pI8Bcnt2r5kXUE87Ksz/20vDPD uS3i6XDictmsSBYrA3l56eqUeNqXR4D9KdaUd7LNgsrT4kBQlMz1IzaTVLsR6ozYdq WGaa5ZkO0ZN/KjB1Wwt1fej0jJUUP7qrzMp2XnHtJugf4aoj2ps91LT3gZtHlbS8di NB8l/f4ri6Wyw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B3CCC54E5D; Sat, 9 Mar 2024 12:26:24 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 09 Mar 2024 20:26:31 +0800 Subject: [PATCH net-next v11 9/9] net: hisi_femac: remove unneeded MODULE_ALIAS() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240309-net-v11-9-eb99b76e4a21@outlook.com> References: <20240309-net-v11-0-eb99b76e4a21@outlook.com> In-Reply-To: <20240309-net-v11-0-eb99b76e4a21@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709987182; l=761; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=5asUwtns0o/WnZUMxP/lMUTHZU/9R+BsisaTEtLgTiE=; b=a4D3ssZqzk2x3t1Nh/7G1qhSCn7dESniI29GS3APQfCyQ1jVI6fYO/IoAq/ILo/DGERlDdF20 6JdNhtQtlK3AFDkf2iUq+GdFR9tcfe1QTkZxgTa5fa1c9XqNIhd2Hss X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-Patchwork-Delegate: kuba@kernel.org From: Yang Xiwen We already have MODULE_DEVICE_TABLE() that creates the correct alias. Remove unneeded MODULE_ALIAS(). Signed-off-by: Yang Xiwen --- drivers/net/ethernet/hisilicon/hisi_femac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index e873a4140a62..f434a3beaae7 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -1014,4 +1014,3 @@ module_platform_driver(hisi_femac_driver); MODULE_DESCRIPTION("Hisilicon Fast Ethernet MAC driver"); MODULE_AUTHOR("Dongpo Li "); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:hisi-femac");