Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Aug 2016 00:46:22 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r304649 - head/sys/arm/allwinner
Message-ID:  <201608230046.u7N0kMdK098587@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: manu
Date: Tue Aug 23 00:46:22 2016
New Revision: 304649
URL: https://svnweb.freebsd.org/changeset/base/304649

Log:
  Do not include file from dt-bindings and simply use the already present defines.
  
  Reported by:	jmcneill
  MFC after:	1 week

Modified:
  head/sys/arm/allwinner/a10_gpio.c

Modified: head/sys/arm/allwinner/a10_gpio.c
==============================================================================
--- head/sys/arm/allwinner/a10_gpio.c	Tue Aug 23 00:00:06 2016	(r304648)
+++ head/sys/arm/allwinner/a10_gpio.c	Tue Aug 23 00:46:22 2016	(r304649)
@@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/extres/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
-#include <dt-bindings/pinctrl/sun4i-a10.h>
-
 #if defined(__aarch64__)
 #include "opt_soc.h"
 #endif
@@ -602,8 +600,8 @@ aw_fdt_configure_pins(device_t dev, phan
 		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 &&
-			(pin_pull == SUN4I_PINCTRL_PULL_UP ||
-			    pin_pull == SUN4I_PINCTRL_PULL_DOWN))
+			(pin_pull == A10_GPIO_PULLUP ||
+			    pin_pull == A10_GPIO_PULLDOWN))
 			a10_gpio_set_pud(sc, pin_num, pin_pull);
 		A10_GPIO_UNLOCK(sc);
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608230046.u7N0kMdK098587>