From 381c5c163c6cc049aa9f83c45b82b6e60abfebba Mon Sep 17 00:00:00 2001 From: Moses Christopher Date: Mon, 7 Sep 2020 09:44:47 +0000 Subject: am335x, guardian: update the maintainer list I am leaving Bosch, so replacing myself with Gireesh Signed-off-by: Moses Christopher --- board/bosch/guardian/MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/bosch/guardian/MAINTAINERS b/board/bosch/guardian/MAINTAINERS index 2f674d7f839..fd216a96ca4 100644 --- a/board/bosch/guardian/MAINTAINERS +++ b/board/bosch/guardian/MAINTAINERS @@ -1,7 +1,7 @@ Guardian BOARD M: Sjoerd Simons M: Govindaraji Sivanantham -M: Moses Christopher Bollavarapu +M: Hiremath Gireesh S: Maintained F: board/bosch/guardian/ F: include/configs/am335x_guardian.h -- cgit From 5a8a7a95a05afb546d54cec06d29afbda665853e Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Thu, 17 Sep 2020 16:48:16 +0530 Subject: board: ti: j721e: Fix OSPI node compatible Update detect_enable_hyperflash() to look for "ti,am654-ospi" compatible to match the upstream DT node. Signed-off-by: Vignesh Raghavendra --- board/ti/j721e/evm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index ebaa6faa931..a8649fbd616 100644 --- 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")); } -- cgit From 6d7364016a4da0d8faeb6a2566aed9e0f188ffbe Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Wed, 16 Sep 2020 16:23:20 +0530 Subject: configs: am335x_evm_defconfig: Enable CONFIG_OF_LIBFDT_OVERLAY This enables applying DTBOs at U-Boot prompt before booting to kernel. Signed-off-by: Vignesh Raghavendra --- configs/am335x_evm_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 0d814530d41..a44ed286cf7 100644 --- 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 -- cgit From 85bdcf03b79bb35b98fce26d8dd064cc1165917a Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Thu, 17 Sep 2020 20:11:22 +0530 Subject: dma: ti: k3-udma: Reset the channel during release Reset the channel completely during channel release in order to clear teardown bit before handing over to next user or jumping to Linux. Signed-off-by: Vignesh Raghavendra Reviewed-by: Grygorii Strashko --- drivers/dma/ti/k3-udma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 57d9fbfabbf..94216045ccc 100644 --- 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); -- cgit From 25364f5ec8e9ee9271c55c5d0b1b51034438fe8b Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Wed, 7 Oct 2020 21:47:58 -0500 Subject: configs: j721e_evm: Use DEFAULT_LINUX_BOOT_ENV Use DEFAULT_LINUX_BOOT_ENV to define the standard addresses used in rest of TI platforms as defined in ti_armv7_common.h This avoids the standard pitfalls we've had with kernel images and fdt addresses stomping on each other. As part of this process, redefine overlayaddr to be dtboaddr (defined in ti_armv7_common.h for this very purpose).. we will get rid of overlayaddr later in the series. Signed-off-by: Nishanth Menon --- include/configs/j721e_evm.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index c8a76037ff0..4ccf6f6daa5 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -67,9 +67,7 @@ "findfdt=" \ "setenv name_fdt ${default_device_tree};" \ "setenv fdtfile ${name_fdt}\0" \ - "loadaddr=0x80080000\0" \ - "fdtaddr=0x82000000\0" \ - "overlayaddr=0x83000000\0" \ + "overlayaddr=${dtboaddr}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ @@ -99,8 +97,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} " \ @@ -137,6 +135,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 \ -- cgit From cb56936ce575ba043eb03e2a437950e7a078be49 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Wed, 7 Oct 2020 21:47:59 -0500 Subject: env: ti: ufs: Use dtboaddr instead of overlayaddr Use dtboaddr to define the overlay address common to all TI platforms instead of creating a new overlayaddr for the purpose. Signed-off-by: Nishanth Menon --- include/environment/ti/ufs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/environment/ti/ufs.h b/include/environment/ti/ufs.h index d457e203081..6619ec9c88e 100644 --- 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 -- cgit From a9cdba9cc190cf88d92bd8adfccbdb4976c3f6f5 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Wed, 7 Oct 2020 21:48:00 -0500 Subject: configs: j721e_evm: Get rid of overlayaddr Now that we dont have any further users of overlayaddr, get rid of it. Signed-off-by: Nishanth Menon --- include/configs/j721e_evm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 4ccf6f6daa5..8f52eb72cb6 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -67,7 +67,6 @@ "findfdt=" \ "setenv name_fdt ${default_device_tree};" \ "setenv fdtfile ${name_fdt}\0" \ - "overlayaddr=${dtboaddr}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ -- cgit From 87b4521fd8bb32703e269dfbd596d61fbe234ab6 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Wed, 7 Oct 2020 21:48:01 -0500 Subject: configs: am65x_evm: Use DEFAULT_LINUX_BOOT_ENV and remove overlayaddr Use DEFAULT_LINUX_BOOT_ENV to define the standard addresses used in rest of TI platforms as defined in ti_armv7_common.h This avoids the standard pitfalls we've had with kernel images and fdt addresses stomping on each other. As part of this process, redefine overlayaddr to be dtboaddr (defined in ti_armv7_common.h for this very purpose) and get rid of the definition of overlayaddr.. Signed-off-by: Nishanth Menon --- include/configs/am65x_evm.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index df0605657ae..9eed0ea203a 100644 --- 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 \ -- cgit From 555ee3949307648d6c40081b30e212af075ab8a8 Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Thu, 8 Oct 2020 14:58:38 +0530 Subject: phy: omap-usb2-phy: Drop usage of "ti, dis-chg-det-quirk" DT property "ti,dis-chg-det-quirk" property is not part of Linux kernel DT binding documentation. Therefore drop this and instead use soc_device_match() to distinguish b/w AM654 SR1.0 and SR2.0 devices similar to Linux kernel driver. Signed-off-by: Vignesh Raghavendra --- drivers/phy/omap-usb2-phy.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c index adc454ddd48..a981cb2f8d6 100644 --- a/drivers/phy/omap-usb2-phy.c +++ b/drivers/phy/omap-usb2-phy.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -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"); -- cgit