target/linux/sunxi/patches-3.13/231-dt-sunxi-net-phy-add-new-compats.patch

   1 From efe205704fa8435b7bca495138dd2dbd973e0c28 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
   3 Date: Sun, 2 Feb 2014 14:49:12 +0100
   4 Subject: [PATCH] net: phy: sunxi: Add new compatibles
   5
   6 The Allwinner A10 compatibles were following a slightly different compatible
   7 patterns than the rest of the SoCs for historical reasons. Add compatibles
   8 matching the other pattern to the mdio driver for consistency, and keep the
   9 older one for backward compatibility.
  10
  11 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14  Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt | 5 +++--
  15  drivers/net/phy/mdio-sun4i.c                                   | 3 +++
  16  2 files changed, 6 insertions(+), 2 deletions(-)
  17
  18 diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
  19 index 00b9f9a..4ec5641 100644
  20 --- a/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
  21 +++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
  22 @@ -1,7 +1,8 @@
  23  * Allwinner A10 MDIO Ethernet Controller interface
  24
  25  Required properties:
  26 -- compatible: should be "allwinner,sun4i-mdio".
  27 +- compatible: should be "allwinner,sun4i-a10-mdio"
  28 +              (Deprecated: "allwinner,sun4i-mdio").
  29  - reg: address and length of the register set for the device.
  30
  31  Optional properties:
  32 @@ -9,7 +10,7 @@ Optional properties:
  33
  34  Example at the SoC level:
  35  mdio@01c0b080 {
  36 -       compatible = "allwinner,sun4i-mdio";
  37 +       compatible = "allwinner,sun4i-a10-mdio";
  38         reg = <0x01c0b080 0x14>;
  39         #address-cells = <1>;
  40         #size-cells = <0>;
  41 diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c
  42 index bb88bc7..9367acc 100644
  43 --- a/drivers/net/phy/mdio-sun4i.c
  44 +++ b/drivers/net/phy/mdio-sun4i.c
  45 @@ -170,6 +170,9 @@ static int sun4i_mdio_remove(struct platform_device *pdev)
  46  }
  47
  48  static const struct of_device_id sun4i_mdio_dt_ids[] = {
  49 +       { .compatible = "allwinner,sun4i-a10-mdio" },
  50 +
  51 +       /* Deprecated */
  52         { .compatible = "allwinner,sun4i-mdio" },
  53         { }
  54  };
  55 --
  56 1.8.5.5
  57