D41807.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41807.diff
View Options

	diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
	--- 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 @@
	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;