Merge "ARM: dts: msm: put dependency of dma-heap on SCM"

This commit is contained in:
qctecmdr
2024-01-03 03:45:20 -08:00
committed by Gerrit - the friendly Code Review server
8 changed files with 13 additions and 5 deletions

View File

@@ -8,6 +8,7 @@
&soc { &soc {
qcom,dma-heaps { qcom,dma-heaps {
compatible = "qcom,dma-heaps"; compatible = "qcom,dma-heaps";
depends-on-supply = <&qcom_scm>;
qcom,display { qcom,display {
qcom,dma-heap-name = "qcom,display"; qcom,dma-heap-name = "qcom,display";

View File

@@ -7,6 +7,7 @@
&soc { &soc {
qcom,dma-heaps { qcom,dma-heaps {
compatible = "qcom,dma-heaps"; compatible = "qcom,dma-heaps";
depends-on-supply = <&qcom_scm>;
qcom,tui { qcom,tui {
qcom,dma-heap-name = "qcom,tui"; qcom,dma-heap-name = "qcom,tui";

View File

@@ -235,7 +235,7 @@
}; };
firmware: firmware { firmware: firmware {
scm { qcom_scm: qcom_scm {
compatible = "qcom,scm"; compatible = "qcom,scm";
}; };
}; };

View File

@@ -53,7 +53,9 @@
qcom,qmp = <&aoss_qmp>; qcom,qmp = <&aoss_qmp>;
}; };
firmware: firmware { }; firmware: firmware {
qcom_scm: qcom_scm { };
};
cpus { cpus {
#address-cells = <2>; #address-cells = <2>;

View File

@@ -8,6 +8,7 @@
&soc { &soc {
qcom,dma-heaps { qcom,dma-heaps {
compatible = "qcom,dma-heaps"; compatible = "qcom,dma-heaps";
depends-on-supply = <&qcom_scm>;
qcom,display { qcom,display {
qcom,dma-heap-name = "qcom,display"; qcom,dma-heap-name = "qcom,display";

View File

@@ -7,6 +7,7 @@
&soc { &soc {
qcom,dma-heaps { qcom,dma-heaps {
compatible = "qcom,dma-heaps"; compatible = "qcom,dma-heaps";
depends-on-supply = <&qcom_scm>;
qcom,tui { qcom,tui {
qcom,dma-heap-name = "qcom,tui"; qcom,dma-heap-name = "qcom,tui";

View File

@@ -283,7 +283,7 @@
}; };
firmware: firmware { firmware: firmware {
scm { qcom_scm: qcom_scm {
compatible = "qcom,scm"; compatible = "qcom,scm";
}; };
}; };

View File

@@ -45,7 +45,9 @@
mmc1 = &sdhc_2; /* SDC2 SD card slot */ mmc1 = &sdhc_2; /* SDC2 SD card slot */
}; };
firmware: firmware { }; firmware: firmware {
qcom_scm: qcom_scm { };
};
cpus { cpus {
#address-cells = <2>; #address-cells = <2>;
@@ -303,7 +305,7 @@
}; };
&firmware { &firmware {
qcom-scm { qcom_scm {
compatible = "qcom,scm"; compatible = "qcom,scm";
qcom,dload-mode = <&tcsr 0x19000>; qcom,dload-mode = <&tcsr 0x19000>;
}; };