From owner-svn-src-stable-10@FreeBSD.ORG Sat May 17 21:31:59 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 803A1B96; Sat, 17 May 2014 21:31:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 52B74294B; Sat, 17 May 2014 21:31:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HLVxP8015333; Sat, 17 May 2014 21:31:59 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HLVwgu015327; Sat, 17 May 2014 21:31:58 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201405172131.s4HLVwgu015327@svn.freebsd.org> From: Ian Lepore Date: Sat, 17 May 2014 21:31:58 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 21:31:59 -0000 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 #include #include +#include #endif #include