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>
This commit is contained in:
Maxime Ripard 2014-02-02 14:49:11 +01:00 коммит произвёл David S. Miller
Родитель 028b86b767
Коммит 4dae168678
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -1,7 +1,8 @@
* Allwinner EMAC ethernet controller * Allwinner EMAC ethernet controller
Required properties: 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. - reg: address and length of the register set for the device.
- interrupts: interrupt for the device - interrupts: interrupt for the device
- phy: A phandle to a phy node defining the PHY address (as the reg - phy: A phandle to a phy node defining the PHY address (as the reg
@ -14,7 +15,7 @@ Optional properties:
Example: Example:
emac: ethernet@01c0b000 { emac: ethernet@01c0b000 {
compatible = "allwinner,sun4i-emac"; compatible = "allwinner,sun4i-a10-emac";
reg = <0x01c0b000 0x1000>; reg = <0x01c0b000 0x1000>;
interrupts = <55>; interrupts = <55>;
clocks = <&ahb_gates 17>; clocks = <&ahb_gates 17>;

Просмотреть файл

@ -929,6 +929,9 @@ static int emac_resume(struct platform_device *dev)
} }
static const struct of_device_id emac_of_match[] = { static const struct of_device_id emac_of_match[] = {
{.compatible = "allwinner,sun4i-a10-emac",},
/* Deprecated */
{.compatible = "allwinner,sun4i-emac",}, {.compatible = "allwinner,sun4i-emac",},
{}, {},
}; };