From owner-dev-commits-src-all@freebsd.org Wed Jan 13 17:44:05 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BFC754E3730; Wed, 13 Jan 2021 17:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGFDj4BgGz3G5b; Wed, 13 Jan 2021 17:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B5D41B4B5; Wed, 13 Jan 2021 17:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10DHi5vm033588; Wed, 13 Jan 2021 17:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10DHi5MA033587; Wed, 13 Jan 2021 17:44:05 GMT (envelope-from git) Date: Wed, 13 Jan 2021 17:44:05 GMT Message-Id: <202101131744.10DHi5MA033587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 6003bf9290cd - main - dwwdt: Add PNP info for the driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6003bf9290cd6f5b2fd9adcd45ac82144e6cb789 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2021 17:44:05 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=6003bf9290cd6f5b2fd9adcd45ac82144e6cb789 commit 6003bf9290cd6f5b2fd9adcd45ac82144e6cb789 Author: Emmanuel Vadot AuthorDate: 2021-01-13 17:41:34 +0000 Commit: Emmanuel Vadot CommitDate: 2021-01-13 17:43:51 +0000 dwwdt: Add PNP info for the driver --- sys/dev/dwwdt/dwwdt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/dev/dwwdt/dwwdt.c b/sys/dev/dwwdt/dwwdt.c index c08927f44c60..4eab26ef2915 100644 --- a/sys/dev/dwwdt/dwwdt.c +++ b/sys/dev/dwwdt/dwwdt.c @@ -86,6 +86,11 @@ struct dwwdt_softc { static devclass_t dwwdt_devclass; +static struct ofw_compat_data compat_data[] = { + { "snps,dw-wdt", 1 }, + { NULL, 0 } +}; + SYSCTL_NODE(_dev, OID_AUTO, dwwdt, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Synopsys Designware watchdog timer"); /* Setting this to 0 enables full restart mode. */ @@ -219,7 +224,7 @@ dwwdt_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "snps,dw-wdt")) + if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); device_set_desc(dev, "Synopsys Designware watchdog timer"); @@ -358,3 +363,4 @@ static driver_t dwwdt_driver = { DRIVER_MODULE(dwwdt, simplebus, dwwdt_driver, dwwdt_devclass, NULL, NULL); MODULE_VERSION(dwwdt, 1); +OFWBUS_PNP_INFO(compat_data);