Commit 9626c182 authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'net-phy-mdio-bcm-unimac-add-bcm6846-variant'

Linus Walleij says:

====================
net: phy: mdio-bcm-unimac: Add BCM6846 variant

As pointed out by Florian:
https://lore.kernel.org/linux-devicetree/b542b2e8-115c-4234-a464-e73aa6bece5c@broadcom.com/

The BCM6846 has a few extra registers and cannot reuse the
compatible string from other variants of the Unimac
MDIO block: we need to be able to tell them apart.
====================

Link: https://patch.msgid.link/20241012-bcm6846-mdio-v1-0-c703ca83e962@linaro.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d96016a7 906b77ca
...@@ -26,6 +26,7 @@ properties: ...@@ -26,6 +26,7 @@ properties:
- brcm,asp-v2.1-mdio - brcm,asp-v2.1-mdio
- brcm,asp-v2.2-mdio - brcm,asp-v2.2-mdio
- brcm,unimac-mdio - brcm,unimac-mdio
- brcm,bcm6846-mdio
reg: reg:
minItems: 1 minItems: 1
......
...@@ -337,6 +337,7 @@ static const struct of_device_id unimac_mdio_ids[] = { ...@@ -337,6 +337,7 @@ static const struct of_device_id unimac_mdio_ids[] = {
{ .compatible = "brcm,asp-v2.2-mdio", }, { .compatible = "brcm,asp-v2.2-mdio", },
{ .compatible = "brcm,asp-v2.1-mdio", }, { .compatible = "brcm,asp-v2.1-mdio", },
{ .compatible = "brcm,asp-v2.0-mdio", }, { .compatible = "brcm,asp-v2.0-mdio", },
{ .compatible = "brcm,bcm6846-mdio", },
{ .compatible = "brcm,genet-mdio-v5", }, { .compatible = "brcm,genet-mdio-v5", },
{ .compatible = "brcm,genet-mdio-v4", }, { .compatible = "brcm,genet-mdio-v4", },
{ .compatible = "brcm,genet-mdio-v3", }, { .compatible = "brcm,genet-mdio-v3", },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment