From f6b03ec6ba4e31617356991841af8facfd60a8a9 Mon Sep 17 00:00:00 2001
From: ian <ian@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 17 May 2014 21:31:58 +0000
Subject: [PATCH] MFC 264180, 264181, 264182:

  Follow files.imx51 and add vt support for imx53.

  Add fsl,imx53 compatible string.

  Need to include machine/fdt.h in vt_early_fb.c


git-svn-id: svn://svn.freebsd.org/base/stable/10@266360 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/arm/freescale/imx/files.imx53 | 2 ++
 sys/dev/ata/chipsets/ata-fsl.c    | 3 ++-
 sys/dev/vt/hw/fb/vt_early_fb.c    | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx53
index 1968247d8..57ff39e5d 100644
--- a/sys/arm/freescale/imx/files.imx53
+++ b/sys/arm/freescale/imx/files.imx53
@@ -48,6 +48,8 @@ arm/freescale/imx/i2c.c			optional fsliic
 
 # IPU - Image Processing Unit (frame buffer also)
 arm/freescale/imx/imx51_ipuv3.c		optional sc
+arm/freescale/imx/imx51_ipuv3_fbd.c	optional vt
+dev/vt/hw/fb/vt_early_fb.c		optional vt
 
 # Fast Ethernet Controller
 dev/ffec/if_ffec.c 			optional ffec
diff --git a/sys/dev/ata/chipsets/ata-fsl.c b/sys/dev/ata/chipsets/ata-fsl.c
index 794802e38..aebf9a2eb 100644
--- a/sys/dev/ata/chipsets/ata-fsl.c
+++ b/sys/dev/ata/chipsets/ata-fsl.c
@@ -72,7 +72,8 @@ imx_ata_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (!ofw_bus_is_compatible(dev, "fsl,imx51-ata"))
+	if (!ofw_bus_is_compatible(dev, "fsl,imx51-ata") &&
+	    !ofw_bus_is_compatible(dev, "fsl,imx53-ata"))
 		return (ENXIO);
 
 	ctrl = device_get_softc(dev);
diff --git a/sys/dev/vt/hw/fb/vt_early_fb.c b/sys/dev/vt/hw/fb/vt_early_fb.c
index b471decc1..4a81f4f41 100644
--- a/sys/dev/vt/hw/fb/vt_early_fb.c
+++ b/sys/dev/vt/hw/fb/vt_early_fb.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_pci.h>
+#include <machine/fdt.h>
 #endif
 
 #include <dev/vt/vt.h>
-- 
2.45.0