Skip to content

Commit 9626c18

Browse files
committed
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/[email protected]/ 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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents d96016a + 906b77c commit 9626c18

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- brcm,asp-v2.1-mdio
2727
- brcm,asp-v2.2-mdio
2828
- brcm,unimac-mdio
29+
- brcm,bcm6846-mdio
2930

3031
reg:
3132
minItems: 1

drivers/net/mdio/mdio-bcm-unimac.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ static const struct of_device_id unimac_mdio_ids[] = {
337337
{ .compatible = "brcm,asp-v2.2-mdio", },
338338
{ .compatible = "brcm,asp-v2.1-mdio", },
339339
{ .compatible = "brcm,asp-v2.0-mdio", },
340+
{ .compatible = "brcm,bcm6846-mdio", },
340341
{ .compatible = "brcm,genet-mdio-v5", },
341342
{ .compatible = "brcm,genet-mdio-v4", },
342343
{ .compatible = "brcm,genet-mdio-v3", },

0 commit comments

Comments
 (0)