From nobody Mon Feb 21 16:29:44 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 3DEA519DDC9C; Mon, 21 Feb 2022 16:29:45 +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 4K2SST0b3Dz4ggc; Mon, 21 Feb 2022 16:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460985; 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=5gZtTq1J2/KYjD0HVTeU2OfyLZYvU0S+GER+pBWnVHw=; b=U2aMm7sPC+/1weqbn/xcsC921mzLVR7da7ijfqIXRgnd+MIoiDUqxYR3vW91IxtK6vthIx OAjlQindlOsFzuB3IMsfIPcJPLJdLFEM9L2EX9iyod8m8PNiwUnCHAkWIu4Avw/gKOxhWl rp29Np39ymdcZE3U/PowHarzULOZ4BYnYKmL2xKyGrS4O8WJWxQLX3lapTdWs+yL/bZXzW NGZaL2YgXGd+YfspwIJou0wbOtgKwfWWJbDOWwi38eCbk5IHRZ47ar2Ij9bFcgughsIp8V NZbdF5KNbs+UlZn68GZjmXjKsP14UFMJIExXJAn5nHpuMHBGjrdR6Zx/u+5Jkg== 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 E586C13A81; Mon, 21 Feb 2022 16:29:44 +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 21LGTiR3008303; Mon, 21 Feb 2022 16:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTiE2008302; Mon, 21 Feb 2022 16:29:44 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:44 GMT Message-Id: <202202211629.21LGTiE2008302@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: 78f8b4aafaa0 - main - mmc: 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: 78f8b4aafaa0030cfda4d1a775150441ac0a5343 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460985; 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=5gZtTq1J2/KYjD0HVTeU2OfyLZYvU0S+GER+pBWnVHw=; b=rqT+hU6PioKtCScrGsSBfsxFXiMB5H0cFRoLKJgrj4ufhXBfDSJGm+BEQ8RDzthTzR1Jx9 YmqV8bV6YFdvuo52Y/xssEPExzua4RL2VEABR8N97ycnLwwfIX173wGXKcS43o/5Kp0T1h dk4IQmpBCd4kjNYSboUXnkpUEkuZ85iQ/Wu5aPjyW1PpmevqR8ggAuauboLbm+zjyNpX9C u3ub6+ccTHtZbgpk/97NLEAl90qjYmn7d1F7tPDT/WX1dDhwGyEN0AGZ/S+pZBAUyD2blq x21iuZEmLwasAufVv/bGlEctO7YIJZCOlEDQb9Bj4dD7wdoAFYUrjAehCURmkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460985; a=rsa-sha256; cv=none; b=fU+qTXgrBtnyPWphiHjCmIzzq7euzzUFYdejEh36kbFlO/TEazzGcL5XVd9o4PJPQmMymJ dCnxZJ00atVmawbWkGIUAJKxDPprkZxcUEQK4UYKiSMKJARhbZ8+2Sl9oCStrFCEFoo9Qy RkqU+zfu7KEFNE7yjJY+T9lrDzh9uAtjMBUxqAxeztfv8+i6wrrwA1N/OipDPml7+CfC+O +n821iobV/O9BgqlvhZvKGgQ/3OgM37qxaIwDVkvS731plK1mF7v31sUPTv/6fu3flvwDE QO60HJ99BFD7Ft6sp5bnI2RianGdHuWxM3eojJWts9n5ijILpcFx/bKynXDiMw== 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=78f8b4aafaa0030cfda4d1a775150441ac0a5343 commit 78f8b4aafaa0030cfda4d1a775150441ac0a5343 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:37:02 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:28:40 +0000 mmc: 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/D33821 --- sys/dev/mmc/mmc_fdt_helpers.c | 4 ---- sys/dev/mmc/mmc_fdt_helpers.h | 2 -- sys/dev/mmc/mmc_helpers.h | 4 ---- 3 files changed, 10 deletions(-) diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c index 249a430311fa..239b3538cc67 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.c +++ b/sys/dev/mmc/mmc_fdt_helpers.c @@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include -#endif #include @@ -61,7 +59,6 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper, helper->props = mmc_helper.props; -#ifdef EXT_RESOURCES /* * Get the regulators if they are supported and * clean the non supported modes based on the available voltages. @@ -98,7 +95,6 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper, host->caps |= MMC_CAP_SIGNALING_330; } else host->caps |= MMC_CAP_SIGNALING_330; -#endif if (OF_hasprop(node, "mmc-pwrseq")) { if (OF_getencprop(node, "mmc-pwrseq", &pwrseq_xref, sizeof(pwrseq_xref)) == -1) { diff --git a/sys/dev/mmc/mmc_fdt_helpers.h b/sys/dev/mmc/mmc_fdt_helpers.h index f07ca1684440..9762e2b60d92 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.h +++ b/sys/dev/mmc/mmc_fdt_helpers.h @@ -33,9 +33,7 @@ #include #include -#ifdef EXT_RESOURCES #include -#endif #include diff --git a/sys/dev/mmc/mmc_helpers.h b/sys/dev/mmc/mmc_helpers.h index e402e587a159..2788d1eb0ecc 100644 --- a/sys/dev/mmc/mmc_helpers.h +++ b/sys/dev/mmc/mmc_helpers.h @@ -30,9 +30,7 @@ #include -#ifdef EXT_RESOURCES #include -#endif struct mmc_helper { device_t dev; @@ -56,10 +54,8 @@ struct mmc_helper { #define MMC_PROP_NO_SD (1 << 6) #define MMC_PROP_NO_MMC (1 << 7) -#ifdef EXT_RESOURCES regulator_t vmmc_supply; regulator_t vqmmc_supply; -#endif device_t mmc_pwrseq; };