From nobody Mon Feb 21 16:29:45 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 DB44A19DDD83; Mon, 21 Feb 2022 16:29:46 +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 4K2SSV3LvFz4gv5; Mon, 21 Feb 2022 16:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460986; 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=xYXMolzHomYeyiqzMg9fVzZz+fhlYgT+xKz4RUnquRM=; b=NwEOACS5RTel+B9bZOyYbAYIOipqc0fp8XK5uHzgbf4EG7iptQ6Cfg5GrgrCfe27YDO+x3 tcAcYGzoUc+QFtXAMXP4k56fVtQqdIomqz5/KyQpmWKjLXu+OA8D+IfFbMVupZtG7VC5eh kgOq6nWjcF7SSWrT1+DXnaXTe+7HyTa8/gaMJOgoPwKuNn3fHtR1zmSDL4Qe+MwolpRyBY kq9VvayrP4gesJyM4YUwsGCNdWz53l9w24A7vrBnIXqzZc/+z4BSwA/Ous9BL13c8DsJI8 9GG8Ig4NzD2XKJypuhMds2QHKYwSEyfh2ZKBnB1eQLW9S/fvTXypu4KcEZt6/A== 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 12251131F9; Mon, 21 Feb 2022 16:29: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 21LGTjW6008334; Mon, 21 Feb 2022 16:29:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTjoB008333; Mon, 21 Feb 2022 16:29:45 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:45 GMT Message-Id: <202202211629.21LGTjoB008333@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: b4cc0f7d28e2 - main - dwmmc: 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: b4cc0f7d28e2f4ae12db3be75658ac5b8c1293f1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460986; 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=xYXMolzHomYeyiqzMg9fVzZz+fhlYgT+xKz4RUnquRM=; b=xoxSvY8W0JUHZBLdVSxQHPZCNeTbad1doUgbKCWhycYm+WH12tMIOmcaMRg0CyJ7KT4ldT lzKBAEJ+rvplW9T9K3GtFYtbs3lXWvFqcTz/mj/FIxg0EIgu0dCStFoctYB/DiX6UdTaDq qd/jvsG7zvWPX2bGHiu14uL9ZO1m3NarIDvGxEK+4KUN27aRIQFJDjlrTwyRonfiNlr8EO In9iHz/b3POeiBmQgomxUSh5rEQTMH96kf2jfXZdkcd5Xd4bYizdasAjCUP98V5E/d0gz9 UPYQnjCeJNEl0hVYn+B6JXt8wZYuPkuCkiyjQtcy3qC/M689MFYt2Z+9zYZiwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460986; a=rsa-sha256; cv=none; b=LbdoRrEhnpN0ILYOOriEXVYsIoB+356ZOYDlYRcQlEzgTKpOHbJOS68VBdTd2LwD6Y7J5R ROb7tDkpZnTIUHek3HnnbDvDUCdRTDCJjvqFCLQVe4zgIXWB8E6ZLWgLE3J7qeJpNsJDyX WYW5e7kqhcOk0+SPAlwKV6eR+WBeA8qBYkqAEZh6ARxr8N7qNK2ejquOJBjrgBOHzJkbui TwkUdI9Tw8SyeYjN1XlWKHFJagizVeijzue0CyH6Eq3fjtEL5ya4X2W1o/8aAkwo1LrDFF Er8th/4WNgr7cl/WX1T8OBNk0m+f9iiDk9FPZuDGK2hVHUyIp+ZIjJsV4vtPqA== 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=b4cc0f7d28e2f4ae12db3be75658ac5b8c1293f1 commit b4cc0f7d28e2f4ae12db3be75658ac5b8c1293f1 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:38:24 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:28:42 +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 --- 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 70bd204069bd..8cedcd0b9fe8 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 @@ -520,9 +518,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); @@ -554,8 +550,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 && @@ -662,7 +656,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"); @@ -804,7 +797,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) @@ -816,7 +808,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);