net: sun8i-emac: support new pinctrl DT bindings

The Linux kernel driver for the Allwinner pin controller gained support
for generic properties, which are now also used in the DTs.
The sun8i-emac Ethernet driver for new Allwinner MACs reads the pins from
the DT, but so far only supported the old binding.
Update the parsing routine to cope with both the old and new bindings,
so that the newer DTs can be used with U-Boot and its Ethernet driver.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>

diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index be43472b1aac64c3b625ee9d1fbd2f8a5c9cca30..c8c8ef73e9b774d8f706ac3411490100ec3306b4 100644 (file)
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <net.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
 #ifdef CONFIG_DM_GPIO
 #include <asm-generic/gpio.h>
 #endif
@@ -465,30 +466,55 @@ static int parse_phy_pins(struct udevice *dev)
        }
 
        drive = fdt_getprop_u32_default_node(gd->fdt_blob, offset, 0,
-                                            "allwinner,drive", 4);
-       pull = fdt_getprop_u32_default_node(gd->fdt_blob, offset, 0,
-                                           "allwinner,pull", 0);
+                                            "drive-strength", ~0);
+       if (drive != ~0) {
+               if (drive <= 10)
+                       drive = SUN4I_PINCTRL_10_MA;
+               else if (drive <= 20)
+                       drive = SUN4I_PINCTRL_20_MA;
+               else if (drive <= 30)
+                       drive = SUN4I_PINCTRL_30_MA;
+               else
+                       drive = SUN4I_PINCTRL_40_MA;
+       } else {
+               drive = fdt_getprop_u32_default_node(gd->fdt_blob, offset, 0,
+                                                    "allwinner,drive", 4);
+       }
+
+       if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-up", NULL))
+               pull = SUN4I_PINCTRL_PULL_UP;
+       else if (fdt_get_property(gd->fdt_blob, offset, "bias-disable", NULL))
+               pull = SUN4I_PINCTRL_NO_PULL;
+       else if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-down", NULL))
+               pull = SUN4I_PINCTRL_PULL_DOWN;
+       else
+               pull = fdt_getprop_u32_default_node(gd->fdt_blob, offset, 0,
+                                                   "allwinner,pull", 0);
        for (i = 0; ; i++) {
                int pin;
 
                pin_name = fdt_stringlist_get(gd->fdt_blob, offset,
                                              "allwinner,pins", i, NULL);
-               if (!pin_name)
-                       break;
-               if (pin_name[0] != 'P')
-                       continue;
-               pin = (pin_name[1] - 'A') << 5;
-               if (pin >= 26 << 5)
+               if (!pin_name) {
+                       pin_name = fdt_stringlist_get(gd->fdt_blob, offset,
+                                                     "pins", i, NULL);
+                       if (!pin_name)
+                               break;
+               }
+
+               pin = sunxi_name_to_gpio(pin_name);
+               if (pin < 0)
                        continue;
-               pin += simple_strtol(&pin_name[2], NULL, 10);
 
                sunxi_gpio_set_cfgpin(pin, SUN8I_GPD8_GMAC);
-               sunxi_gpio_set_drv(pin, drive);
-               sunxi_gpio_set_pull(pin, pull);
+               if (drive != ~0)
+                       sunxi_gpio_set_drv(pin, drive);
+               if (pull != ~0)
+                       sunxi_gpio_set_pull(pin, pull);
        }
 
        if (!i) {
-               printf("WARNING: emac: cannot find allwinner,pins property\n");
+               printf("WARNING: emac: cannot find pins property\n");
                return -2;
        }