From nobody Mon May 16 12:09:46 2022 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 A9EC81ADDED5; Mon, 16 May 2022 12:09:47 +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 4L1yjk2XKGz4cRC; Mon, 16 May 2022 12:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702986; 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=cD3/kUBjke9oiqWay8u3MQdqRB9ynUFCPPo0hd6Q1wc=; b=Rm5oaVcBOSSrW93vWPZx6q90XUAq+PHeOnPTkMOTS1CnLLkEVlcVxC3cHtPrFFFETW7kpB +yWj/Vq1mhz0vZRVvM9iPjCFac+XWxx72rhmBQTTqTBOLy4NZJ7vAC86kyaAUeEWV+occr 2Xc5RTKYEcdJugUQZEE18D3dWk/3KbD1f9LSgQrr1lDsfVbR6CTFfsfkucsq+tAZ+rX6S4 xUlJomSxsyNMPNxI7+xdjZd1YLbcVZNnwQwBsXZYlC3QbHqumBtPVALNLg0Zd4A89Yg/6g oxxFulx5fwTazzEcnV6npYn4r56rL1cjGREH43G6mAS+gY8DrT7NknK449dKFw== 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 280A51FBAE; Mon, 16 May 2022 12:09:46 +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 24GC9kCh035301; Mon, 16 May 2022 12:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9kv3035300; Mon, 16 May 2022 12:09:46 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:46 GMT Message-Id: <202205161209.24GC9kv3035300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: c9fab04640ac - stable/13 - uart_dev_snps: Make ext_resources non-optional 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c9fab04640ac0c754a52f4586625d5c43dc5e14c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702986; 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=cD3/kUBjke9oiqWay8u3MQdqRB9ynUFCPPo0hd6Q1wc=; b=pYsMFOSzqHDqXrd6qnV6/KQ2PVJPlLwLsFxCFm1xvSelvybYwJdH0Ns4r6i0Ni1acAAx/G HrxgYCTyYn8/zPl5AIgL8vFFHLVYjNBhs/UQZ1SYPg2aC3JKTgXO4QstPbXU7+QUMIWTM2 TF5Zka3EOdpEJGqRg1KtsEKo1HIPrkJJSSm8kqIhOM+EAvrdyCEF7TE4Jh7tK2HKuF5afV PTCtkG/qk8UTWGDD/6kJqzqO9CpBdO9cZ9nZ7zcoNBaKb/C4Lz7DybCAEuD9QwXZOddjVU FZA4dhAAEWwTRJsYl+kiv5CdcWUFzJ5FHlbFOfWDEnH6ZIUr+YFWzMBArfr1ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702986; a=rsa-sha256; cv=none; b=s0mlEfk1GrCuMHkP5kWcB16UnbaWLrulSMxo8PO5nswtaat3CM9Nhd/soBpe0ilSGIP2lI AwxqAbS7/uPjqypujQ+a9Doxt8lx9XVfPCZN6DrfpQhunQRfNSWYROV9TM9qxN9lWvrzjm ZxxUM8mDb+iUytTbAy/Dg2jUPE7mViiXaGQsxomrtGu5KhJLHgF/0fMpByNYbMsN+iR745 AN6rL6kRDRsRrxcEliKamEF+7BZIcGfAXCVB7vMArHxWwPu9fEGAuJyOUXyDWGFL3QzVMs CY9YhOqIdkesmyFmr219lAYvFjvBvittdeEMXQfGjg5RQRlOLvbmSVAAEatBUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c9fab04640ac0c754a52f4586625d5c43dc5e14c commit c9fab04640ac0c754a52f4586625d5c43dc5e14c Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:46:50 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:37 +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 (cherry picked from commit 5c00765bf2378c8ed92abe78028f203e91ddbf91) --- 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); }