mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-24 04:34:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- Minor cleanup on K3 env variables
- Fix OSPI compatible for J721e
- Drop unused property in omap-usb2-phy
- Update Maintainer for am335x-guardian board.
This commit is contained in:
Tom Rini 2020-10-12 07:26:57 -04:00
commit 47e9c70421
8 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/bosch/guardian/MAINTAINERS
View File

@ -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

2
board/ti/j721e/evm.c
View File

@ -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"));
}

1
configs/am335x_evm_defconfig
View File

@ -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

4
drivers/dma/ti/k3-udma.c
View File

@ -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);

11
drivers/phy/omap-usb2-phy.c
View File

@ -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");

8
include/configs/am65x_evm.h
View File

@ -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 \

8
include/configs/j721e_evm.h
View File

@ -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 \

4
include/environment/ti/ufs.h
View File

@ -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