aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/allwinner
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-02-02 14:49:11 +0100
committerDavid S. Miller <davem@davemloft.net>2014-02-06 19:46:54 -0800
commit4dae1686782d52084893421b89ff1aa61e223aaf (patch)
treef6187e7927634175f487aecdf57880980893f97a /drivers/net/ethernet/allwinner
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch (diff)
downloadlinux-dev-4dae1686782d52084893421b89ff1aa61e223aaf.tar.xz
linux-dev-4dae1686782d52084893421b89ff1aa61e223aaf.zip
net: ethernet: sunxi: Add new compatibles
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>
Diffstat (limited to 'drivers/net/ethernet/allwinner')
-rw-r--r--drivers/net/ethernet/allwinner/sun4i-emac.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 0cc21437478c..511f6eecd58b 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -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",},
{},
};