Merge tag 'ti-v2021.07-rc3' of https://source.denx.de/u-boot/custodians/u-boot-tiWIP/12May2021

- Initial support for AM64 EVM and SK
- K3 DDR driver unification for J7 and AM64 platforms.
- Minor fixes for TI clock driver

1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 11dcde1..a86d96a 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -470,6 +470,16 @@ const struct am654_driver_data j721e_4bit_drv_data = {
 	.flags = IOMUX_PRESENT,
 };
 
+static const struct am654_driver_data sdhci_am64_8bit_drvdata = {
+	.ops = &am654_sdhci_ops,
+	.flags = DLL_PRESENT | DLL_CALIB,
+};
+
+static const struct am654_driver_data sdhci_am64_4bit_drvdata = {
+	.ops = &j721e_4bit_sdhci_ops,
+	.flags = IOMUX_PRESENT,
+};
+
 const struct soc_attr am654_sdhci_soc_attr[] = {
 	{ .family = "AM65X", .revision = "SR1.0", .data = &am654_sr1_drv_data},
 	{/* sentinel */}
@@ -651,6 +661,14 @@ static const struct udevice_id am654_sdhci_ids[] = {
 		.compatible = "ti,j721e-sdhci-4bit",
 		.data = (ulong)&j721e_4bit_drv_data,
 	},
+	{
+		.compatible = "ti,am64-sdhci-8bit",
+		.data = (ulong)&sdhci_am64_8bit_drvdata,
+	},
+	{
+		.compatible = "ti,am64-sdhci-4bit",
+		.data = (ulong)&sdhci_am64_4bit_drvdata,
+	},
 	{ }
 };