From nobody Sat Nov 27 08:49:51 2021 X-Original-To: dev-commits-src-branches@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 885DA18BAC8B; Sat, 27 Nov 2021 08:49:52 +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 4J1QKX129dz4h7G; Sat, 27 Nov 2021 08:49:52 +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 F0DA319208; Sat, 27 Nov 2021 08:49:51 +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 1AR8npZ5070251; Sat, 27 Nov 2021 08:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AR8npO4070250; Sat, 27 Nov 2021 08:49:51 GMT (envelope-from git) Date: Sat, 27 Nov 2021 08:49:51 GMT Message-Id: <202111270849.1AR8npO4070250@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: 83f68b84c234 - stable/13 - ds1307: allow configuration via hints on FDT-based systems List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 83f68b84c2347bbe11c5266e98bfd0a44334f004 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638002992; 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=I+XQt+YJgS4ePV3xWVSLut92oD+kvBuxfv1qXKIZ/QY=; b=rUFffuFKcRn9xdsbpTVGp2OOFT+iZGHS+FYyJRVqm20MW1RxbyFHpnOM1zrYi3jMMJGQVg aNQQvW++CHkTjE9FCA63JDd1DKIOwzSl7iV8M9dUjXmiOqtwZyeuAoyOb6tvh3H3/3+P4m Y6il4cZhgdMB2+unkl5bt3vuklKU/RWoqEwNZZO5EweTbPOGCgAq+Xkq81hcqS5+0g/Tn2 CKOn3R8gfkMh0hl93mGBEhtsGKQfRJGk/oa5LHEKGhXE5UmHN3VrrWlIbfTZFEuLspp+cn f4LvBKcb4oXQjqWeu9sCvN5D26mSROnlHfFEufZ1+HkFDbXw6SQZdvmp3ZgoAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638002992; a=rsa-sha256; cv=none; b=H9/70ZkupGriqUylaTOBYNPL+EgKMSufwQHfv4VkIw9KAY3Fh9jGjusXyF6Z6RVFZandXG eOq1ffjSfsueLeqpFdfX0/TM3UnzqSCCF+PuwKa9gTdXhW3XM0+8LKOT0iOAG/eejCLrtG xP1u4wKPNeL5AtXslDmt0smDqRBvS1PWEZemEfuP4HEM9nl9wiZhrVVh7CZO28epXNN+o4 wU65MVpIIWTQoY/ElysF1YeVFwPXB9ASx210A9ZhngnIIg+KGn0+DtTrPbvxGhPESyqChM DOyXC3WpOjTilbbUl0sEcynY1II1qJRXgQeS897kOcJHiHoFyE36tGIU9FhhsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=83f68b84c2347bbe11c5266e98bfd0a44334f004 commit 83f68b84c2347bbe11c5266e98bfd0a44334f004 Author: Andriy Gapon AuthorDate: 2021-11-04 11:55:35 +0000 Commit: Andriy Gapon CommitDate: 2021-11-27 08:44:16 +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