From nobody Mon Feb 21 16:29:52 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 23A6819DE201; Mon, 21 Feb 2022 16:29:54 +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 4K2SSd3Ghgz4gq1; Mon, 21 Feb 2022 16:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460993; 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=xNZmc/euotfAOcXrU0zskjdS8/aymqhjduUr81YxAyQ=; b=iGlDxUP1aRKqh6XA4h5fOJ34S5flpFzW2GGHIErumbRp8okT0HaUF4InrvDqDMnx8QM1tE 3UBrgD33V+gNKrusy7hbPVsT15UcCh9Znys4XxneFNyv2WaS1IZKDH0PyftEdyUWi2R9on 9c6aPtJW8RRKgB0iuQJGcilZr7GDwoUCAFrVKKFV2lyVjB0ojkRoE9g+O18IA+C9Sf6g4P VbvimUSEu1D9Rv2C1VyISLRQZ+eEoxFmFT+kwMojDDeoIv29V9DnzvU+6GSWpKVPi67eWB pXiVwZV9VPYGg04202qH+NOWH7PR8rrRvUVNZ0p3fAD2H6RR2xvZf12YKugTag== 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 E17C8137D0; Mon, 21 Feb 2022 16:29:52 +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 21LGTqZo008484; Mon, 21 Feb 2022 16:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTqsj008483; Mon, 21 Feb 2022 16:29:52 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:52 GMT Message-Id: <202202211629.21LGTqsj008483@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: 5c00765bf237 - main - uart_dev_snps: Make ext_resources non-optional 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c00765bf2378c8ed92abe78028f203e91ddbf91 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460993; 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=xNZmc/euotfAOcXrU0zskjdS8/aymqhjduUr81YxAyQ=; b=moW13anh3cgkvLYp1FxX1/3v+zbMRrrPMvVwpRr3PPLKYh5ZrgKYgq7H/IPwgwc3IHKv5R XlxGQewudmCiBAPdSJIVUM8TyeE/RTwbbpG1WzmYyVfBE6RkETv/3ygyRbNBIPDOBJ/01J oJCPCCnloa1Cec3zMxzkNi0d9stXRP5EmNcbxTJNSKaI9UraoyRfV7aj1cbSwuF8ZQExBj vkqHDrDIKVPkXrEHqdbhd9Rf9TOCBnX6PKwikNxa54ob0+G7j3GQTZw0VBFZvPDO9m3knu RTE5BXVUJneZKeGwp045PBioqIt5DHxYDupkiWNGD+lptwLMq1ODQd1HytsHww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460993; a=rsa-sha256; cv=none; b=IZTuXUVjn3tWblooNJd6DtzpqZHZ2qEX+9RMS0sTOshF2qm+Vdjc9wwEy0bD5Q6iHcxOX4 6NOubyv/wrld7hrSOa1/d/J193/4Li56+Eovo3+jckOM0LhJZXlcJN944MCiA+lA3XIWE9 J5tKuu3brSu5EUTlY2EhglaDMxOQziJL/Juh4PjoLS69DOJkOt564fWDPeD4mtnxF8SzEe rCKMwKNs9JIcv52phWjdlYEDkk2djqGCJAo8wk3zBjif6wrYr4awjjNk2G5Ua8o4/f3Dwe 8kdmIzMt093/cXl/B27/qq/WJEedta3ElEefRtfRP9hWrQBZrcvO/0Y6yawujA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5c00765bf2378c8ed92abe78028f203e91ddbf91 commit 5c00765bf2378c8ed92abe78028f203e91ddbf91 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:46:50 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:28:54 +0000 uart_dev_snps: Make ext_resources non-optional EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33828 --- sys/dev/uart/uart_dev_snps.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/dev/uart/uart_dev_snps.c b/sys/dev/uart/uart_dev_snps.c index 8cd646fb9890..0a1611cd9cef 100644 --- a/sys/dev/uart/uart_dev_snps.c +++ b/sys/dev/uart/uart_dev_snps.c @@ -43,21 +43,17 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include #include -#endif #include "uart_if.h" struct snps_softc { struct ns8250_softc ns8250; -#ifdef EXT_RESOURCES clk_t baudclk; clk_t apb_pclk; hwreset_t reset; -#endif }; /* @@ -131,7 +127,6 @@ static struct ofw_compat_data compat_data[] = { }; UART_FDT_CLASS(compat_data); -#ifdef EXT_RESOURCES static int snps_get_clocks(device_t dev, clk_t *baudclk, clk_t *apb_pclk) { @@ -151,7 +146,6 @@ snps_get_clocks(device_t dev, clk_t *baudclk, clk_t *apb_pclk) return (0); } -#endif static int snps_probe(device_t dev) @@ -162,10 +156,8 @@ snps_probe(device_t dev) uint32_t shift, iowidth, clock; uint64_t freq; int error; -#ifdef EXT_RESOURCES clk_t baudclk, apb_pclk; hwreset_t reset; -#endif if (!ofw_bus_status_okay(dev)) return (ENXIO); @@ -187,7 +179,6 @@ snps_probe(device_t dev) if (OF_getencprop(node, "clock-frequency", &clock, sizeof(clock)) <= 0) clock = 0; -#ifdef EXT_RESOURCES if (hwreset_get_by_ofw_idx(dev, 0, 0, &reset) == 0) { error = hwreset_deassert(reset); if (error != 0) { @@ -220,7 +211,6 @@ snps_probe(device_t dev) clock = (uint32_t)freq; } } -#endif if (bootverbose && clock == 0) device_printf(dev, "could not determine frequency\n"); @@ -229,7 +219,6 @@ snps_probe(device_t dev) if (error != 0) return (error); -#ifdef EXT_RESOURCES /* XXX uart_bus_probe has changed the softc, so refresh it */ sc = device_get_softc(dev); @@ -237,7 +226,6 @@ snps_probe(device_t dev) sc->baudclk = baudclk; sc->apb_pclk = apb_pclk; sc->reset = reset; -#endif return (0); } @@ -245,25 +233,20 @@ snps_probe(device_t dev) static int snps_detach(device_t dev) { -#ifdef EXT_RESOURCES struct snps_softc *sc; clk_t baudclk, apb_pclk; hwreset_t reset; -#endif int error; -#ifdef EXT_RESOURCES sc = device_get_softc(dev); baudclk = sc->baudclk; apb_pclk = sc->apb_pclk; reset = sc->reset; -#endif error = uart_bus_detach(dev); if (error != 0) return (error); -#ifdef EXT_RESOURCES if (reset != NULL) { error = hwreset_assert(reset); if (error != 0) { @@ -286,7 +269,6 @@ snps_detach(device_t dev) return (error); } } -#endif return (0); }