From nobody Sat Feb 7 13:05:37 2026 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 9840D2E85A; Fri, 8 Mar 2024 08:39:45 +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=1709887185; cv=none; b=c3dUMFJ659a9pMW74cDmqriUKbD8A/h9ZPAiwkfWDe9GegZJ/83bpIZXMbV3Z+JC6wek6qWdjHA0SNJXqTQwnhuzXUSgbyH2DJEMFBw0c9XxDa1j3sPSVAzkHdo9+mQxth7MbZ9SvZsO5CwZYYIKLwmCp5qP4DkTrqJb83XUgPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887185; c=relaxed/simple; bh=3nX8fP3l7Bt65toEN0CdGwFHFH0sX3inF2oQP8On+7k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XxDX7dVbMlY/XRRz+8s0gG0fNBCNtdzxmCd69pJZiF9pwhl0jthJXEQiNptxZtnXJ4QC+ZmtwRUMU9qAViMRTF2Pez7t3QXmqFGaNASjiCijBKcj9hEscEsdZq0Nc4uVsDNgVQvxwWNWDuzn1g1jlwlTFigCRLNOdpM/g+Dp4JM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HUki9uYo; 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="HUki9uYo" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2AD90C43399; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=3nX8fP3l7Bt65toEN0CdGwFHFH0sX3inF2oQP8On+7k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=HUki9uYopQRh44lDvzPwbCwWaV7W5Bhjts6NoR06E1piWc9xSmUWPx9otEsf3PFrB 6JorfR+9A0tYw3TJvKGPfj4e5La5HOCoEWVyGzTtwBRc7+w5c19oi/6+OvR53jPIzR DcujkmjB/gszLGH8j18Ioof3Le2PPW1fB48YtycEtjDpFxCicqxFtl/rSaLNkIsB7z EvBmqaPYOCKuSQOgdmKQccDhsbJfWcPTUYEYf7VG8K+stONrj8niCBq2spqJ06sAmT qCmLhlZysaTv0gCFFzuWf533+WjmtmZTYU/PNcoNSOzCvdTWY81807ETmHThLk2cFp SwnQ/fdLi2OVg== 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 0F17EC54E5C; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:43 +0800 Subject: [PATCH net-next v10 1/8] dt-bindings: net: hisilicon-femac-mdio: convert to YAML Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-1-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=2517; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=stv+a/mRLJaLswc2WeXjirfjJSRDl5txIs38K87wIhs=; b=9j+FuIPIRUS4exeZWvRUUqli182hH9albcedJVvHCPLBrHPuQEELwVoMCxNg27Nh5UsQ1ZSNi 86J4wuWoK7mAkor+Q9fdQ8yP0dI4RCDC/+lAWl4y4SMOmSgzPllaEUt 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: 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-mdi= o.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.ya= ml 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 =3D "hisilicon,hisi-femac-mdio"; + reg =3D <0x10091100 0x20>; + clocks =3D <&clk_mdio>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + phy@1 { + reg =3D <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 =3D "hisilicon,hisi-femac-mdio"; - reg =3D <0x10091100 0x10>; - clocks =3D <&crg HI3516CV300_MDIO_CLK>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - phy0: phy@1 { - reg =3D <1>; - }; -}; --=20 2.43.0 From nobody Sat Feb 7 13:05:37 2026 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 983A82D056; Fri, 8 Mar 2024 08:39:45 +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=1709887185; cv=none; b=KTyPFFIKUn7MyS/2n4P1B+v8B5WVvwS7rX9iVcLZajVocNXvO5tOjfALrBpjOA2yjs6KcCvrO4udBEkHNWLHA2/4l2+RX/nfUa64HJbULpMfRsuiZ3v2Oixjmg7pcB/arPEPZrOhB00FvPeT+T5OhP4hsYeJ+JgWH9BGeS1+u+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887185; c=relaxed/simple; bh=7PtIg95ncCvxMHh4b5Xw5GAtbDAZ3d89g3e/YJ0Tj88=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N33fA3FwrTMCoKC9LaJv3riBUY06vbOnC1rqmpTJXCF1u7la77YkF3GO1l+MUzu5Dnr4tYWZDmG/92SHUDtaIqsei20Chsq3Jc5BbCay96bgamU/0ExWGEFOun3CzUcqljQCqmlOMaSoP2LFKJGEw+DjJ1QsP98IUTtTAlr8Fq0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f8bVT9Z6; 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="f8bVT9Z6" Received: by smtp.kernel.org (Postfix) with ESMTPS id 38720C43601; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=7PtIg95ncCvxMHh4b5Xw5GAtbDAZ3d89g3e/YJ0Tj88=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=f8bVT9Z6q00lAjeIuQ/cXMG5zMnhyznCiigrmuhWSzlonGOLf5eXOfYiNjnzIh7MC fXI7HdQZBAFZyIPrs+/IaLx/ZB41jS4CrkIF6SVQZJRCTVnj2GTrpNsSRqDGDwLF6A ziIeJTDblmvwPFlmSZOTZbdheVLiCZUUSRaAyvcAiagBOzep1BzS8hDsDWr+AOyZ6K 4L9Y0DEEs31GHmusUzCjJxD3GsE5JMpELn0IN6Pb8tz1AQMXfRcBEdXefMRFYVjIoc InCnPHTYLWwkPk8iT+1lVgaN9H/vgeErYKk3nyCKai/wpNjycGPaxGk5/rxLg3Dwbo RwHuRzUlTkDmw== 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 19EA3C54E5D; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:44 +0800 Subject: [PATCH net-next v10 2/8] dt-bindings: net: hisilicon,hisi-femac-mdio: remove clocks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-2-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=1118; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=zFRj07D287wM/dCKue4SsEqnuuC7qPQ9ydZbNJ2lxsQ=; b=yHH8xOkEC2GyWehveLVRl0U2v0pJCaLECM9glUUDFKhvcOEgRhVgkWLdZPMMRkPBN5m/19/Qa VxrqiX9dl76BqYkO/BToShYyQu0JCm0p1urSLHRZITScrajFY0fDJBw 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: 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-mdi= o.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.ya= ml 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 =20 - clocks: - maxItems: 1 - required: - compatible - reg - - clocks =20 unevaluatedProperties: false =20 @@ -34,7 +30,6 @@ examples: mdio@10091100 { compatible =3D "hisilicon,hisi-femac-mdio"; reg =3D <0x10091100 0x20>; - clocks =3D <&clk_mdio>; #address-cells =3D <1>; #size-cells =3D <0>; =20 --=20 2.43.0 From nobody Sat Feb 7 13:05:37 2026 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 A5CE437171; Fri, 8 Mar 2024 08:39:45 +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=1709887185; cv=none; b=f94g8S7lEyg98cGTHFGCNmQx8Jv1CiEpyTP7OOhBeXXG6cn/wNaaKKdSNcacw+ulsBJruHVXxy27sa5SPaMcftSmg61fQLplt4JsPQmTWTAxJvKT7DKd/YFxhOpDaXAmPMvHslE0a3gHghjaOug06wejh1WKCAqReXJWU92stCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887185; c=relaxed/simple; bh=vu47BKfN+xFcRDfbkn3C1v8zrm2ugq1RBZELrpt63GU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iXMT+lYsGK1hFgGA8QIKgcs3zWmM+8pArZmhQnN8vMY3aPgfdGWwx1x8cYJCo3tSXrq8gTQuDz7q7wczt1JbMsUn2YJga8QtXJNs93Kohl6FmeDMGY4uWHHH+k8b73ff87ozSxuT82hNuX/1BtzjvUs4Zv1dZKEYXG0IL3+iOkk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XowZlo8C; 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="XowZlo8C" Received: by smtp.kernel.org (Postfix) with ESMTPS id 4B0E0C433B2; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=vu47BKfN+xFcRDfbkn3C1v8zrm2ugq1RBZELrpt63GU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=XowZlo8CI5jsvJyhMHHI2i9sR5ERwgD1kwsyf1qwqoZ+EPj0YpUpI5384B2F0yeE2 ryrdtc/SbVlQX3n0yGRt3IkRxSAomFMU58uT+0UySnTK1iz4AQ0MVfTgpHtaJEoaSA vI4v2iQ7QLnreMgqGfNiOpQgylatMnINY4BD7YfyGsgvX90bJqwCSrv0jVw3yFrWbC 7hEE34ZHm8zcx0reqUrEHCusncfisxNWx/2ahufKIPpt8FtYZ6rEvT8a8FrbSz5b0K 7G0Va8bfxHhEyzQmWK5JEt4J9ojjMNa5I7x/ilLngf/DUR3YwFMd0HUo4Zxkh0pZSu FBoX1VMaeaorA== 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 3A445C5475B; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:45 +0800 Subject: [PATCH net-next v10 3/8] net: mdio: hisi-femac: remove clock Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-3-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=1802; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=kdWAr70dNlF5sryokQxZlrJGOk8Z9nw7ekwi0I/9miA=; b=SRw4iDjeFk1T6mGcCf8t/M0b4JZS0PffrYMwlRpgm50Cns3b/2wbnL4UCz3tCKA9UkxqTnSRP DI0hUoez7WzBuINuHlqtzA6orzNVzlY7xGwrlno/BwpW0p3Nl4orl8p 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: 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-his= i-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. */ =20 -#include #include #include #include @@ -21,7 +20,6 @@ #define BIT_WR_DATA_OFFSET 16 =20 struct hisi_femac_mdio_data { - struct clk *clk; void __iomem *membase; }; =20 @@ -93,26 +91,14 @@ static int hisi_femac_mdio_probe(struct platform_device= *pdev) goto err_out_free_mdiobus; } =20 - data->clk =3D devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(data->clk)) { - ret =3D PTR_ERR(data->clk); - goto err_out_free_mdiobus; - } - - ret =3D clk_prepare_enable(data->clk); - if (ret) - goto err_out_free_mdiobus; - ret =3D of_mdiobus_register(bus, np); if (ret) - goto err_out_disable_clk; + goto err_out_free_mdiobus; =20 platform_set_drvdata(pdev, bus); =20 return 0; =20 -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_devic= e *pdev) static void hisi_femac_mdio_remove(struct platform_device *pdev) { struct mii_bus *bus =3D platform_get_drvdata(pdev); - struct hisi_femac_mdio_data *data =3D bus->priv; =20 mdiobus_unregister(bus); - clk_disable_unprepare(data->clk); mdiobus_free(bus); } =20 --=20 2.43.0 From nobody Sat Feb 7 13:05:37 2026 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 BEA634E1D3; Fri, 8 Mar 2024 08:39:45 +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=1709887185; cv=none; b=iBlotf4JwxO0Ra/tEi3HIXq1QmNEyXJ6QppMDEcyvAnfYbMZ55FhYDkQQOhhEwfW/TGCH9aJUswyxv2ewUri+25A3fAZN7lMBXd9O9UPdnKcoyA1FYF7SYGKQgO3CEj27WsyacprMjCZTKuhJBz2NDqFTUegnxBioGz0FZPOXN8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887185; c=relaxed/simple; bh=e0q0yGSRFFLkhf3KJ0mtgBe9DUGdlUyvkBBfylc5F/Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hkdqOF0BO0Ru4J4asHM8CW+lNbxmeYPLdyMNouFXoJvBfIVVdZXvNa2XbM9q6BDQAiFkJCb75FgE4v3xekBND4Jk3IWlAU0STfro2u40VtPafFXQVQJOxheF5B7tKN560HgZ3gOi5Nc5zjYwjjRj5JBWFgnS0bnokrYAajltr5A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m3PKh2Su; 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="m3PKh2Su" Received: by smtp.kernel.org (Postfix) with ESMTPS id 584F4C4166A; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=e0q0yGSRFFLkhf3KJ0mtgBe9DUGdlUyvkBBfylc5F/Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=m3PKh2SuMUgfeINY87Lk+FX5XFzJq4k8CB6zY9XP7nslu+AJc8HhkI+HNzkA7OIsQ vdvtj2kFUOeuqwKoSX2wDVF5l/qPpdnk1zmWuUxzEMq1KvqRj9Z3wiWCSoPJet8pwB iDDFPIejcw6DbHg8iI9MaBmbPJGh/D3cjN7uXKTwpsQVytYWMEYIgGxU4VxBBd9NMY HB7MijvIFJjxn5b6ffxWGxp6ddA3iYAt9kK5y5ARP7diMmgdQRU36o5qNX3EjDzhP/ o7NdW+U2u/MDQJ3gIPKSfs+kglZc+XGy6zj0Xukv5DY7vGHw6UjtUdZumZoAx74Udz zvdtqvGSEMEOA== 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 454D7C54E5E; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:46 +0800 Subject: [PATCH net-next v10 4/8] dt-bindings: net: convert hisi-femac.txt to YAML Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-4-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=5287; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=FclGbNt5IHnTCzv0cmPEOdaR/+V9vDaeVaHJ31VX4FE=; b=moIxCVwEUa1k56XZm/W9khqMARqkBRiwQHp6N8QuB41dBuATd4MdjXxqrmc2ERjWFRvaT7Fws 6fJzpGejOvJCCoVBgzmm4yl+PXg140GThnPcJHy56pifeNhc52A923A 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: 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.yam= l 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 si= ze. + - 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 procedur= e. 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 =3D "hisilicon,hi3516cv300-femac"; + reg =3D <0x10090000 0x1000>, <0x10091300 0x200>; + interrupts =3D <12>; + clocks =3D <&clk_femac>, <&clk_femacif>, <&clk_fephy>; + clock-names =3D "mac", "macif", "phy"; + resets =3D <&crg 0xec 0>, <&crg 0xec 3>; + reset-names =3D "mac", "phy"; + mac-address =3D [00 00 00 00 00 00]; + phy-mode =3D "mii"; + phy-handle =3D <&fephy>; + hisilicon,phy-reset-delays-us =3D <10000 20000 20000>; + }; diff --git a/Documentation/devicetree/bindings/net/hisilicon-femac.txt b/Do= cumentation/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 giv= en. - 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 =3D "hisilicon,hi3516cv300-femac","hisilicon,hisi-femac-v2"; - reg =3D <0x10090000 0x1000>,<0x10091300 0x200>; - interrupts =3D <12>; - clocks =3D <&crg HI3518EV200_ETH_CLK>; - resets =3D <&crg 0xec 0>,<&crg 0xec 3>; - reset-names =3D "mac","phy"; - mac-address =3D [00 00 00 00 00 00]; - phy-mode =3D "mii"; - phy-handle =3D <&phy0>; - hisilicon,phy-reset-delays-us =3D <10000 20000 20000>; - }; --=20 2.43.0 From nobody Sat Feb 7 13:05:37 2026 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 E4819524D2; Fri, 8 Mar 2024 08:39:45 +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=1709887186; cv=none; b=g7xTRCSsKm/PrjYZGcv6UHT2bMCjMg2YmCqaQXz5FpgiEmC5BXIIll9vz9ulhaSex0RW6FmE8mTUdKL793pmV+nEtoSYoK8Vh06BSVoV83WSPdGazkDgKfabo+ltC9yLA8MQU4Lo1uWQ0AuyLjrCBNu4tM0zGXYO8NLEKOKdJhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887186; 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=SrgejpZdxJAxT9P1lwA02UEX6tjD/XN07l31RSsJjQIHLVjfUGKpXjgVFaq573MZq0pYQyVIFld+Xqwm5/rkSYX0ZpVzEYcLQlmA8VyWSRR0TGIJUBfKXqWfZRSch7OU7vwfUBDq8DYQVLk3B4HeZUJIPoGwZdiTYWCnAZAo6pA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SSwpU1Sf; 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="SSwpU1Sf" Received: by smtp.kernel.org (Postfix) with ESMTPS id 66F43C41612; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=S/doFh+gAKWZAIIBgfTAfdC4/d/iX9a1igOHcKDtz+w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=SSwpU1SfUbc2JrQ7TO+U85lvQAW3Xmt1LW2RAAEz4wA7uwdBvrVasEJD1DhP+6HAl nqW2s4zqc9yqDSR4uW76T2vpnFXKo0RFHRI5Dtt+SXhk0PiAIfaiLqVpqEHH3Z7GU8 /mGuR9phpkdGTuVU2juI9gj18cYvLjj7TobEOVioaTPZODVWtEawB13WxaIHV2HH+W h7KpPrkoxLoP/kKPK5EKWWuovdsKTgMOXSN5H+y5s0qPeOjEBVWauOkouilS6kNUC6 9/D5e7qtcU66dFsGE13+O3NRcARExU9Hhzv3D9Kugn6KmPgepYdnvw60wg+HVP13JR 9XB3glTYkX2gQ== 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 4F349C54E4A; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:47 +0800 Subject: [PATCH net-next v10 5/8] dt-bindings: net: hisi-femac: add mandatory MDIO bus subnode Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-5-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=2289; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=4fkGrr79J0kJPETyUJ+upr3jatyv9l4bbxNa0d6pOpo=; b=EhuknQz1y81X0Cf6TpUbJgN8zxZd+XplAMExrSaQmLcjRif3OwdEle+mxocGIt0HHNzT0N4Uc XN9xEnEb+j5BkIt8S1TBmnjQYSJB9HrMW8y385mY0nID+VWFPWXGDX/ 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: 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.yam= l 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 si= ze. - description: The second region is the global MAC control register. =20 + ranges: + maxItems: 1 + + '#address-cells': + const: 1 + + '#size-cells': + const: 1 + interrupts: maxItems: 1 =20 @@ -57,9 +66,16 @@ properties: - description: reset pulse for PHY - description: post-reset delay for PHY =20 +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 =3D "hisilicon,hi3516cv300-femac"; reg =3D <0x10090000 0x1000>, <0x10091300 0x200>; + ranges =3D <0x0 0x10090000 0x10000>; + #address-cells =3D <1>; + #size-cells =3D <1>; interrupts =3D <12>; clocks =3D <&clk_femac>, <&clk_femacif>, <&clk_fephy>; clock-names =3D "mac", "macif", "phy"; @@ -84,4 +103,15 @@ examples: phy-mode =3D "mii"; phy-handle =3D <&fephy>; hisilicon,phy-reset-delays-us =3D <10000 20000 20000>; + + mdio@1100 { + compatible =3D "hisilicon,hisi-femac-mdio"; + reg =3D <0x1100 0x20>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + phy@1 { + reg =3D <1>; + }; + }; }; --=20 2.43.0 From nobody Sat Feb 7 13:05:37 2026 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 E5E54524D4; Fri, 8 Mar 2024 08:39:45 +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=1709887186; cv=none; b=lmaKtkXHglwYff52TrrviHg/aIsb5CXnmJMTa3BPcMVWHq2NSUq1Q4Ou4QYh+MyqwpitgcS3WuWYNZCSt9RTffNxctx2Fp7cUzOnpH+cN5w33PXt9zPFN0ixlSfqcV2KWB6tqNbCFE3099GvHgjprCDoyBtyo8Z35IDx5Mwqui8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887186; c=relaxed/simple; bh=6GLdR1NzwuN3vF74pRPb7zqnKBAq4A6IwVQqiGNp8do=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cyKKiGXZZpvhkBfQEReVlYzG4Aam7ldtkr0gDjWII+NDIvEQi7ApycO03Ap0c8jAOhg7RjDqfJBArGIrx+IVZ/MsuzgyXGKmEVAWmiSKkiBFBZYUE4uqUJQvO/yRdhzG+vAc5yQrGrk8vBnwT7dPH6OfD3NwhDhdMZROdbDIwkQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dfd6CgSc; 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="dfd6CgSc" Received: by smtp.kernel.org (Postfix) with ESMTPS id 71C6FC3277C; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=6GLdR1NzwuN3vF74pRPb7zqnKBAq4A6IwVQqiGNp8do=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=dfd6CgScdrDkOenNuOa6Nw05rhzkLG+DhIQyadkwxNqpxgThpdUmRP8O25RQzQL7Q ejO8GQ33AY7NYceho5ONm9slNAmY7RJRiaBA4Sb+5FzJLFyMi5RiO2nnds4gdqlBW3 ZU1WPzl8kaHxyPoKdj8UU7Xf64F3Tgg4gEL1lNJlJE2YUBIjuU9inIQUiFAymjWEmJ Bh7LPIeD1oDiNAVQsz73wwjL3abHRRXVU61uuQ2WLkulhS047go2gh3ShfWX+Hgmx4 74WgYa8wr32YwntKdeMDUaX01c8AiYg5RRsXJ/LzisHHjuVh4/HsdT0akWC/2cqmn4 4Dz7LdhySSZMw== 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 59C57C54E5D; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:48 +0800 Subject: [PATCH net-next v10 6/8] dt-bindings: net: hisi-femac: add binding for Hi3798MV200 FEMAC core Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-6-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=1017; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=UOldq5CRtsm/LbzVGbDAknoLyxLVr+a/RNgHhOeLLzY=; b=UjLXcDkC1iGFxi4r1mMdTBtvkykYwtbSeS3izlFvAwHbVZVcNHy9Ytu+vGzY+PRDPV8xlTyEn Eni2Eu0RJFpAO/Wuqel4d92H1pW0z83RdLmqmmF+4pOr9ysOIsBI19t 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: 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. Signed-off-by: Yang Xiwen Reviewed-by: Krzysztof Kozlowski --- 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.yam= l 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: =20 properties: compatible: - enum: - - hisilicon,hi3516cv300-femac + oneOf: + - items: + - enum: + - hisilicon,hi3798mv200-femac + - const: hisilicon,hi3516cv300-femac + - const: hisilicon,hi3516cv300-femac =20 reg: items: --=20 2.43.0 From nobody Sat Feb 7 13:05:37 2026 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 1EA8152F8B; Fri, 8 Mar 2024 08:39:45 +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=1709887186; cv=none; b=pd0XAJWtvgkeeeL8gMAPCH9gdARn3JDeT0XyoKoPk0wTKTheBnn6VCfDjXk4IMeYG4ZfTLQ6OaglO4yUChbykGPnnv5eLzIvlv+fYAHB26xo4B8Lg6PrSgP1s3Juff5IN3cZR/TVFMqaD6Xc8stcyey4Dedy4gxRJdoVIZlI0Tg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887186; c=relaxed/simple; bh=9Khh/08IFLqiyY4llHeSF9dpSr+y2mbDaYQQexylJdQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sJKkZvgRIbuGw5D0DMzuxopBxnQn8k/qvAG3mjOu+udrOWoYBbWfqoJfssenqstvd4SHIs6+pThjWP4fJfG83+kU2ZptAlx3WnR5B/ILYPj2lH/cVZBV88T8qwgHRR3Jbz9eHwt55R7rADhWxFfWYD1VWimKQonL5/HT22YwS60= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FST+XwNg; 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="FST+XwNg" Received: by smtp.kernel.org (Postfix) with ESMTPS id 77E08C32780; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=9Khh/08IFLqiyY4llHeSF9dpSr+y2mbDaYQQexylJdQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=FST+XwNg3l9VmGBNHWKlIVl+jjMPSPhz7OUOCt264N5/qhKQnENS5kmJNaAPy+Rsz 391uzlm0yS51dBvXZJv4cLr1X0K1DPnOw+s2zPUVRY0KGMVUtvnP6McUtsc1y9ZiZO 5aQj4OvAEfxPxuEe7hzivMU6GJGQVoJQBmPV26Oyu+D8gP/BQCFLCmyWmDC5ThPSDH RaoG/pjnFdPz6lMMQ7wva81YOHL2jZzuWGw5MDr2dgBWRwTQVbqiN90dHZh170VxtN KRNwuT2Hf1p2gEwv0AB8fn0P5reAZqx+Q1wq1/ik1R/fwXr7YqVhckMVxo5ApYmXQO eQBgDBU1HGvKA== 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 64BF2C5475B; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:49 +0800 Subject: [PATCH net-next v10 7/8] net: hisi_femac: remove unused compatible strings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-7-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=937; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=aaQRrOl6ezTfgk2jYZxmgPEEzwU/YKquwXnutXaPBpI=; b=JVDMemOPx6deqODCs4vDjbyLOyfKBWlYFEEXCCqofDUeEfK1FdAi+8scQNRH+a4+s2yZYwoc1 QMgE1Xe2UhPCph6bY/ii33Ivq0SCQpu01e5Q2dRm1YyMaFaCRlBfwNO 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: 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. Signed-off-by: Yang Xiwen Acked-by: Krzysztof Kozlowski --- 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/ethe= rnet/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 =20 static const struct of_device_id hisi_femac_match[] =3D { - {.compatible =3D "hisilicon,hisi-femac-v1",}, - {.compatible =3D "hisilicon,hisi-femac-v2",}, {.compatible =3D "hisilicon,hi3516cv300-femac",}, {}, }; --=20 2.43.0 From nobody Sat Feb 7 13:05:37 2026 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 1D5A452F89; Fri, 8 Mar 2024 08:39:45 +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=1709887186; cv=none; b=JmFparhP5JjXRboTE4Xut5RohPmkG67igTQaWudolM+C6+581gYsDyypF1wqrPa/alsVW0Q9yudoOwtDB6Fuzolxpw8rYIc9+bcrxYAqpKeoKJ75wmgY+FFZUex+iTmWO55If8tPuZtPS3Qig0zKSGJZANALJO28nueJGcZRsvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709887186; c=relaxed/simple; bh=3ndi5x+AOKkkuN1jZhXL9mLzFshzVm6V3WcOvBa7RW0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RPfS2cZLAmF/3IStYZYOLlHgejZEl04tRIJ9fBfOzP9pRYcWDf40JTwcntmWJ2eVL/GJHYcz1emCJK90VD3A6T5XcApCKhJpZcpAVym1ORwmPxxGmQdOlk9G+wgOT7DCmVj+UpIMARdZE33J87J0PCl9+4DR3m/BEes9p76cAvU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kwRUUWVz; 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="kwRUUWVz" Received: by smtp.kernel.org (Postfix) with ESMTPS id 87CD0C32789; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709887185; bh=3ndi5x+AOKkkuN1jZhXL9mLzFshzVm6V3WcOvBa7RW0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=kwRUUWVzYymLEuO8uLmfNdyXkwFRMiXhuj0/YD+i0XPCxo0TEbnMMffxSEHPgM9oU BFja64vjbvBmWU3Xs97s52CyGqo7G9A8l/QR6tYDnWTs5snWYLCZ+b3TIPYsWoAJU4 w/eKcJsHgvTms3DP7K4OXqzLm0nm0I5n1Y1SXT1MBqyVmilI3iJu1kp8vqyTNg1OX3 zLjhtNcSQkjKnrA4NQhgEeJD/Ljm+ESBXN6AX17iagAhB7jyVXXZoXXle9dfPcOkUP t9rrZ/YGKq7e3OZQnyQgleR03/uvZuQO7+A3FgB0FmFIqL50Ys/AT9N/9I3LdFd1Y5 gFt29lVAFZryg== 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 6E1FFC54E5C; Fri, 8 Mar 2024 08:39:45 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Fri, 08 Mar 2024 16:39:50 +0800 Subject: [PATCH net-next v10 8/8] net: hisi_femac: remove unneeded MODULE_ALIAS() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240308-net-v10-8-3684df40897e@outlook.com> References: <20240308-net-v10-0-3684df40897e@outlook.com> In-Reply-To: <20240308-net-v10-0-3684df40897e@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=1709887184; l=759; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=uL7LyY/J5pSqlD2z/1TEbFEFBkXEinuPTyuh1Re7jzE=; b=UsaE+jHuRZvUIbRpHxIgOLRJQR07lC6/TlyHzgQ8F/LfgY0Z6IZAc7htq8eSvgpbBS1NNAthj id3ugYnbDvCD6U2Q8FeGN4bBdiE7TQLcatKlfcIXH7XUc0XuLFkhhX2 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: 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/ethe= rnet/hisilicon/hisi_femac.c index 9bf4beba7987..f0f2a3cd8d1d 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -969,4 +969,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"); --=20 2.43.0