Skip to content

Commit

Permalink
net: ethernet: sunxi: Add new compatibles
Browse files Browse the repository at this point in the history
The Allwinner A10 compatibles were following a slightly different compatible
patterns than the rest of the SoCs for historical reasons. Add compatibles
matching the other pattern to the ethernet driver for consistency, and keep the
older one for backward compatibility.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Maxime Ripard authored and David S. Miller committed Feb 7, 2014
1 parent 028b86b commit 4dae168
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
* Allwinner EMAC ethernet controller

Required properties:
- compatible: should be "allwinner,sun4i-emac".
- compatible: should be "allwinner,sun4i-a10-emac" (Deprecated:
"allwinner,sun4i-emac")
- reg: address and length of the register set for the device.
- interrupts: interrupt for the device
- phy: A phandle to a phy node defining the PHY address (as the reg
Expand All @@ -14,7 +15,7 @@ Optional properties:
Example:

emac: ethernet@01c0b000 {
compatible = "allwinner,sun4i-emac";
compatible = "allwinner,sun4i-a10-emac";
reg = <0x01c0b000 0x1000>;
interrupts = <55>;
clocks = <&ahb_gates 17>;
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/ethernet/allwinner/sun4i-emac.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,9 @@ static int emac_resume(struct platform_device *dev)
}

static const struct of_device_id emac_of_match[] = {
{.compatible = "allwinner,sun4i-a10-emac",},

/* Deprecated */
{.compatible = "allwinner,sun4i-emac",},
{},
};
Expand Down

0 comments on commit 4dae168

Please sign in to comment.