Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions arch/arm64/boot/dts/qcom/nord.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,11 @@
reg = <0x0 0x80000000 0x0 0x0>;
};

pmu {
compatible = "arm,armv8-pmuv3";
interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
};

psci {
compatible = "arm,psci-1.0";
method = "smc";
Expand Down Expand Up @@ -532,6 +537,11 @@
#power-domain-cells = <0>;
domain-idle-states = <&domain_ss3>;
};

reboot-mode {
mode-bootloader = <0x80010001 0x2>;
mode-edl = <0x80000000 0x1>;
};
};

reserved_memory: reserved-memory {
Expand Down
9 changes: 2 additions & 7 deletions drivers/remoteproc/qcom_q6v5_pas.c
Original file line number Diff line number Diff line change
Expand Up @@ -1015,13 +1015,8 @@ static int qcom_pas_probe(struct platform_device *pdev)
pas->pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu;
pas->dtb_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu;

if (desc->early_boot) {
ret = qcom_q6v5_ping_subsystem_init(&pas->q6v5, pdev);
if (ret)
dev_warn(&pdev->dev, "Falling back to firmware load\n");
else
pas->rproc->state = RPROC_DETACHED;
}
if (desc->early_boot)
pas->rproc->state = RPROC_DETACHED;

ret = qcom_pas_setup_tmd(pas);
if (ret)
Expand Down
Loading