From nobody Wed Oct 18 14:31:38 2023 X-Original-To: dev-commits-src-all@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 4S9YFQ4D9Dz4x5yb; Wed, 18 Oct 2023 14:31: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 4S9YFQ3f7cz3N4W; Wed, 18 Oct 2023 14:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639498; 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=hUx1HkA99z7QbZoWQwfajfEEtuqiSeipocXoBdK8omA=; b=nDgmIyD9PZT0mpIO08KKl4a6d+f9SWeflf4kuuW9KJNCHGoPUdVKR2FoF8QSbkB2pELy4K oaNalOkJFV5XooAlD742wFHdXPJ/02l3ia+qClF0zLSevKRqcoxpky/LSYvl7eUUFw6L81 rIYKUdp6vEWDqRP14kr3xXQSuFqpQiNHNGdYtIR4PPuyd7Kg3IhmOE5zv+CezPaWZiMwhU 8c2f0DvEKONl3FXlKQiQhW6TwtiJ1d1S/wNeCE/90ltlinM+OG+SIb0Xg0qYnOTr7r5a7r 7HSVa1PVMyQS8zbhpuLW322JS5hAtT5ZCdLSeEJdNePVFHeKiPuaYtStpDazNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639498; a=rsa-sha256; cv=none; b=pRX4l2F86O5HAOjHoW/doWFnHWR2mye8lzOGmnKajx6mhblCLcQMyTraYQGzXiy9CEnx0r U0DIsXvnzsES71TktxR7uWr2hhsOa33vxeKU50ppb/TUuujWBfCrCsymoboXyH+JuD1iLa kxmi7Hozu83R52TrBD6WvIfLMoPOPbSiUfRvGWZ10gdqGfuJkmu8uy06M21i4Lbgmwhv/m PXYpVj4fE/NI1IqreJnzRLmdkS+1mil/NzwABSuaUldY9rx0oe2zTvgeDT0rb26aSbf+lL 1DorrAZ7yPLB5kFS9Iz1DFcazzyBFUguwil2+yqULmbRk5AHAVlRBE/Iw2lxvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639498; 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=hUx1HkA99z7QbZoWQwfajfEEtuqiSeipocXoBdK8omA=; b=gehqLT/p347QH6RSmX6EQOQyar+8N0ym57B2u79mGgFkbN1c3EtEMtmku7EGiK7HgkBU3c sJHjKy/hEZ2r5uJT/Fg0TcbTNiMhCz6jG6bS+g7OnPhIi3qSnSVXZPGOULZxLfPiJhZU2u WTVxT/htV4tDkOo+b1PDVnDjoKx05Vqk8KtEs5NCtQ3RilEBq/7WIVoalAEuM+GhDrkR11 k0f32mUAHDeAfn+k4AiSdfeTXfIGHOWwINfbSrHRXufuNOGynk5y7bZjw1HX7ZdbO9jspi uOL2OTSxGhBILRtLWkDf+cNXMeiAUz+h3qWKXYEsO0v/BInQ/rmaU0Sy98eogA== 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 4S9YFQ2TD3z18ts; Wed, 18 Oct 2023 14:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEVcT6089107; Wed, 18 Oct 2023 14:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVcCI089104; Wed, 18 Oct 2023 14:31:38 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:38 GMT Message-Id: <202310181431.39IEVcCI089104@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: 023ba06b4f95 - stable/14 - sdhci: fdt: Remove sdhci_generic compatible string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 023ba06b4f95fa106e6bda2fe349ff32f9ab42c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=023ba06b4f95fa106e6bda2fe349ff32f9ab42c9 commit 023ba06b4f95fa106e6bda2fe349ff32f9ab42c9 Author: Emmanuel Vadot AuthorDate: 2023-09-06 08:59:18 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:05 +0000 sdhci: fdt: Remove sdhci_generic compatible string This was used when we had our own DTS, it's not used anymore. Reviewed-by: bz Differential Revision: https://reviews.freebsd.org/D41807 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 8c7e747491ad636d6ee4069a74ddb24814870540) --- sys/dev/sdhci/sdhci_fdt.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 4a355d6514ad..16748dd4982c 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -70,12 +70,11 @@ #define MAX_SLOTS 6 #define SDHCI_FDT_ARMADA38X 1 -#define SDHCI_FDT_GENERIC 2 -#define SDHCI_FDT_XLNX_ZY7 3 -#define SDHCI_FDT_QUALCOMM 4 -#define SDHCI_FDT_RK3399 5 -#define SDHCI_FDT_RK3568 6 -#define SDHCI_FDT_XLNX_ZMP 7 +#define SDHCI_FDT_XLNX_ZY7 2 +#define SDHCI_FDT_QUALCOMM 3 +#define SDHCI_FDT_RK3399 4 +#define SDHCI_FDT_RK3568 5 +#define SDHCI_FDT_XLNX_ZMP 6 #define RK3399_GRF_EMMCCORE_CON0 0xf000 #define RK3399_CORECFG_BASECLKFREQ 0xff00 @@ -118,7 +117,6 @@ static struct ofw_compat_data compat_data[] = { { "marvell,armada-380-sdhci", SDHCI_FDT_ARMADA38X }, - { "sdhci_generic", SDHCI_FDT_GENERIC }, { "qcom,sdhci-msm-v4", SDHCI_FDT_QUALCOMM }, { "rockchip,rk3399-sdhci-5.1", SDHCI_FDT_RK3399 }, { "xlnx,zy7_sdhci", SDHCI_FDT_XLNX_ZY7 }, @@ -516,9 +514,6 @@ sdhci_fdt_probe(device_t dev) sc->quirks = SDHCI_QUIRK_BROKEN_AUTO_STOP; device_set_desc(dev, "ARMADA38X SDHCI controller"); break; - case SDHCI_FDT_GENERIC: - device_set_desc(dev, "generic fdt SDHCI controller"); - break; case SDHCI_FDT_QUALCOMM: sc->quirks = SDHCI_QUIRK_ALL_SLOTS_NON_REMOVABLE | SDHCI_QUIRK_BROKEN_SDMA_BOUNDARY;