diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-06 04:23:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-06 04:23:38 -0800 |
| commit | 6dd32f6958168713a02b43cc39c5fcee9d8f6d05 (patch) | |
| tree | 2efecd05f4d884a4fa5ee911c3cd5b7f29893dde /drivers | |
| parent | 2aad560e7aab2997eb674511c6101b6b0d73c0c8 (diff) | |
| parent | e709bdfc40a8c0cf13562d8771a3fc50ce9690e5 (diff) | |
Merge "power: reset: Remove secure boot mode check"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/reset/msm-poweroff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 38e822de34a7..a30ed90d6e92 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -530,7 +530,7 @@ static int msm_restart_probe(struct platform_device *pdev) pr_err("unable to map imem KASLR offset\n"); } - if (kaslr_imem_addr && scm_is_secure_device()) { + if (kaslr_imem_addr) { __raw_writel(0xdead4ead, kaslr_imem_addr); __raw_writel(KASLR_OFFSET_BIT_MASK & (kimage_vaddr - KIMAGE_VADDR), kaslr_imem_addr + 4); @@ -602,7 +602,6 @@ skip_sysfs_create: scm_deassert_ps_hold_supported = true; #ifdef CONFIG_QCOM_DLOAD_MODE - download_mode = scm_is_secure_device(); set_dload_mode(download_mode); if (!download_mode) scm_disable_sdi(); |