GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-tegra

Browse source
This commit is contained in:
Tom Rini 2020-06-19 12:41:05 -04:00
commit d0cc022820
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/dts/tegra186.dtsi
View file

@ -335,4 +335,9 @@
status = "disabled"; status = "disabled";
}; };
}; };
psci {
compatible = "arm,psci-1.0";
method = "smc";
};
}; };

5
arch/arm/dts/tegra210.dtsi
View file

@ -867,6 +867,11 @@
}; };
}; };
psci {
compatible = "arm,psci-1.0";
method = "smc";
};
timer { timer {
compatible = "arm,armv8-timer"; compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 interrupts = <GIC_PPI 13

2
board/toradex/colibri_t20/MAINTAINERS
View file

@ -1,5 +1,5 @@
COLIBRI_T20 COLIBRI_T20
M: Lucas Stach <dev@lynxeye.de> M: Igor Opaniuk <igor.opaniuk@toradex.com>
S: Maintained S: Maintained
F: board/toradex/colibri_t20/ F: board/toradex/colibri_t20/
F: include/configs/colibri_t20.h F: include/configs/colibri_t20.h

1
configs/p3450-0000_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_NVME=y

4
drivers/firmware/psci.c
View file

@ -67,11 +67,9 @@ static int psci_bind(struct udevice *dev)
static int psci_probe(struct udevice *dev) static int psci_probe(struct udevice *dev)
{ {
DECLARE_GLOBAL_DATA_PTR;
const char *method; const char *method;
method = fdt_stringlist_get(gd->fdt_blob, dev_of_offset(dev), "method", method = ofnode_read_string(dev_ofnode(dev), "method");
0, NULL);
if (!method) { if (!method) {
pr_warn("missing \"method\" property\n"); pr_warn("missing \"method\" property\n");
return -ENXIO; return -ENXIO;