recipes-bsp: u-boot: Revert UHS mode enable

Instabilities were observed on few SD cards when UHS speed modes were
enabled. Therefore, disable UHS modes and voltage switching by removing
the repective nodes in the device tree.

Signed-off-by: Devarsh Thakkar <devarsht@ti.com>

3 files changed, 211 insertions, 0 deletions

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging/0001-Revert-arm-dts-k3-am625-sk-u-boot-Add-u-boot-tag-to-.patch b/recipes-bsp/u-boot/u-boot-ti-staging/0001-Revert-arm-dts-k3-am625-sk-u-boot-Add-u-boot-tag-to-.patch
new file mode 100644
index 0000000..6bba9a7
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ti-staging/0001-Revert-arm-dts-k3-am625-sk-u-boot-Add-u-boot-tag-to-.patch
@@ -0,0 +1,85 @@
+From d3bfcc889ca1f59798f25db94e4d56b4105ce268 Mon Sep 17 00:00:00 2001
+From: Aswath Govindraju <a-govindraju@ti.com>
+Date: Tue, 24 May 2022 10:58:06 +0530
+Subject: [tiU21.01 PATCH v2 1/2] Revert "arm: dts: k3-am625-sk-u-boot: Add
+ u-boot tag to dt nodes for enabling UHS speed modes in SPL"
+
+This reverts commit 22247f725fd7b8ebc49738db64feefa4edb0ae99.
+
+Instabilities were observed on few SD cards when UHS speed modes were
+enabled. Therefore, disable UHS modes and voltage switching by removing the
+repective nodes in the device tree.
+
+Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
+---
+ arch/arm/dts/k3-am625-sk-u-boot.dtsi | 40 ----------------------------
+ 1 file changed, 40 deletions(-)
+
+diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
+index 16562cf4942b..f2ad332f9f5d 100644
+--- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
++++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
+@@ -92,10 +92,6 @@
+        u-boot,dm-spl;
+ };
+ 
+-&main_gpio0 {
+-       u-boot,dm-spl;
+-};
+-
+ &main_i2c0 {
+        u-boot,dm-spl;
+ };
+@@ -104,18 +100,6 @@
+        u-boot,dm-spl;
+ };
+ 
+-&main_i2c1 {
+-       u-boot,dm-spl;
+-};
+-
+-&main_i2c1_pins_default {
+-       u-boot,dm-spl;
+-};
+-
+-&exp1 {
+-       u-boot,dm-spl;
+-};
+-
+ &sdhci0 {
+        u-boot,dm-spl;
+ };
+@@ -225,30 +209,6 @@
+        u-boot,dm-spl;
+ };
+ 
+-&vmain_pd {
+-       u-boot,dm-spl;
+-};
+-
+-&vcc_5v0 {
+-       u-boot,dm-spl;
+-};
+-
+-&vcc_3v3_sys {
+-       u-boot,dm-spl;
+-};
+-
+-&vdd_mmc1 {
+-       u-boot,dm-spl;
+-};
+-
+-&vdd_sd_dv {
+-       u-boot,dm-spl;
+-};
+-
+-&vdd_sd_dv_pins_default {
+-       u-boot,dm-spl;
+-};
+-
+ &dmsc {
+        u-boot,dm-spl;
+        k3_sysreset: sysreset-controller {
+-- 
+2.17.1
+
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging/0002-Revert-configs-am62x_evm_a53_defconfig-Enable-config.patch b/recipes-bsp/u-boot/u-boot-ti-staging/0002-Revert-configs-am62x_evm_a53_defconfig-Enable-config.patch
new file mode 100644
index 0000000..933fa40
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ti-staging/0002-Revert-configs-am62x_evm_a53_defconfig-Enable-config.patch
@@ -0,0 +1,114 @@
+From df868e6bbfb4f589ab52944eaf0fd02c8d1a2f35 Mon Sep 17 00:00:00 2001
+From: Aswath Govindraju <a-govindraju@ti.com>
+Date: Tue, 24 May 2022 11:04:02 +0530
+Subject: [tiU21.01 PATCH v2 2/2] Revert "configs: am62x_evm_a53_defconfig:
+ Enable configs required to add support for UHS modes"
+
+This reverts commit 70c33dd821811a05c595f29ecac5abae23534768.
+
+Instabilities were observed on few SD cards when UHS speed modes were
+enabled. Therefore, disable UHS modes and votlage switching by removing
+their respective configs.
+
+Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
+---
+ configs/am62x_evm_a53_defconfig | 22 ++--------------------
+ 1 file changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig
+index e3a25a3cb90a..15127e4cb058 100644
+--- a/configs/am62x_evm_a53_defconfig
++++ b/configs/am62x_evm_a53_defconfig
+@@ -1,6 +1,5 @@
+ CONFIG_ARM=y
+ CONFIG_ARCH_K3=y
+-CONFIG_SPL_GPIO_SUPPORT=y
+ CONFIG_SPL_LIBCOMMON_SUPPORT=y
+ CONFIG_SPL_LIBGENERIC_SUPPORT=y
+ CONFIG_SYS_MALLOC_F_LEN=0x8000
+@@ -11,7 +10,6 @@ CONFIG_TARGET_AM625_A53_EVM=y
+ CONFIG_ENV_SIZE=0x20000
+ CONFIG_ENV_OFFSET=0x680000
+ CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+-CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
+ CONFIG_SPL_TEXT_BASE=0x80080000
+ CONFIG_SPL_MMC_SUPPORT=y
+@@ -30,7 +28,6 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
+ CONFIG_BOARD_LATE_INIT=y
+ CONFIG_MISC_INIT_R=y
+ CONFIG_SPL_BOARD_INIT=y
+-CONFIG_SPL_BOARD_INIT=y
+ CONFIG_AVB_VERIFY=y
+ CONFIG_ANDROID_AB=y
+ CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+@@ -46,7 +43,6 @@ CONFIG_SPL_DM_MAILBOX=y
+ CONFIG_SPL_DM_SPI_FLASH=y
+ CONFIG_SPL_NET_SUPPORT=y
+ CONFIG_SPL_NET_VCI_STRING="AM62X U-Boot A53 SPL"
+-CONFIG_SPL_POWER_SUPPORT=y
+ CONFIG_SPL_POWER_DOMAIN=y
+ CONFIG_SPL_RAM_SUPPORT=y
+ CONFIG_SPL_RAM_DEVICE=y
+@@ -54,8 +50,6 @@ CONFIG_SPL_RAM_DEVICE=y
+ CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
+ CONFIG_SPL_SPI_LOAD=y
+ CONFIG_SPL_THERMAL=y
+-CONFIG_SPL_USB_GADGET=y
+-CONFIG_SPL_DFU=y
+ CONFIG_SPL_YMODEM_SUPPORT=y
+ CONFIG_CMD_ADTIMG=y
+ CONFIG_CMD_ABOOTIMG=y
+@@ -89,6 +83,7 @@ CONFIG_SPL_OF_TRANSLATE=y
+ CONFIG_CLK=y
+ CONFIG_SPL_CLK=y
+ CONFIG_CLK_TI_SCI=y
++CONFIG_SPL_DFU=y
+ CONFIG_DFU_MMC=y
+ CONFIG_DFU_RAM=y
+ CONFIG_DFU_SF=y
+@@ -103,20 +98,12 @@ CONFIG_FASTBOOT_FLASH=y
+ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+ CONFIG_TI_SCI_PROTOCOL=y
+-CONFIG_DA8XX_GPIO=y
+-CONFIG_DM_PCA953X=y
+-CONFIG_SPL_DM_PCA953X=y
+ CONFIG_DM_I2C=y
+-CONFIG_DM_I2C_GPIO=y
+ CONFIG_SYS_I2C_OMAP24XX=y
+ CONFIG_DM_MAILBOX=y
+ CONFIG_K3_SEC_PROXY=y
+ CONFIG_DM_MMC=y
+ CONFIG_SUPPORT_EMMC_BOOT=y
+-CONFIG_MMC_IO_VOLTAGE=y
+-CONFIG_SPL_MMC_IO_VOLTAGE=y
+-CONFIG_MMC_UHS_SUPPORT=y
+-CONFIG_SPL_MMC_UHS_SUPPORT=y
+ CONFIG_MMC_HS200_SUPPORT=y
+ CONFIG_SPL_MMC_HS200_SUPPORT=y
+ CONFIG_MMC_SDHCI=y
+@@ -140,12 +127,6 @@ CONFIG_SPL_PINCTRL=y
+ CONFIG_PINCTRL_SINGLE=y
+ CONFIG_POWER_DOMAIN=y
+ CONFIG_TI_SCI_POWER_DOMAIN=y
+-CONFIG_DM_REGULATOR=y
+-CONFIG_SPL_DM_REGULATOR=y
+-CONFIG_DM_REGULATOR_FIXED=y
+-CONFIG_SPL_DM_REGULATOR_FIXED=y
+-CONFIG_DM_REGULATOR_GPIO=y
+-CONFIG_SPL_DM_REGULATOR_GPIO=y
+ CONFIG_K3_SYSTEM_CONTROLLER=y
+ CONFIG_REMOTEPROC_TI_K3_ARM64=y
+ CONFIG_DM_RESET=y
+@@ -171,6 +152,7 @@ CONFIG_USB_DWC3=y
+ CONFIG_USB_DWC3_GENERIC=y
+ CONFIG_USB_DWC3_AM62=y
+ CONFIG_USB_GADGET=y
++CONFIG_SPL_USB_GADGET=y
+ CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+ CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+ CONFIG_USB_GADGET_PRODUCT_NUM=0x6165
+-- 
+2.17.1
+
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend b/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
new file mode 100644
index 0000000..4a590af
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_am62xx-evm = " \
+    file://0001-Revert-arm-dts-k3-am625-sk-u-boot-Add-u-boot-tag-to-.patch \
+    file://0002-Revert-configs-am62x_evm_a53_defconfig-Enable-config.patch \
+"
+
+SRC_URI_append_am62xx-evm-k3r5 = " \
+    file://0001-Revert-arm-dts-k3-am625-sk-u-boot-Add-u-boot-tag-to-.patch \
+    file://0002-Revert-configs-am62x_evm_a53_defconfig-Enable-config.patch \
+"
+PR = "r28"