git: 023ba06b4f95 - stable/14 - sdhci: fdt: Remove sdhci_generic compatible string

The branch stable/14 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=023ba06b4f95fa106e6bda2fe349ff32f9ab42c9

commit 023ba06b4f95fa106e6bda2fe349ff32f9ab42c9
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-09-06 08:59:18 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
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;