From owner-svn-src-head@freebsd.org Tue Feb 28 14:42:59 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3BDC2CF1D41; Tue, 28 Feb 2017 14:42:59 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 0B9E36D6; Tue, 28 Feb 2017 14:42:58 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SEgwHm088391; Tue, 28 Feb 2017 14:42:58 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SEgwKU088390; Tue, 28 Feb 2017 14:42:58 GMT (envelope-from br@FreeBSD.org) Message-Id: <201702281442.v1SEgwKU088390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Tue, 28 Feb 2017 14:42:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314390 - head/sys/dev/usb/controller X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2017 14:42:59 -0000 Author: br Date: Tue Feb 28 14:42:57 2017 New Revision: 314390 URL: https://svnweb.freebsd.org/changeset/base/314390 Log: Add compatible string. This restores USB attaching on SOCKIT board after reusing standard DTS files. Sponsored by: DARPA, AFRL Modified: head/sys/dev/usb/controller/dwc_otg_fdt.c Modified: head/sys/dev/usb/controller/dwc_otg_fdt.c ============================================================================== --- head/sys/dev/usb/controller/dwc_otg_fdt.c Tue Feb 28 14:02:16 2017 (r314389) +++ head/sys/dev/usb/controller/dwc_otg_fdt.c Tue Feb 28 14:42:57 2017 (r314390) @@ -57,6 +57,12 @@ __FBSDID("$FreeBSD$"); static device_probe_t dwc_otg_probe; +static struct ofw_compat_data compat_data[] = { + { "synopsys,designware-hs-otg2", 1 }, + { "snps,dwc2", 1 }, + { NULL, 0 } +}; + static int dwc_otg_probe(device_t dev) { @@ -64,7 +70,7 @@ dwc_otg_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "synopsys,designware-hs-otg2")) + if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); device_set_desc(dev, "DWC OTG 2.0 integrated USB controller");