Merge tag 'ti-v2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

- Minor cleanup on K3 env variables
- Fix OSPI compatible for J721e
- Drop unused property in omap-usb2-phy
- Update Maintainer for am335x-guardian board.

diff --git a/board/bosch/guardian/MAINTAINERS b/board/bosch/guardian/MAINTAINERS
index 2f674d7f839d87d48e23f36946156a142855da74..fd216a96ca409765e68be246e75d5c81f01e6dd8 100644 (file)
--- a/board/bosch/guardian/MAINTAINERS
+++ b/board/bosch/guardian/MAINTAINERS
@@ -1,7 +1,7 @@
 Guardian BOARD
 M:     Sjoerd Simons <sjoerd.simons@collabora.co.uk>
 M:     Govindaraji Sivanantham <Govindaraji.Sivanantham@in.bosch.com>
-M:     Moses Christopher Bollavarapu <BollavarapuMoses.Christopher@in.bosch.com>
+M:     Hiremath Gireesh <Gireesh.Hiremath@in.bosch.com>
 S:     Maintained
 F:     board/bosch/guardian/
 F:     include/configs/am335x_guardian.h

diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 7925b76ab71cb1174cdca8a7b2a5445de16d4383..d8711eb90050d55ea762a88eb8a23aacbccd479a 100644 (file)
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -110,7 +110,7 @@ static void __maybe_unused detect_enable_hyperflash(void *blob)
                do_fixup_by_compat(blob, "ti,am654-hbmc", "status",
                                   "okay", sizeof("okay"), 0);
                offset = fdt_node_offset_by_compatible(blob, -1,
-                                                      "ti,j721e-ospi");
+                                                      "ti,am654-ospi");
                fdt_setprop(blob, offset, "status", "disabled",
                            sizeof("disabled"));
        }

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index b76230ff54511fdb9cd18b83dfc1e7b0a909de08..eb5a299bbcfabc90b348ff918943df19134cc1a2 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -92,4 +92,3 @@ CONFIG_WDT=y
 CONFIG_DYNAMIC_CRC_TABLE=y
 CONFIG_RSA=y
 CONFIG_LZO=y
-# CONFIG_OF_LIBFDT_OVERLAY is not set

diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 57d9fbfabbffd7e22ed1145acd8898aa7344e480..94216045ccce612f652d7da33659686168609e26 100644 (file)
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -1134,7 +1134,9 @@ err_free_res:
 
 static void udma_free_chan_resources(struct udma_chan *uc)
 {
-       /* Some configuration to UDMA-P channel: disable, reset, whatever */
+       /* Hard reset UDMA channel */
+       udma_stop_hard(uc);
+       udma_reset_counters(uc);
 
        /* Release PSI-L pairing */
        udma_navss_psil_unpair(uc->ud, uc->config.src_thread, uc->config.dst_thread);

diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index adc454ddd48b4f3282bcd80118952be463c8eb97..a981cb2f8d688ca36208327455835e9ef8134115 100644 (file)
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <generic-phy.h>
 #include <regmap.h>
+#include <soc.h>
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
@@ -196,6 +197,11 @@ struct phy_ops omap_usb2_phy_ops = {
        .exit = omap_usb2_phy_exit,
 };
 
+static const struct soc_attr am65x_sr10_soc_devices[] = {
+       { .family = "AM65X", .revision = "SR1.0" },
+       { /* sentinel */ }
+};
+
 int omap_usb2_phy_probe(struct udevice *dev)
 {
        int rc;
@@ -222,10 +228,9 @@ int omap_usb2_phy_probe(struct udevice *dev)
         * Disabling the USB2_PHY Charger Detect function will put D+
         * into the normal state.
         *
-        * Using property "ti,dis-chg-det-quirk" in the DT usb2-phy node
-        * to enable this workaround for AM654x PG1.0.
+        * Enable this workaround for AM654x PG1.0.
         */
-       if (dev_read_bool(dev, "ti,dis-chg-det-quirk"))
+       if (soc_device_match(am65x_sr10_soc_devices))
                priv->flags |= OMAP_USB2_DISABLE_CHG_DET;
 
        regmap = syscon_regmap_lookup_by_phandle(dev, "syscon-phy-power");

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index df0605657aef566a90158b83607f6bc545f9d50f..9eed0ea203a964ea8a78389f77cb0130f32a4f42 100644 (file)
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -69,9 +69,6 @@
        "findfdt="                                                      \
                "setenv name_fdt k3-am654-base-board.dtb;"              \
                "setenv fdtfile ${name_fdt}\0"                          \
-       "loadaddr=0x80080000\0"                                         \
-       "fdtaddr=0x82000000\0"                                          \
-       "overlayaddr=0x83000000\0"                                      \
        "name_kern=Image\0"                                             \
        "console=ttyS2,115200n8\0"                                      \
        "stdin=serial,usbkbd\0"                                         \
@@ -93,8 +90,8 @@
                "fdt resize 0x100000;"                                  \
                "for overlay in $name_overlays;"                        \
                "do;"                                                   \
-               "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay};"    \
-               "fdt apply ${overlayaddr};"                             \
+               "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay};"       \
+               "fdt apply ${dtboaddr};"                                \
                "done;\0"                                               \
        "get_kern_mmc=load mmc ${bootpart} ${loadaddr} "                \
                "${bootdir}/${name_kern}\0"                             \
@@ -133,6 +130,7 @@
 
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       DEFAULT_LINUX_BOOT_ENV                                          \
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_AM65X_BOARD_SETTINGS                                  \

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 1b47e18b2f9579d200ca8d095aa2cb1587f53cab..b707fc4e899fbf6eab53ebcfcac45d0b8ad5b83e 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -69,9 +69,6 @@
        "findfdt="                                                      \
                "setenv name_fdt ${default_device_tree};"               \
                "setenv fdtfile ${name_fdt}\0"                          \
-       "loadaddr=0x80080000\0"                                         \
-       "fdtaddr=0x82000000\0"                                          \
-       "overlayaddr=0x83000000\0"                                      \
        "name_kern=Image\0"                                             \
        "console=ttyS2,115200n8\0"                                      \
        "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "  \
@@ -114,8 +111,8 @@
                "fdt resize 0x100000;"                                  \
                "for overlay in $name_overlays;"                        \
                "do;"                                                   \
-               "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay} && " \
-               "fdt apply ${overlayaddr};"                             \
+               "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && "    \
+               "fdt apply ${dtboaddr};"                                \
                "done;\0"                                               \
        "partitions=" PARTS_DEFAULT                                     \
        "get_kern_mmc=load mmc ${bootpart} ${loadaddr} "                \
@@ -165,6 +162,7 @@
 
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       DEFAULT_LINUX_BOOT_ENV                                          \
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_J721E_BOARD_SETTINGS                                  \

diff --git a/include/environment/ti/ufs.h b/include/environment/ti/ufs.h
index d457e2030814752fe505292e71b6ca90a60f5ffc..6619ec9c88edb64bb9c70ab3ccba4636e4f6c285 100644 (file)
--- a/include/environment/ti/ufs.h
+++ b/include/environment/ti/ufs.h
@@ -26,8 +26,8 @@
                "fdt resize 0x100000;" \
                "for overlay in $name_overlays;" \
                "do;" \
-               "load scsi ${bootpart} ${overlayaddr} ${bootdir}/${overlay} && " \
-               "fdt apply ${overlayaddr};" \
+               "load scsi ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
+               "fdt apply ${dtboaddr};" \
                "done;\0"
 
 #endif