diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-19 12:41:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-19 12:41:05 -0400 |
| commit | d0cc022820aef0d731840cfd42a22a4839c4d21d (patch) | |
| tree | df5675725bc36858afee4e01032c93b3c86f9c07 | |
| parent | 5c3cd8e2e1f956b74cbf6f145db6db518241a113 (diff) | |
| parent | 7b4f42b6cd5d8fa32f763b5ec03b7b8fdf7c4303 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-tegra
| -rw-r--r-- | arch/arm/dts/tegra186.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/dts/tegra210.dtsi | 5 | ||||
| -rw-r--r-- | board/toradex/colibri_t20/MAINTAINERS | 2 | ||||
| -rw-r--r-- | configs/p3450-0000_defconfig | 1 | ||||
| -rw-r--r-- | drivers/firmware/psci.c | 4 |
5 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index 0a9db9825b..edcb7aacb8 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -335,4 +335,9 @@ status = "disabled"; }; }; + + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; }; diff --git a/arch/arm/dts/tegra210.dtsi b/arch/arm/dts/tegra210.dtsi index 3ec54b11c4..a521a43d6c 100644 --- a/arch/arm/dts/tegra210.dtsi +++ b/arch/arm/dts/tegra210.dtsi @@ -867,6 +867,11 @@ }; }; + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; + timer { compatible = "arm,armv8-timer"; interrupts = <GIC_PPI 13 diff --git a/board/toradex/colibri_t20/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS index b251c000fe..2a8e6fb74b 100644 --- a/board/toradex/colibri_t20/MAINTAINERS +++ b/board/toradex/colibri_t20/MAINTAINERS @@ -1,5 +1,5 @@ COLIBRI_T20 -M: Lucas Stach <dev@lynxeye.de> +M: Igor Opaniuk <igor.opaniuk@toradex.com> S: Maintained F: board/toradex/colibri_t20/ F: include/configs/colibri_t20.h diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig index 2bf8f97ca2..c27a6ea237 100644 --- a/configs/p3450-0000_defconfig +++ b/configs/p3450-0000_defconfig @@ -56,3 +56,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y +CONFIG_NVME=y diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index e0d66d74f5..23cf807591 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -67,11 +67,9 @@ static int psci_bind(struct udevice *dev) static int psci_probe(struct udevice *dev) { - DECLARE_GLOBAL_DATA_PTR; const char *method; - method = fdt_stringlist_get(gd->fdt_blob, dev_of_offset(dev), "method", - 0, NULL); + method = ofnode_read_string(dev_ofnode(dev), "method"); if (!method) { pr_warn("missing \"method\" property\n"); return -ENXIO; |