--- /dev/null
+From fa5767ca356bcdfdb1bfa055851579a858a5ed25 Mon Sep 17 00:00:00 2001
+From: Andre Przywara <andre.przywara@arm.com>
+Date: Sun, 12 Feb 2017 14:53:16 +0000
+Subject: introduce and use sunxi_gpio_setup_dt_pins()
+
+---
+ arch/arm/include/asm/arch-sunxi/gpio.h | 2 ++
+ arch/arm/mach-sunxi/pinmux.c | 61 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 63 insertions(+)
+
+--- a/arch/arm/include/asm/arch-sunxi/gpio.h
++++ b/arch/arm/include/asm/arch-sunxi/gpio.h
+@@ -242,5 +242,7 @@ static inline int axp_gpio_init(void) {
+ #endif
+
+ int sunxi_gpio_parse_pin_name(const char *pin_name);
++int sunxi_gpio_setup_dt_pins(const void * volatile fdt_blob, int node,
++ const char * mux_name, int mux_sel);
+
+ #endif /* _SUNXI_GPIO_H */
+--- a/arch/arm/mach-sunxi/pinmux.c
++++ b/arch/arm/mach-sunxi/pinmux.c
+@@ -9,6 +9,9 @@
+ #include <common.h>
+ #include <asm/io.h>
+ #include <asm/arch/gpio.h>
++#include <fdtdec.h>
++#include <fdt_support.h>
++#include <dt-bindings/pinctrl/sun4i-a10.h>
+
+ void sunxi_gpio_set_cfgbank(struct sunxi_gpio *pio, int bank_offset, u32 val)
+ {
+@@ -85,3 +88,61 @@ int sunxi_gpio_parse_pin_name(const char
+
+ return pin;
+ }
++
++int sunxi_gpio_setup_dt_pins(const void * volatile fdt_blob, int node,
++ const char * mux_name, int mux_sel)
++{
++ int drive, pull, pin, i;
++ const char *pin_name;
++ int offset;
++
++ offset = fdtdec_lookup_phandle(fdt_blob, node, "pinctrl-0");
++ if (offset < 0)
++ return offset;
++
++ drive = fdt_getprop_u32_default_node(fdt_blob, offset, 0,
++ "drive-strength", 0);
++ if (drive) {
++ 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(fdt_blob, offset, 0,
++ "allwinner,drive", 4);
++ }
++
++ if (fdt_get_property(fdt_blob, offset, "bias-pull-up", NULL))
++ pull = SUN4I_PINCTRL_PULL_UP;
++ else if (fdt_get_property(fdt_blob, offset, "bias-disable", NULL))
++ pull = SUN4I_PINCTRL_NO_PULL;
++ else if (fdt_get_property(fdt_blob, offset, "bias-pull-down", NULL))
++ pull = SUN4I_PINCTRL_PULL_DOWN;
++ else
++ pull = fdt_getprop_u32_default_node(fdt_blob, offset, 0,
++ "allwinner,pull", 0);
++
++ for (i = 0; ; i++) {
++ pin_name = fdt_stringlist_get(fdt_blob, offset,
++ "allwinner,pins", i, NULL);
++ if (!pin_name) {
++ pin_name = fdt_stringlist_get(fdt_blob, offset,
++ "pins", i, NULL);
++ if (!pin_name)
++ break;
++ }
++ pin = sunxi_gpio_parse_pin_name(pin_name);
++ if (pin < 0)
++ continue;
++
++ sunxi_gpio_set_cfgpin(pin, mux_sel);
++ sunxi_gpio_set_drv(pin, drive);
++ sunxi_gpio_set_pull(pin, pull);
++ }
++
++ return i;
++}