From nobody Thu Dec 23 08:47:15 2021 X-Original-To: dev-commits-src-all@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 BBA69190CD53; Thu, 23 Dec 2021 08:47:15 +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 4JKP2W3lLXz3LKC; Thu, 23 Dec 2021 08:47:15 +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 60FEF53DE; Thu, 23 Dec 2021 08:47:15 +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 1BN8lFcd011181; Thu, 23 Dec 2021 08:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BN8lFQP011180; Thu, 23 Dec 2021 08:47:15 GMT (envelope-from git) Date: Thu, 23 Dec 2021 08:47:15 GMT Message-Id: <202112230847.1BN8lFQP011180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 742d8a6a6059 - stable/12 - ds3231: allow configuration via hints on FDT systems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 742d8a6a6059c16f6f36341ee1aab82120357c3a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640249235; 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=5negSGT38vWLJjZqw0GvDRAPilS1VoTsVwEaVRjQ7qM=; b=UierojqHHT9iYaK9YSRFI6bWLGo2DFx2N1WBd3D3p7jv2yi7vF0BZ5qi5tHKhE1cGr/HSF vlHu5nbWnISleYANws2TIWuXaFovbq+4TukwtzSDG3GxiYoQqWMp0VnwmRDAMBmDEaTiej 7vS/EUVcMzuh+Rs7M5gEnGpCKpIud3jVwemojnFzHrN5rHfdF8eX/m47qDeDwWEO1wMALw bsoB7AitdCEpa2eFyaAdDEMNn5m1EMa6xLeXXBzCVhDrIYJ6t+B0g/s4asEdGaNC8OMnOH j4UwQZTBOlDjyjCkQkIpiyIOl3MaPe0uD3qEZprjpbR5s0umFK47PjQHfK98xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640249235; a=rsa-sha256; cv=none; b=nRGxL7DiIm2USW+SvxGE4x5fxeaOk1Q4LUUAZRyvPAObJ0/cWeRYygZ38QBkDI9Q72QCEh ZxooWVIBzEn0J1hu8w9yVHY0H9A/I1SGolrNK0IoF54J9klELOigjwHh7E8ZfjCIxbjZo/ 8xjZEprcUJNNIzUqaH7U+d+XpQTFSugzdTuQOQqmWL9Ukv0KRg1UC2bDM6VQ36Vl2hA0+i tVUrsghgOko4YEBDjo1PzwsxBnHytwLSKGFL97Qat8TENJ6rkVS8t8S906fpaDUqe9O44l OS0LndpJW2UxNIBNUnwIAidCaK7zPBOBRdD26lUcBIknodmtSj56tN5Q5L/cYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=742d8a6a6059c16f6f36341ee1aab82120357c3a commit 742d8a6a6059c16f6f36341ee1aab82120357c3a Author: Andriy Gapon AuthorDate: 2021-12-13 07:21:08 +0000 Commit: Andriy Gapon CommitDate: 2021-12-23 08:46:56 +0000 ds3231: allow configuration via hints on FDT systems (cherry picked from commit 1256067c5c575474e626e5f119f50275ea2d975e) (cherry picked from commit b277ef3304fa97da041c191b02b2fcfb74378c75) --- sys/dev/iicbus/ds3231.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/iicbus/ds3231.c b/sys/dev/iicbus/ds3231.c index bd4142c6291b..0e95379da500 100644 --- a/sys/dev/iicbus/ds3231.c +++ b/sys/dev/iicbus/ds3231.c @@ -356,16 +356,20 @@ ds3231_en32khz_sysctl(SYSCTL_HANDLER_ARGS) static int ds3231_probe(device_t dev) { + int rc; #ifdef FDT if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "maxim,ds3231")) - return (ENXIO); + if (ofw_bus_is_compatible(dev, "maxim,ds3231")) + rc = BUS_PROBE_DEFAULT; + else #endif + rc = BUS_PROBE_NOWILDCARD; + device_set_desc(dev, "Maxim DS3231 RTC"); - return (BUS_PROBE_DEFAULT); + return (rc); } static int