From nobody Mon May 16 12:09:41 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 374AA1ADDA48; Mon, 16 May 2022 12:09:43 +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 4L1yjf2NHvz4cYf; Mon, 16 May 2022 12:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702982; 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=FaelRlOwB/ZSqgVxIfHnB7r2giUOSbYy+zsBjhrD7tg=; b=ni/csrVLzLEqdNdpHooN90r93vEgn9YXPHqF3dkgvX9zhqgHiGsOwoJHJMizuibRnGUrq4 Fw/eT0RjwsuQ8msSBBqBqS78KE4xN9JA97FN2lxmHBNSgQmY1tVQdbUtkIZLrwi+87ZhYC gG1fUsVYk8qVAGrzaV0g/lV90lcQbGxarKAzb3uSDRW53HwzbnGNtXrgez6HIbKrECd+5s R3XFRv8lcAhARrxovWddh9KAnP4Aeu6kItNZDc3gX1Vdz1tEh5SWWFknpsSZtu6pzg2Fca w9WFDGr0Wzj3ea4AfCbMkSXAxGV5OwxWwI09npI2PdfPf2vN3/ZFvJbih7WazQ== 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 AD2C91FD02; Mon, 16 May 2022 12:09:41 +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 24GC9foq035199; Mon, 16 May 2022 12:09:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9f8d035198; Mon, 16 May 2022 12:09:41 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:41 GMT Message-Id: <202205161209.24GC9f8d035198@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: 69b0498ff8a8 - stable/13 - sdhci: 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: 69b0498ff8a8185b42b3961067972c8bcd6253ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702982; 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=FaelRlOwB/ZSqgVxIfHnB7r2giUOSbYy+zsBjhrD7tg=; b=iFXAOTDiHm8O0kCrNe/cytSmWNhQzHsxpRcU4lGnn3qITlCfJau09WDDZyVzyix7zJFmjf U+Vy7cZa79rt6+jy/AgYpaVMEk/IyUk/TdqEqHxSThXqH4gV9k9pkK5N3E7sTs/JaU6LB/ oWPS/qec7tFVwfHpANK1ryxqAX/Hs6OTiYGKjewfK5J/WBM73pFYUK+KG2XLcl/LHKics0 bx8pfDVoYRZV1JSg8gv9jSRwLK0L2ACfswmjjqRVqwB/k6EC354j2Z4tgXx05e95WTXs69 mwlSwE3jKqehODT/F/fzA2yzYrWcwvD1+QfdNbaj8lvsRIJnzxiVVvQEoVAm5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702982; a=rsa-sha256; cv=none; b=bwDXN/1d+YdKuHzhBgxFRuHdkdkltAlewivbao6y1ajMCdxNxJYCUAU7ntk8XWjGdjRut5 bxlGWMuD26FYwCsTezzA1GYEnCiMV8vvwNZklgBLqFgtzNGMuW893N6iBmTFewCnoa/pQc A7Iyk2AnMHpBeeY8GS2zfgr8PZNyvzgBgsZNQrlnO2eLInymOHa0GJ3idZxUAxfA5Feygd YmU7IcAiOTmM2XdRA4zSzCiCT7M6QY5f4vLJsi6gKqjsaDYMVmOc5/gF4RKTHhcrHtj1BI wcVbOFg8Fyp9NQ8WePtJEf/uQpOkzhZKMbO4Y/PVZH+kDstFlOshfu8t350U1w== 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=69b0498ff8a8185b42b3961067972c8bcd6253ac commit 69b0498ff8a8185b42b3961067972c8bcd6253ac Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:41:23 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:35 +0000 sdhci: 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/D33824 (cherry picked from commit a813b0965d8e9765135ad92a78ce62c8b762b99f) --- sys/dev/sdhci/sdhci_fdt.c | 12 ------------ sys/dev/sdhci/sdhci_xenon_acpi.c | 2 -- 2 files changed, 14 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 24a1d054849f..51b009a411c8 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -52,13 +52,11 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include #include #include #include #include -#endif #include @@ -69,10 +67,8 @@ __FBSDID("$FreeBSD$"); #include "opt_mmccam.h" -#ifdef EXT_RESOURCES #include "clkdev_if.h" #include "syscon_if.h" -#endif #define MAX_SLOTS 6 #define SDHCI_FDT_ARMADA38X 1 @@ -81,7 +77,6 @@ __FBSDID("$FreeBSD$"); #define SDHCI_FDT_QUALCOMM 4 #define SDHCI_FDT_RK3399 5 -#ifdef EXT_RESOURCES #define RK3399_GRF_EMMCCORE_CON0 0xf000 #define RK3399_CORECFG_BASECLKFREQ 0xff00 #define RK3399_CORECFG_TIMEOUTCLKUNIT (1 << 7) @@ -93,7 +88,6 @@ __FBSDID("$FreeBSD$"); #define SHIFTIN(x, mask) ((x) * LOWEST_SET_BIT(mask)) #define EMMCCARDCLK_ID 1000 -#endif static struct ofw_compat_data compat_data[] = { { "marvell,armada-380-sdhci", SDHCI_FDT_ARMADA38X }, @@ -120,14 +114,11 @@ struct sdhci_fdt_softc { bool wp_inverted; /* WP pin is inverted */ bool no_18v; /* No 1.8V support */ -#ifdef EXT_RESOURCES clk_t clk_xin; /* xin24m fixed clock */ clk_t clk_ahb; /* ahb clock */ phy_t phy; /* phy to be used */ -#endif }; -#ifdef EXT_RESOURCES struct rk3399_emmccardclk_sc { device_t clkdev; bus_addr_t reg; @@ -320,7 +311,6 @@ sdhci_init_rk3399(device_t dev) return (0); } -#endif static uint8_t sdhci_fdt_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t off) @@ -488,7 +478,6 @@ sdhci_fdt_attach(device_t dev) return (ENOMEM); } -#ifdef EXT_RESOURCES if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == SDHCI_FDT_RK3399) { /* Initialize SDHCI */ @@ -498,7 +487,6 @@ sdhci_fdt_attach(device_t dev) return (err); } } -#endif /* Scan all slots. */ slots = sc->num_slots; /* number of slots determined in probe(). */ diff --git a/sys/dev/sdhci/sdhci_xenon_acpi.c b/sys/dev/sdhci/sdhci_xenon_acpi.c index 1bd4c03c67e4..9bb781ff75a6 100644 --- a/sys/dev/sdhci/sdhci_xenon_acpi.c +++ b/sys/dev/sdhci/sdhci_xenon_acpi.c @@ -44,9 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include -#endif #include #include