Date: Sat, 17 May 2014 21:31:58 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266360 - in stable/10/sys: arm/freescale/imx dev/ata/chipsets dev/vt/hw/fb Message-ID: <201405172131.s4HLVwgu015327@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Sat May 17 21:31:58 2014 New Revision: 266360 URL: http://svnweb.freebsd.org/changeset/base/266360 Log: 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 Modified: stable/10/sys/arm/freescale/imx/files.imx53 stable/10/sys/dev/ata/chipsets/ata-fsl.c stable/10/sys/dev/vt/hw/fb/vt_early_fb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/freescale/imx/files.imx53 ============================================================================== --- stable/10/sys/arm/freescale/imx/files.imx53 Sat May 17 21:28:49 2014 (r266359) +++ stable/10/sys/arm/freescale/imx/files.imx53 Sat May 17 21:31:58 2014 (r266360) @@ -48,6 +48,8 @@ arm/freescale/imx/i2c.c optional fslii # 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 Modified: stable/10/sys/dev/ata/chipsets/ata-fsl.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-fsl.c Sat May 17 21:28:49 2014 (r266359) +++ stable/10/sys/dev/ata/chipsets/ata-fsl.c Sat May 17 21:31:58 2014 (r266360) @@ -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); Modified: stable/10/sys/dev/vt/hw/fb/vt_early_fb.c ============================================================================== --- stable/10/sys/dev/vt/hw/fb/vt_early_fb.c Sat May 17 21:28:49 2014 (r266359) +++ stable/10/sys/dev/vt/hw/fb/vt_early_fb.c Sat May 17 21:31:58 2014 (r266360) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405172131.s4HLVwgu015327>