svn commit: r305439 - stable/11/sys/arm/allwinner

[Emmanuel Vadot]

Author: manu
Date: Mon Sep  5 20:46:45 2016
New Revision: 305439
URL: https://svnweb.freebsd.org/changeset/base/305439

Log:
  MFC r304290,r304649
  
  r304290:
  Only set pud settings if this is a pullup or pulldown configuration.
  This removes the need to set the MMC pins with pullups in our DTS.
  Thanks to jmcneill@ for spotting this.
  
  r304649:
  Do not include file from dt-bindings and simply use the already present defines.

Modified:
  stable/11/sys/arm/allwinner/a10_gpio.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/allwinner/a10_gpio.c
==============================================================================
--- stable/11/sys/arm/allwinner/a10_gpio.c	Mon Sep  5 20:34:15 2016	(r305438)
+++ stable/11/sys/arm/allwinner/a10_gpio.c	Mon Sep  5 20:46:45 2016	(r305439)
@@ -585,7 +585,9 @@ aw_fdt_configure_pins(device_t dev, phan
 			a10_gpio_set_function(sc, pin_num, pin_func);
 		if (a10_gpio_get_drv(sc, pin_num) != pin_drive)
 			a10_gpio_set_drv(sc, pin_num, pin_drive);
-		if (a10_gpio_get_pud(sc, pin_num) != pin_pull)
+		if (a10_gpio_get_pud(sc, pin_num) != pin_pull &&
+			(pin_pull == A10_GPIO_PULLUP ||
+			    pin_pull == A10_GPIO_PULLDOWN))
 			a10_gpio_set_pud(sc, pin_num, pin_pull);
 		A10_GPIO_UNLOCK(sc);
 	}