svn commit: r308639 - in head/sys/arm: allwinner amlogic/aml8726 annapurna/alpine freescale/imx ti

[Andrew Turner]

Author: andrew
Date: Mon Nov 14 11:52:22 2016
New Revision: 308639
URL: https://svnweb.freebsd.org/changeset/base/308639

Log:
  Move including fdt_pinctrl.h after openfirm.h to get th edefinition of
  phandle_t and remove the need for including fdt_common.h.
  
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/arm/allwinner/a10_gpio.c
  head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c
  head/sys/arm/annapurna/alpine/alpine_machdep_mp.c
  head/sys/arm/freescale/imx/imx_iomux.c
  head/sys/arm/ti/ti_pinmux.c
  head/sys/arm/ti/ti_scm.c

Modified: head/sys/arm/allwinner/a10_gpio.c
==============================================================================
--- head/sys/arm/allwinner/a10_gpio.c	Mon Nov 14 11:41:22 2016	(r308638)
+++ head/sys/arm/allwinner/a10_gpio.c	Mon Nov 14 11:52:22 2016	(r308639)
@@ -44,11 +44,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <machine/intr.h>
 
-#include <dev/fdt/fdt_common.h>
-#include <dev/fdt/fdt_pinctrl.h>
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
+#include <dev/fdt/fdt_pinctrl.h>
 
 #include <arm/allwinner/aw_machdep.h>
 #include <arm/allwinner/allwinner_pinctrl.h>

Modified: head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c
==============================================================================
--- head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c	Mon Nov 14 11:41:22 2016	(r308638)
+++ head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c	Mon Nov 14 11:52:22 2016	(r308639)
@@ -45,10 +45,9 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <dev/fdt/fdt_common.h>
-#include <dev/fdt/fdt_pinctrl.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
+#include <dev/fdt/fdt_pinctrl.h>
 
 #include <arm/amlogic/aml8726/aml8726_soc.h>
 #include <arm/amlogic/aml8726/aml8726_pinctrl.h>

Modified: head/sys/arm/annapurna/alpine/alpine_machdep_mp.c
==============================================================================
--- head/sys/arm/annapurna/alpine/alpine_machdep_mp.c	Mon Nov 14 11:41:22 2016	(r308638)
+++ head/sys/arm/annapurna/alpine/alpine_machdep_mp.c	Mon Nov 14 11:52:22 2016	(r308639)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu-v6.h>
 
 #include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_cpu.h>
 #include <dev/ofw/ofw_bus_subr.h>
 

Modified: head/sys/arm/freescale/imx/imx_iomux.c
==============================================================================
--- head/sys/arm/freescale/imx/imx_iomux.c	Mon Nov 14 11:41:22 2016	(r308638)
+++ head/sys/arm/freescale/imx/imx_iomux.c	Mon Nov 14 11:52:22 2016	(r308639)
@@ -59,11 +59,10 @@
 
 #include <machine/bus.h>
 
-#include <dev/fdt/fdt_common.h>
-#include <dev/fdt/fdt_pinctrl.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
+#include <dev/fdt/fdt_pinctrl.h>
 
 #include <arm/freescale/imx/imx_iomuxvar.h>
 #include <arm/freescale/imx/imx_machdep.h>

Modified: head/sys/arm/ti/ti_pinmux.c
==============================================================================
--- head/sys/arm/ti/ti_pinmux.c	Mon Nov 14 11:41:22 2016	(r308638)
+++ head/sys/arm/ti/ti_pinmux.c	Mon Nov 14 11:52:22 2016	(r308639)
@@ -49,11 +49,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/fdt/fdt_common.h>
-#include <dev/fdt/fdt_pinctrl.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
+#include <dev/fdt/fdt_pinctrl.h>
 
 #include "ti_pinmux.h"
 

Modified: head/sys/arm/ti/ti_scm.c
==============================================================================
--- head/sys/arm/ti/ti_scm.c	Mon Nov 14 11:41:22 2016	(r308638)
+++ head/sys/arm/ti/ti_scm.c	Mon Nov 14 11:52:22 2016	(r308639)
@@ -61,11 +61,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/fdt/fdt_common.h>
-#include <dev/fdt/fdt_pinctrl.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
+#include <dev/fdt/fdt_pinctrl.h>
 
 #include "ti_scm.h"