Skip to content

Commit 5b6b9ed

Browse files
authored
arm64: dts: qcom: hamoa: Enable EL2 and remoteproc (#449)
arm64: dts: qcom: hamoa: Enable EL2 and remoteproc
2 parents d25df67 + f66c7ff commit 5b6b9ed

3 files changed

Lines changed: 21 additions & 0 deletions

File tree

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ properties:
4343
- qcom,apss-wdt-sm6350
4444
- qcom,apss-wdt-sm8150
4545
- qcom,apss-wdt-sm8250
46+
- qcom,apss-wdt-x1e80100
4647
- const: qcom,kpss-wdt
4748
- const: qcom,kpss-wdt
4849
deprecated: true

arch/arm64/boot/dts/qcom/hamoa.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9963,6 +9963,14 @@
99639963
};
99649964
};
99659965

9966+
apss_watchdog: watchdog@17410000 {
9967+
compatible = "qcom,apss-wdt-x1e80100", "qcom,kpss-wdt";
9968+
reg = <0x0 0x17410000 0x0 0x1000>;
9969+
clocks = <&sleep_clk>;
9970+
interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
9971+
status = "reserved"; /* Reserved by Gunyah */
9972+
};
9973+
99669974
cpucp_mbox: mailbox@17430000 {
99679975
compatible = "qcom,x1e80100-cpucp-mbox";
99689976
reg = <0 0x17430000 0 0x10000>, <0 0x18830000 0 0x10000>;

arch/arm64/boot/dts/qcom/x1-el2.dtso

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
/dts-v1/;
88
/plugin/;
99

10+
&apss_watchdog {
11+
status = "okay";
12+
};
13+
1014
/* We can't and don't need to use zap shader in EL2 as linux can zap the gpu on it's own. */
1115
&gpu_zap_shader {
1216
status = "disabled";
@@ -48,6 +52,14 @@
4852
status = "okay";
4953
};
5054

55+
&remoteproc_adsp {
56+
iommus = <&apps_smmu 0x1000 0x80>;
57+
};
58+
59+
&remoteproc_cdsp {
60+
iommus = <&apps_smmu 0x0c00 0x0>;
61+
};
62+
5163
/*
5264
* The "SBSA watchdog" is implemented in software in Gunyah
5365
* and can't be used when running in EL2.

0 commit comments

Comments
 (0)