Skip to content

FROMGIT: arm64: dts: qcom: hamoa: Enable EL2 and remoteproc #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LXQUALCOMM wants to merge 4 commits into
base: qcom-6.18.y
Choose a base branch
from
+21 −0
Open

FROMGIT: arm64: dts: qcom: hamoa: Enable EL2 and remoteproc #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42170fb
FROMGIT: arm64: dts: qcom: hamoa: Add remoteproc IOMMUS in EL2 device…
Feb 3, 2026
4eea14c
FROMGIT: dt-bindings: watchdog: Document X1E80100 compatible
Dec 24, 2025
914beeb
FROMGIT: arm64: dts: qcom: hamoa: Add the APSS watchdog
Dec 24, 2025
f66c7ff
FROMGIT: arm64: dts: qcom: x1-el2: Enable the APSS watchdog
Dec 24, 2025
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
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ properties:
- qcom,apss-wdt-sm6350
- qcom,apss-wdt-sm8150
- qcom,apss-wdt-sm8250
- qcom,apss-wdt-x1e80100
- const: qcom,kpss-wdt
- const: qcom,kpss-wdt
deprecated: true
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/qcom/hamoa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9963,6 +9963,14 @@
};
};

apss_watchdog: watchdog@17410000 {
compatible = "qcom,apss-wdt-x1e80100", "qcom,kpss-wdt";
reg = <0x0 0x17410000 0x0 0x1000>;
clocks = <&sleep_clk>;
interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
status = "reserved"; /* Reserved by Gunyah */
};

cpucp_mbox: mailbox@17430000 {
compatible = "qcom,x1e80100-cpucp-mbox";
reg = <0 0x17430000 0 0x10000>, <0 0x18830000 0 0x10000>;
Expand Down
12 changes: 12 additions & 0 deletions arch/arm64/boot/dts/qcom/x1-el2.dtso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
/dts-v1/;
/plugin/;

&apss_watchdog {
status = "okay";
};

/* We can't and don't need to use zap shader in EL2 as linux can zap the gpu on it's own. */
&gpu_zap_shader {
status = "disabled";
Expand Down Expand Up @@ -48,6 +52,14 @@
status = "okay";
};

&remoteproc_adsp {
iommus = <&apps_smmu 0x1000 0x80>;
};

&remoteproc_cdsp {
iommus = <&apps_smmu 0x0c00 0x0>;
};

/*
* The "SBSA watchdog" is implemented in software in Gunyah
* and can't be used when running in EL2.
Expand Down