From nobody Mon May 16 12:09:38 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 8D6A81ADD770; Mon, 16 May 2022 12:09:38 +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 4L1yjZ3BjBz4cLG; Mon, 16 May 2022 12:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702978; 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=2jbk91K4MjfW2dwQYzLD8hlSfnldT8ow5D4C6J8sYkk=; b=mYy9nX+FqjgAiknw04NEwQfMrgjvBYXd47hJlpUmizUpscQqr86zsyC2+J83d2lB9xgVtN SqcWKEpyHvXnDJSOnkUHi3KQ3z6hKYfhN/sWf1YkQXunJEE//n2yrMsQWdc90xD7ofP6hk r2HIWBijKwh4yHznNWy5iko8dsggkKzwjF7Krzhqwx2FjkLRWnsB3FbFaLqDGpIb7Ility rCxPjbQCB2Wiu23lYg9GyNEpnXD2EfTI3VGFSj1LmTVL/YFARV5yalxU/zpgsqTMuRZofr KHZM8mHI9Z4lYuGBfvju+ocgTlsBDME535haoibn83rLWirdeHD4auI80JzspQ== 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 414091F6F7; Mon, 16 May 2022 12:09:38 +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 24GC9cLM035127; Mon, 16 May 2022 12:09:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9cvp035126; Mon, 16 May 2022 12:09:38 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:38 GMT Message-Id: <202205161209.24GC9cvp035126@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: 3766f99c4828 - stable/13 - mmc: 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: 3766f99c482828760a61ac12f57506b8a9d7cda7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702978; 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=2jbk91K4MjfW2dwQYzLD8hlSfnldT8ow5D4C6J8sYkk=; b=vfzV8Wd8+jpPrItAmQF8t4ynzVBUoCJ0HahBuzVagdqELAW41StVAK3yABL1wdcyNLYuFD AnjaM2r/X/SvWMfLDZtmktU9k2SVyapw554arslXdx53fJcTvECjHp9SrybsTam4vslR2U ploD+mLklLur5K18IMYW99hwXOjsSw+a8UUTiOud8c5wro7taV6XVUVtdzFEmOJjxdtbk4 7VJTr+LUXQLSwx+pAjF20XujAkVopkdQg72DOr9X9PETS+DrxNTU4DfussTdYiYi9lxMUl 8OCCWuDdiOLo03hjtkkd4Z74TMwqOodanVfjeNGC+YE3t4iJd/OPacIQjxlbMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702978; a=rsa-sha256; cv=none; b=DsmkLCyK+uMd5U11nKNJYoYFr/BbpGJYH7SbFMagjbe8BmVNjBE6DDMd0s/bRJsYwbPMmm vnOSx/YMnDnGAf+Cp2L+x+OsZfP2xNtb6HNCBQ/s+z99i27n4LK4L35kmpCQ8ZZQK6z1o5 UN6C2LM7VcyqNyCBnAgSuHky+CeN48SwFrjJdowmQJXfapyPX5ubjWJR3wymHUGi4N6f+m PKBM/YAK9EL3jvqTRliHjC8UlAY9/ckdhWDoQPX60qS7OOmBkTBgw3F+V3ItsKFSLq10NG aIncvqGrDMatv6Y/caefVgRk7waMUzjHT5ucnp1uIuuvcIvMQ4RcdpYWaXgMDw== 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=3766f99c482828760a61ac12f57506b8a9d7cda7 commit 3766f99c482828760a61ac12f57506b8a9d7cda7 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:37:02 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:35 +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 (cherry picked from commit 78f8b4aafaa0030cfda4d1a775150441ac0a5343) --- 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 534f21247506..5c7074faa97b 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; };