diff options
| author | Bibek Basu <bbasu@nvidia.com> | 2015-07-21 12:47:37 +0530 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2015-07-23 08:13:24 -0700 |
| commit | 350e11af044e460b6ec6afa649214d040ccf37ae (patch) | |
| tree | 47fd1c111092b311d2e346e31c68cf1a51472956 /arch | |
| parent | 746a0c437970ccb0cb91a2e261c3e5dc182ee099 (diff) | |
arm: tegra: fix secure firmware check during boot
psci status node should also be checked along with
compatible node to enable secure fimrware
Bug 200124907
Change-Id: Ieb336bc7d1cc2c68d94157222770a6da6a8dcfd1
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/772755
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/tegra124-jetson_tk1-pm375-000-c00-00.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra124-jetson_tk1-pm375-000-c00-00.dts b/arch/arm/boot/dts/tegra124-jetson_tk1-pm375-000-c00-00.dts index 130318405480..d6a25ebfdb9c 100644 --- a/arch/arm/boot/dts/tegra124-jetson_tk1-pm375-000-c00-00.dts +++ b/arch/arm/boot/dts/tegra124-jetson_tk1-pm375-000-c00-00.dts @@ -19,6 +19,10 @@ bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; }; + psci { + status = "disabled"; + }; + pinmux { pinctrl-names = "default", "drive", "unused", "suspend"; pinctrl-3 = <&pinmux_suspend>; diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 542e2b6dbcc7..23ae029a3ec2 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -1036,7 +1036,10 @@ void __init tegra11x_init_early(void) #ifdef CONFIG_ARCH_TEGRA_12x_SOC void __init tegra12x_init_early(void) { - if (of_find_compatible_node(NULL, NULL, "arm,psci")) + struct device_node *np = + of_find_compatible_node(NULL, NULL, "arm,psci"); + + if (np && of_device_is_available(np)) tegra_with_secure_firmware = 1; display_tegra_dt_info(); |