From owner-svn-src-projects@FreeBSD.ORG Sun Aug 28 18:25:32 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 041881065673; Sun, 28 Aug 2011 18:25:32 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E8AAF8FC18; Sun, 28 Aug 2011 18:25:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7SIPVpe062513; Sun, 28 Aug 2011 18:25:31 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7SIPV1c062511; Sun, 28 Aug 2011 18:25:31 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201108281825.p7SIPV1c062511@svn.freebsd.org> From: Olivier Houchard Date: Sun, 28 Aug 2011 18:25:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225235 - projects/armv6/sys/dev/uart X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 18:25:32 -0000 Author: cognet Date: Sun Aug 28 18:25:31 2011 New Revision: 225235 URL: http://svn.freebsd.org/changeset/base/225235 Log: Only set the class to quicc if the fdt says so. Submitted by: Damjan Marion Modified: projects/armv6/sys/dev/uart/uart_bus_fdt.c Modified: projects/armv6/sys/dev/uart/uart_bus_fdt.c ============================================================================== --- projects/armv6/sys/dev/uart/uart_bus_fdt.c Sun Aug 28 18:09:17 2011 (r225234) +++ projects/armv6/sys/dev/uart/uart_bus_fdt.c Sun Aug 28 18:25:31 2011 (r225235) @@ -180,7 +180,8 @@ uart_cpu_getdev(int devtype, struct uart /* * Finalize configuration. */ - class = &uart_quicc_class; + if (fdt_is_compatible(node, "quicc")) + class = &uart_quicc_class; if (fdt_is_compatible(node, "ns16550")) class = &uart_ns8250_class;