Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Maxime Ripard and committed by
David S. Miller
4dae1686 028b86b7

+6 -2
+3 -2
Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
··· 1 1 * Allwinner EMAC ethernet controller 2 2 3 3 Required properties: 4 - - compatible: should be "allwinner,sun4i-emac". 4 + - compatible: should be "allwinner,sun4i-a10-emac" (Deprecated: 5 + "allwinner,sun4i-emac") 5 6 - reg: address and length of the register set for the device. 6 7 - interrupts: interrupt for the device 7 8 - phy: A phandle to a phy node defining the PHY address (as the reg ··· 15 14 Example: 16 15 17 16 emac: ethernet@01c0b000 { 18 - compatible = "allwinner,sun4i-emac"; 17 + compatible = "allwinner,sun4i-a10-emac"; 19 18 reg = <0x01c0b000 0x1000>; 20 19 interrupts = <55>; 21 20 clocks = <&ahb_gates 17>;
+3
drivers/net/ethernet/allwinner/sun4i-emac.c
··· 929 929 } 930 930 931 931 static const struct of_device_id emac_of_match[] = { 932 + {.compatible = "allwinner,sun4i-a10-emac",}, 933 + 934 + /* Deprecated */ 932 935 {.compatible = "allwinner,sun4i-emac",}, 933 936 {}, 934 937 };