From nobody Mon Feb 21 16:29:48 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 9D70619DDE21; Mon, 21 Feb 2022 16:29:49 +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 4K2SSX4JhFz4gh6; Mon, 21 Feb 2022 16:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460989; 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=yh/IVam+CRLjBlJSR4dY763AaxVTBUAUZdLso5jnpz0=; b=yi96xgkXbTMgu3eGt6yACumrvTio1GL29VWjvVK2Q6S/TouLbisJkrdigs/r2mxVqOOJVN s0LOg0wr7bhrZlFlKVYxM+vrK6vxMtdw1+Rnp354VgmJMSutwoTEElMnkTJPtK8u4oa0if z+5HbVXd5ylXaAtXpJT6HngpR0YqqdMKC/Fp05g5VbxeFurkz3qQh8auDKFwhB7/a2lw2z ZnP3gyO32NsqjfGFOrmm3rupX58N5M06EhD0Xadn/WMoe22lSoBVsu/fXEYLdYavdaStgy X9VITJtlD7Uf4KPYlbR6lrrjl3BZW5TH8Ww7y6OVm75IF+RVxX7YXG/pVbnoBg== 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 566EB1382F; Mon, 21 Feb 2022 16:29:48 +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 21LGTmFV008382; Mon, 21 Feb 2022 16:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTm5q008381; Mon, 21 Feb 2022 16:29:48 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:48 GMT Message-Id: <202202211629.21LGTm5q008381@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: a813b0965d8e - main - sdhci: 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: a813b0965d8e9765135ad92a78ce62c8b762b99f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460989; 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=yh/IVam+CRLjBlJSR4dY763AaxVTBUAUZdLso5jnpz0=; b=YE9n5Yy4WROKqOGaidiNHjDSUlANmi1OGb/FrEKFnWaLFUW1pAmybyM4TcSdLOGopn5Qzb sKpOBMkGPbc6xvJwaB9ATN65SVP8POpXRBxuCgKSG22hZda6LEkgBdFoi0+ZVvRM4Tc5ka k40FZnGIeunKt1tRZYJpg0PKte23EH0pi2myAYwNVEdJOvUQ/ZyBnVIzQa1u9Z7/CWZjbV Rav1Lr1VcSb2QuwSvgKhxMZ/PArtXqC6VtaUNzKhmAxu43zoLVy9E6R4YrqXf65l6mCidq umUwSdhFF3uZ49fNDJjHPD+LcV/4t9Q8/l/3SadX5fvO7EPC0YLb98dsaXg/jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460989; a=rsa-sha256; cv=none; b=iI6IZ4ZM2UtwJrCgPxwUdrfI9KjkAUA0t8ehb3PWbrIYddpldS6iP3+p5rNzRZlnP154n8 Ag8mhnwiWaKmv71iC9EAPIhD0SRygDuU2xphdaNHvPKHiN4mrULBScfHw98NJDMeFKfbyG DH8lg9YDIItdyhMQB/BPiyDUIXOTgHLPvpAjegrL+2Nd2v1dd3erw5oCxMfrWomCio2ee4 kqs1ojtPQ9CiIBvPvjETeO0+1HKppsNaiocNygo482+psWsm6Nh8tdNJDF5+JEoTkBeCs+ Cf6UtmzGr+9IeyJ15G4kwKRiT9Abxjx9VRBG4uw1l6cjQuUm34BUaEPF7uKFQA== 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=a813b0965d8e9765135ad92a78ce62c8b762b99f commit a813b0965d8e9765135ad92a78ce62c8b762b99f Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:41:23 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:28:46 +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 --- 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