From nobody Thu Dec 01 09:15:33 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NN9Qs3yHJz4jrvw; Thu, 1 Dec 2022 09:15:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NN9Qs34Hpz4L68; Thu, 1 Dec 2022 09:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669886133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avMD7CXgF8RItMoWULw4b+1dycuXHUGSheGud5WHHMs=; b=nPPRCXm5WM0Yh3TK7xy92vREPqI2E00EKRKLskgVYRV3wUszYHw99flVEwRFlzWVlnX/yx QDdlR+llHg9fscW0KjqZCeo1Bu5j3j8nkaX5oAaM3FeVxJ6+6DdHu2tqtIV0GTepKKLLj5 /7CIPptkBaUoX6hSbkkCgKqjBgOeETpCMPri6/11tZBXxUlvbWzBjbKqx7B+6jchnDPRpT hwTf07ELzOyAJHc+BYBw0qH3W+V5gsvqjjK2bqBFaBxIoYF8Ar+n9W7Y2xgd8SDZUuYbqW VktRHiAZWdmN0KXr7QsCbFdmP+XW4aDP5voFc7G04wD02SteteUj02PLO0eSJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669886133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avMD7CXgF8RItMoWULw4b+1dycuXHUGSheGud5WHHMs=; b=ia43bQylGitMzg3KYtmA0iEGUpv5BmAJpfUv6PE6zRGrgk5se+KJ+5q5EPAoBSgAUmrqbd NHZmz5sAXIgqOjFIvGjpJBJtsiPm713EiUpXXziqW660hRhwNWBUyEm2DOLHr4moMm7FZL BypPw/fj8bwhp7BEJVXgcXUzypXM+qMeM27PuDgz6lI6R2h613wguDC9h/OPzvVC//KGYd jP2KvEC9BEz0tObDFkA0i25E94A0n/1ueHwp+Bm76HsOGp2nv0AYXXVKensgSf3WlCWESZ nizWCF+1291+sq4r2E6dFn4LAcXIr8m06yDFWtr099fuZcGx9HXvVlKlcfsBkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669886133; a=rsa-sha256; cv=none; b=o9sGdqpBMxUwwcy5nvTR5KHJ0Ca6PoFVlinvgcDHbJZCk9qhzG/hcFH60yW71xaZF1iwE9 ehiPNrzQTfG8vbr0gDWlJXWkx0Yo8LcNjM1c/dyYCUv3VfYrAKfGemt9RIfCHJsR8NCVV3 SPYCtsoS+5LQg1ZA72a1350dYeiNQmWbLxE4xftH/xMRc4WxHbljDRZlA7t9b6SRQouPxz 9dVmakCF0+myQ3UV4GSbpcPOcFtu1WRFBCZCv43xupGPtM4wDDqdZqfQ8hwbxYehU2u5JX jx8iUWpiRSpn3NTTMBwamIGGhvX9HzfDpes7kg5683lHi/WFwzjSGJiwytFjkg== 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 4NN9Qs24TkzWNQ; Thu, 1 Dec 2022 09:15:33 +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 2B19FXR0038006; Thu, 1 Dec 2022 09:15:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B19FXnv038005; Thu, 1 Dec 2022 09:15:33 GMT (envelope-from git) Date: Thu, 1 Dec 2022 09:15:33 GMT Message-Id: <202212010915.2B19FXnv038005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 6f9c622690fd - main - rx8803: Improve probing logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f9c622690fd1faa6a6b8b1ead2760218e31328b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=6f9c622690fd1faa6a6b8b1ead2760218e31328b commit 6f9c622690fd1faa6a6b8b1ead2760218e31328b Author: Kornel Dulęba AuthorDate: 2022-12-01 05:41:41 +0000 Commit: Kornel Dulęba CommitDate: 2022-12-01 09:14:58 +0000 rx8803: Improve probing logic Add a PNP macro in order to load this driver automatically. While here check if the device is enabled in DT before probing it. Reviewed by: wma Sponsored by: Alstom Obtained from: Semihalf Differential Revision: https://reviews.freebsd.org/D37579 --- sys/dev/iicbus/rtc/rx8803.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/rtc/rx8803.c b/sys/dev/iicbus/rtc/rx8803.c index 7bd53537e755..9551b0976cd6 100644 --- a/sys/dev/iicbus/rtc/rx8803.c +++ b/sys/dev/iicbus/rtc/rx8803.c @@ -28,6 +28,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_platform.h" + #include #include #include @@ -69,6 +71,11 @@ struct rx8803_time { uint8_t year; }; +static struct ofw_compat_data compat_data[] = { + {"epson,rx8803", 1}, + {NULL, 0}, +}; + static int rx8803_probe(device_t dev); static int rx8803_attach(device_t dev); static int rx8803_detach(device_t dev); @@ -191,7 +198,10 @@ static int rx8803_probe(device_t dev) { - if (!ofw_bus_is_compatible(dev, "epson,rx8803")) + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); device_set_desc(dev, "Epson RX8803 Real Time Clock"); @@ -238,4 +248,6 @@ static driver_t rx8803_driver = { }; DRIVER_MODULE(rx8803, iicbus, rx8803_driver, NULL, NULL); +MODULE_VERSION(rx8803, 1); MODULE_DEPEND(rx8803, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); +IICBUS_FDT_PNP_INFO(compat_data);