From nobody Mon May 16 12:09:39 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 AC5C11ADDB02; Mon, 16 May 2022 12:09:40 +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 4L1yjc00JTz4cSn; Mon, 16 May 2022 12:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702980; 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=vUntOVFPnwGHbjnGb98nkxMkXbwOhluxIAbcoM3QJ+s=; b=BT3xWpo43gzXxrogp8wgW4VQyWViE3Bzo59HMTBP9c9bg9jU6EnviqjFla4BUBr/1kKiBn 0KF1PDBW1ss5o/UV4RD2g00BNug8x9ZrvbPrLvIBbijWfs7eVhbNiwyDqEJp2Dek9cBiCI SsjIwQ3MMY+ESJvgHIf0/s4A6a7Afy8qj7bIG8G19nGFigJ6XGbyUdJZsxAxfkthvr+6XM Tn7h9RUaeBXnp5WXw99dpx2tG6x+uUAwQ0fj0qtIr7oRNbQLIRJQhUdOZvkFIFWCsw6U9Y /Sml8IESOawEQ9/Gw1WpSJO+5zEnpX1OVEP4fip80PcKMINccUmvzboEcfAe8w== 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 6B27A1FB63; Mon, 16 May 2022 12:09:39 +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 24GC9dPn035151; Mon, 16 May 2022 12:09:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9dqN035150; Mon, 16 May 2022 12:09:39 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:39 GMT Message-Id: <202205161209.24GC9dqN035150@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: be92a2d12cc2 - stable/13 - dwmmc: 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: be92a2d12cc2dbb96218035d195358140250c4e1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702980; 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=vUntOVFPnwGHbjnGb98nkxMkXbwOhluxIAbcoM3QJ+s=; b=Kmjz84+fDoAkJZlj6M0TdSiyowDpPKbQhj3puQtVJ6jETPC6cOJjJ/TZokaHBhCs+kXFXO d39ACWYPPt2TnoYHRwOgufsCemOcwKlm915IDf1S16/DpIkez5w/S/LnsGQFV1sRI1xmU3 um9rI7ftkpx2SAIXAz8f5p0ppx+OzfD5Cbm4sFwxs1xwWR+4gzi9B0gqW8rdrwlRYo3qGA 6prQOjVUVJgsLTPCWWVUWs92rMCM6a+9xl0yenzXx9cG9q0f74d+aBSL6aVDx0lnm7QZq1 PBLz4uhMBoOHln0YP6gDWu6qix4lq21oiDIwr0sACt+viVA0tcUmgvEX+2NUQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702980; a=rsa-sha256; cv=none; b=P4eE/qF26UNNM+XGWSRI1PFJ2zUFospf4pYjsp6Z6u6ueCh/t2zrHbzqu27VERSLr1nRsc ckPIzZDjaIlQJYYYfhv3PH9bkQch7BQ/CaZyAjxGvDYVB08INChhhmiQGmGj6gH5E8etgl qPLgvNBFfinaZQUJadHH/inIz1azlXBa3EIlBBQyU5wO8+L2DevVDSAn7px6JyNAONGChM ouEia/k8LpDz9zDZuuM/JwfN9yNIOxh9qIury2CFBrSSoEowTaHafKIKslPebv7p6F+fyb SYc6eyqOZimuTBDnuVrhr3kPyofArLAH6hyhZvDn7DwkxThFUBfz4iFqTslycQ== 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=be92a2d12cc2dbb96218035d195358140250c4e1 commit be92a2d12cc2dbb96218035d195358140250c4e1 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:38:24 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:35 +0000 dwmmc: 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/D33822 (cherry picked from commit b4cc0f7d28e2f4ae12db3be75658ac5b8c1293f1) --- sys/dev/mmc/host/dwmmc.c | 9 --------- sys/dev/mmc/host/dwmmc_rockchip.c | 6 ------ sys/dev/mmc/host/dwmmc_var.h | 4 ---- 3 files changed, 19 deletions(-) diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index 9ae28c8ad7b9..6045e49c3e71 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -63,9 +63,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include -#endif #include #include @@ -519,9 +517,7 @@ parse_fdt(struct dwmmc_softc *sc) phandle_t node; uint32_t bus_hz = 0; int len; -#ifdef EXT_RESOURCES int error; -#endif if ((node = ofw_bus_get_node(sc->dev)) == -1) return (ENXIO); @@ -553,8 +549,6 @@ parse_fdt(struct dwmmc_softc *sc) bus_hz = dts_value[0]; } -#ifdef EXT_RESOURCES - /* IP block reset is optional */ error = hwreset_get_by_ofw_name(sc->dev, 0, "reset", &sc->hwreset); if (error != 0 && @@ -661,7 +655,6 @@ parse_fdt(struct dwmmc_softc *sc) goto fail; } } -#endif /* EXT_RESOURCES */ if (sc->bus_hz == 0) { device_printf(sc->dev, "No bus speed provided\n"); @@ -803,7 +796,6 @@ dwmmc_detach(device_t dev) DWMMC_LOCK_DESTROY(sc); -#ifdef EXT_RESOURCES if (sc->hwreset != NULL && hwreset_deassert(sc->hwreset) != 0) device_printf(sc->dev, "cannot deassert reset\n"); if (sc->biu != NULL && clk_disable(sc->biu) != 0) @@ -815,7 +807,6 @@ dwmmc_detach(device_t dev) device_printf(sc->dev, "Cannot disable vmmc regulator\n"); if (sc->vqmmc && regulator_disable(sc->vqmmc) != 0) device_printf(sc->dev, "Cannot disable vqmmc regulator\n"); -#endif #ifdef MMCCAM mmc_cam_sim_free(&sc->mmc_sim); diff --git a/sys/dev/mmc/host/dwmmc_rockchip.c b/sys/dev/mmc/host/dwmmc_rockchip.c index c025e531e27b..44fbf720f908 100644 --- a/sys/dev/mmc/host/dwmmc_rockchip.c +++ b/sys/dev/mmc/host/dwmmc_rockchip.c @@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$"); #include -#ifdef EXT_RESOURCES #include -#endif #include @@ -94,14 +92,11 @@ rockchip_dwmmc_attach(device_t dev) break; } -#ifdef EXT_RESOURCES sc->update_ios = &dwmmc_rockchip_update_ios; -#endif return (dwmmc_attach(dev)); } -#ifdef EXT_RESOURCES static int dwmmc_rockchip_update_ios(struct dwmmc_softc *sc, struct mmc_ios *ios) { @@ -128,7 +123,6 @@ dwmmc_rockchip_update_ios(struct dwmmc_softc *sc, struct mmc_ios *ios) } return (0); } -#endif static device_method_t rockchip_dwmmc_methods[] = { /* bus interface */ diff --git a/sys/dev/mmc/host/dwmmc_var.h b/sys/dev/mmc/host/dwmmc_var.h index 33210f547dff..cd4c5f2b6051 100644 --- a/sys/dev/mmc/host/dwmmc_var.h +++ b/sys/dev/mmc/host/dwmmc_var.h @@ -33,11 +33,9 @@ #ifndef DEV_MMC_HOST_DWMMC_VAR_H #define DEV_MMC_HOST_DWMMC_VAR_H -#ifdef EXT_RESOURCES #include #include #include -#endif #include "opt_mmccam.h" @@ -92,13 +90,11 @@ struct dwmmc_softc { uint32_t sdr_timing; uint32_t ddr_timing; -#ifdef EXT_RESOURCES clk_t biu; clk_t ciu; hwreset_t hwreset; regulator_t vmmc; regulator_t vqmmc; -#endif }; DECLARE_CLASS(dwmmc_driver);