summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-17 21:31:58 +0000
committerian <ian@FreeBSD.org>2014-05-17 21:31:58 +0000
commit9aa7e8141a214122f40afb43c3ee367917fe5591 (patch)
treedc9cb598a3dc23c5d3673a9f071e6ac7e4d65cd0 /sys
parentcc062c369979669d8f37af0dbb92662a51d1abef (diff)
downloadFreeBSD-src-9aa7e8141a214122f40afb43c3ee367917fe5591.zip
FreeBSD-src-9aa7e8141a214122f40afb43c3ee367917fe5591.tar.gz
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
Diffstat (limited to 'sys')
-rw-r--r--sys/arm/freescale/imx/files.imx532
-rw-r--r--sys/dev/ata/chipsets/ata-fsl.c3
-rw-r--r--sys/dev/vt/hw/fb/vt_early_fb.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx53
index 1968247..57ff39e 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 794802e..aebf9a2 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 b471dec..4a81f4f 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>
OpenPOWER on IntegriCloud