From nobody Sat Nov 27 08:52:12 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 52BDD18BDA6D; Sat, 27 Nov 2021 08:52:14 +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 4J1QNF1wQ7z4kWY; Sat, 27 Nov 2021 08:52:13 +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 02950191DD; Sat, 27 Nov 2021 08:52:12 +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 1AR8qCWT082927; Sat, 27 Nov 2021 08:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AR8qClJ082926; Sat, 27 Nov 2021 08:52:12 GMT (envelope-from git) Date: Sat, 27 Nov 2021 08:52:12 GMT Message-Id: <202111270852.1AR8qClJ082926@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: 45a19f61218b - stable/12 - ds1307: allow configuration via hints on FDT-based 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: 45a19f61218b4072db9a327df5a7f176b6955163 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638003133; 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=jk+XpJe4f4TizzdYgr7ReG4mhE5Zmpro5CmMDJFT5Rg=; b=PIiH9qlYSkeWPE2SLUUk9jF/G+5t0A8YBozRMnWsBU8+uyUKVGteptQU09IvPiMrRo5q0F BVszt4LSwNvAs17v1tdX59dKnJ9GQYr/skaD2p13AZJVxthHkU6TdEePDumI+GSHo/PFtR AU8Aq6VyCp9qE5k2d7f89X8MIAsxRxZm0ZgfQmGWoHSn8KIlFTeYq/pU8Ol9xeN5+dWVP3 X2aOvillBoR/Ma6RPSNMgtUMa+y9oXWFNvlPaBLtiRfMbNB2M8d05p1rIrb3xIumHvRYmC vTaUWX7TJzeG7cLh8VeyoS7Jo4vHHmSz7hl26JxQj1mlp/fR+hF1V84UkUFAaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638003133; a=rsa-sha256; cv=none; b=VsNtxUzIiDBGwGaEfObn2IjCOB1ZfaTQFw+zD9MVKW4HVsVF5R0yClDkgb4rKxjqHEKL5/ kI6itL9ec5/RniAPvnZxTZQtjJ2LPiArDgVEZ6qYISs1KUcORtAkGsZsgUE3w3pFEF/AIm Tm3bkPB5dqXvqwMQucgDnZesD6nCX8xTnHsXbbNHdULW3ICIm5GCAM9WO15EP2JiZVMEdB FsJ/cfXe2JT86sJ34PTEhoZm6iivGO8GxD6nXiwNlpQPXMBrM7QiU9lFrRVE1O25omJRbr FL9dMmJlEhzIeRh35q/LpQGnAwb6A5Es53uz1HuQVXYuWYleTbCu08RVZV1BpA== 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=45a19f61218b4072db9a327df5a7f176b6955163 commit 45a19f61218b4072db9a327df5a7f176b6955163 Author: Andriy Gapon AuthorDate: 2021-11-04 11:55:35 +0000 Commit: Andriy Gapon CommitDate: 2021-11-27 08:46:31 +0000 ds1307: allow configuration via hints on FDT-based systems On-board devices should be configured via the FDT and overlays. Hints are primarily useful for external and temporarily attached devices. Adding hints is much easier and faster than writing and compiling an overlay. (cherry picked from commit 27645265c4e49ad7eaa25847a280307acb138da8) --- sys/dev/iicbus/ds1307.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/ds1307.c index 7bab7e78c0d8..47f47bb07f5e 100644 --- a/sys/dev/iicbus/ds1307.c +++ b/sys/dev/iicbus/ds1307.c @@ -216,18 +216,13 @@ ds1307_probe(device_t dev) return (ENXIO); compat = ofw_bus_search_compatible(dev, ds1307_compat_data); - - if (compat->ocd_str == NULL) - return (ENXIO); - - device_set_desc(dev, (const char *)compat->ocd_data); - - return (BUS_PROBE_DEFAULT); -#else + if (compat->ocd_str != NULL) { + device_set_desc(dev, (const char *)compat->ocd_data); + return (BUS_PROBE_DEFAULT); + } +#endif device_set_desc(dev, "Maxim DS1307 RTC"); - return (BUS_PROBE_NOWILDCARD); -#endif } static int