Merge "ARM: dts: msm: Fix compilation warnings for sa8155, sa8195 and sa6155"

This commit is contained in:
qctecmdr 2021-05-18 08:19:06 -07:00 • committed by Gerrit - the friendly Code Review server
commit e374324f87
21 changed files with 146 additions and 146 deletions

View file

@ -1,9 +1,9 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
&soc {
kgsl_smmu: kgsl-smmu@0x02CA0000 {
kgsl_smmu: kgsl-smmu@2ca0000 {
compatible = "qcom,qsmmu-v500";
reg = <0x02CA0000 0x10000>,
reg = <0x2ca0000 0x10000>,
<0x2CC2000 0x20>;
reg-names = "base", "tcu-base";
#iommu-cells = <2>;
@ -35,40 +35,40 @@
<GIC_SPI 686 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>;
gfx_0_tbu: gfx_0_tbu@0x2CC5000 {
gfx_0_tbu: gfx_0_tbu@2cc5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2CC5000 0x1000>,
<0x2CC2200 0x8>;
reg = <0x2cc5000 0x1000>,
<0x2cc2200 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x0 0x400>;
};
gfx_1_tbu: gfx_1_tbu@0x2CC9000 {
gfx_1_tbu: gfx_1_tbu@2cc9000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2CC9000 0x1000>,
<0x2CC2208 0x8>;
reg = <0x2cc9000 0x1000>,
<0x2cc2208 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x400 0x400>;
};
gfx_2_tbu: gfx_2_tbu@0x2CCD000 {
gfx_2_tbu: gfx_2_tbu@2ccd000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2CCD000 0x1000>,
<0x2CC2210 0x8>;
reg = <0x2ccd000 0x1000>,
<0x2cc2210 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x800 0x400>;
};
gfx_3_tbu: gfx_3_tbu@0x2CD1000 {
gfx_3_tbu: gfx_3_tbu@2cd1000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2CD1000 0x1000>,
<0x2CC2218 0x8>;
reg = <0x2cd1000 0x1000>,
<0x2cc2218 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0xC00 0x400>;
};
};
apps_smmu: apps-smmu@0x15000000 {
apps_smmu: apps-smmu@15000000 {
compatible = "qcom,qsmmu-v500";
reg = <0x15000000 0x100000>,
<0x15182000 0x20>;
@ -213,7 +213,7 @@
interconnects = <&system_noc MASTER_GEM_NOC_SNOC
&config_noc SLAVE_IMEM_CFG>;
anoc_1_tbu: anoc_1_tbu@0x15185000 {
anoc_1_tbu: anoc_1_tbu@15185000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15185000 0x1000>,
<0x15182200 0x8>;
@ -226,7 +226,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
anoc_2_tbu: anoc_2_tbu@0x15189000 {
anoc_2_tbu: anoc_2_tbu@15189000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15189000 0x1000>,
<0x15182208 0x8>;
@ -239,9 +239,9 @@
&config_noc SLAVE_IMEM_CFG>;
};
mnoc_hf_0_tbu: mnoc_hf_0_tbu@0x1518D000 {
mnoc_hf_0_tbu: mnoc_hf_0_tbu@1518d000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x1518D000 0x1000>,
reg = <0x1518d000 0x1000>,
<0x15182210 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x800 0x400>;
@ -252,7 +252,7 @@
&mmss_noc SLAVE_MNOC_HF_MEM_NOC>;
};
mnoc_hf_1_tbu: mnoc_hf_1_tbu@0x15191000 {
mnoc_hf_1_tbu: mnoc_hf_1_tbu@15191000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15191000 0x1000>,
<0x15182218 0x8>;
@ -265,7 +265,7 @@
&mmss_noc SLAVE_MNOC_HF_MEM_NOC>;
};
compute_dsp_1_tbu: compute_dsp_1_tbu@0x15195000 {
compute_dsp_1_tbu: compute_dsp_1_tbu@15195000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15195000 0x1000>,
<0x15182220 0x8>;
@ -276,7 +276,7 @@
&compute_noc SLAVE_CDSP_MEM_NOC>;
};
compute_dsp_0_tbu: compute_dsp_0_tbu@0x15199000 {
compute_dsp_0_tbu: compute_dsp_0_tbu@15199000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15199000 0x1000>,
<0x15182228 0x8>;
@ -287,9 +287,9 @@
&compute_noc SLAVE_CDSP_MEM_NOC>;
};
adsp_tbu: adsp_tbu@0x1519D000 {
adsp_tbu: adsp_tbu@1519d000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x1519D000 0x1000>,
reg = <0x1519d000 0x1000>,
<0x15182230 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x1800 0x400>;
@ -300,9 +300,9 @@
&config_noc SLAVE_IMEM_CFG>;
};
anoc_pcie: anoc_pcie@151A1000 {
anoc_pcie: anoc_pcie@151a1000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x151A1000 0x1000>,
reg = <0x151a1000 0x1000>,
<0x15182238 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x1c00 0x400>;
@ -315,9 +315,9 @@
&config_noc SLAVE_IMEM_CFG>;
};
mnoc_sf_0_tbu: mnoc_sf_0_tbu@0x151A5000 {
mnoc_sf_0_tbu: mnoc_sf_0_tbu@151a5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x151A5000 0x1000>,
reg = <0x151a5000 0x1000>,
<0x15182240 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x2000 0x400>;

View file

@ -1,7 +1,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
&soc {
kgsl_smmu: kgsl-smmu@0x50a0000 {
kgsl_smmu: kgsl-smmu@50a0000 {
compatible = "qcom,qsmmu-v500";
reg = <0x50a0000 0x10000>,
<0x50c2000 0x20>;
@ -35,7 +35,7 @@
<GIC_SPI 596 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 597 IRQ_TYPE_LEVEL_HIGH>;
gfx_0_tbu: gfx_0_tbu@0x50c5000 {
gfx_0_tbu: gfx_0_tbu@50c5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x50c5000 0x1000>,
<0x50c2200 0x8>;
@ -43,7 +43,7 @@
qcom,stream-id-range = <0x0 0x400>;
};
gfx_1_tbu: gfx_1_tbu@0x50c9000 {
gfx_1_tbu: gfx_1_tbu@50c9000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x50c9000 0x1000>,
<0x50c2208 0x8>;
@ -52,7 +52,7 @@
};
};
apps_smmu: apps-smmu@0x15000000 {
apps_smmu: apps-smmu@15000000 {
compatible = "qcom,qsmmu-v500";
reg = <0x15000000 0x80000>,
<0x150c2000 0x20>;
@ -135,7 +135,7 @@
&config_noc SLAVE_IMEM_CFG>;
qcom,active-only;
anoc_1_tbu: anoc_1_tbu@0x150c5000 {
anoc_1_tbu: anoc_1_tbu@150c5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x150c5000 0x1000>,
<0x150c2200 0x8>;
@ -148,7 +148,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
anoc_2_tbu: anoc_2_tbu@0x150c9000 {
anoc_2_tbu: anoc_2_tbu@150c9000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x150c9000 0x1000>,
<0x150c2208 0x8>;
@ -161,7 +161,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
mnoc_hf_0_tbu: mnoc_hf_0_tbu@0x150cd000 {
mnoc_hf_0_tbu: mnoc_hf_0_tbu@150cd000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x150cd000 0x1000>,
<0x150c2210 0x8>;
@ -174,7 +174,7 @@
&mmss_noc SLAVE_MNOC_HF_MEM_NOC>;
};
mnoc_sf_0_tbu: mnoc_sf_0_tbu@0x150d1000 {
mnoc_sf_0_tbu: mnoc_sf_0_tbu@150d1000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x150d1000 0x1000>,
<0x150c2218 0x8>;
@ -187,7 +187,7 @@
&mmss_noc SLAVE_MNOC_SF_MEM_NOC>;
};
compute_dsp_tbu: compute_dsp_tbu@0x150d5000 {
compute_dsp_tbu: compute_dsp_tbu@150d5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x150d5000 0x1000>,
<0x150c2220 0x8>;
@ -199,7 +199,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
adsp_tbu: adsp_tbu@0x150d9000 {
adsp_tbu: adsp_tbu@150d9000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x150d9000 0x1000>,
<0x150c2228 0x8>;

View file

@ -1,9 +1,9 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
&soc {
kgsl_smmu: kgsl-smmu@0x02ca0000 {
kgsl_smmu: kgsl-smmu@2ca0000 {
compatible = "qcom,qsmmu-v500";
reg = <0x02ca0000 0x10000>,
reg = <0x2ca0000 0x10000>,
<0x2cc2000 0x20>;
reg-names = "base", "tcu-base";
#iommu-cells = <2>;
@ -34,7 +34,7 @@
<GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 688 IRQ_TYPE_LEVEL_HIGH>;
gfx_0_tbu: gfx_0_tbu@0x2cc5000 {
gfx_0_tbu: gfx_0_tbu@2cc5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2cc5000 0x1000>,
<0x2cc2200 0x8>;
@ -42,7 +42,7 @@
qcom,stream-id-range = <0x0 0x400>;
};
gfx_1_tbu: gfx_1_tbu@0x2cc9000 {
gfx_1_tbu: gfx_1_tbu@2cc9000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2cc9000 0x1000>,
<0x2cc2208 0x8>;
@ -51,7 +51,7 @@
};
};
apps_smmu: apps-smmu@0x15000000 {
apps_smmu: apps-smmu@15000000 {
compatible = "qcom,qsmmu-v500";
reg = <0x15000000 0x100000>,
<0x15182000 0x20>;
@ -150,7 +150,7 @@
&config_noc SLAVE_IMEM_CFG>;
qcom,active-only;
anoc_1_tbu: anoc_1_tbu@0x15185000 {
anoc_1_tbu: anoc_1_tbu@15185000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15185000 0x1000>,
<0x15182200 0x8>;
@ -163,7 +163,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
anoc_2_tbu: anoc_2_tbu@0x15189000 {
anoc_2_tbu: anoc_2_tbu@15189000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15189000 0x1000>,
<0x15182208 0x8>;
@ -176,7 +176,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
mnoc_hf_0_tbu: mnoc_hf_0_tbu@0x1518d000 {
mnoc_hf_0_tbu: mnoc_hf_0_tbu@1518d000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x1518d000 0x1000>,
<0x15182210 0x8>;
@ -189,7 +189,7 @@
&mmss_noc SLAVE_MNOC_HF_MEM_NOC>;
};
mnoc_hf_1_tbu: mnoc_hf_1_tbu@0x15191000 {
mnoc_hf_1_tbu: mnoc_hf_1_tbu@15191000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15191000 0x1000>,
<0x15182218 0x8>;
@ -202,7 +202,7 @@
&mmss_noc SLAVE_MNOC_HF_MEM_NOC>;
};
compute_dsp_1_tbu: compute_dsp_1_tbu@0x15195000 {
compute_dsp_1_tbu: compute_dsp_1_tbu@15195000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15195000 0x1000>,
<0x15182220 0x8>;
@ -214,7 +214,7 @@
&compute_noc SLAVE_CDSP_MEM_NOC>;
};
compute_dsp_0_tbu: compute_dsp_0_tbu@0x15199000 {
compute_dsp_0_tbu: compute_dsp_0_tbu@15199000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15199000 0x1000>,
<0x15182228 0x8>;
@ -226,7 +226,7 @@
&compute_noc SLAVE_CDSP_MEM_NOC>;
};
adsp_tbu: adsp_tbu@0x1519d000 {
adsp_tbu: adsp_tbu@1519d000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x1519d000 0x1000>,
<0x15182230 0x8>;
@ -239,7 +239,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
anoc_1_pcie_tbu: anoc_1_pcie_tbu@0x151a1000 {
anoc_1_pcie_tbu: anoc_1_pcie_tbu@151a1000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x151a1000 0x1000>,
<0x15182238 0x8>;
@ -255,7 +255,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
mnoc_sf_0_tbu: mnoc_sf_0_tbu@0x151a5000 {
mnoc_sf_0_tbu: mnoc_sf_0_tbu@151a5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x151a5000 0x1000>,
<0x15182240 0x8>;

View file

@ -1,10 +1,10 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
&soc {
kgsl_smmu: kgsl-smmu@0x02CA0000 {
kgsl_smmu: kgsl-smmu@2ca0000 {
compatible = "qcom,qsmmu-v500";
reg = <0x02CA0000 0x10000>,
<0x2CC2000 0x20>;
reg = <0x2ca0000 0x10000>,
<0x2cc2000 0x20>;
reg-names = "base", "tcu-base";
#iommu-cells = <2>;
qcom,dynamic;
@ -35,24 +35,24 @@
<GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 688 IRQ_TYPE_LEVEL_HIGH>;
gfx_0_tbu: gfx_0_tbu@0x2CC5000 {
gfx_0_tbu: gfx_0_tbu@2cc5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2CC5000 0x1000>,
<0x2CC2200 0x8>;
reg = <0x2cc5000 0x1000>,
<0x2cc2200 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x0 0x400>;
};
gfx_1_tbu: gfx_1_tbu@0x2CC9000 {
gfx_1_tbu: gfx_1_tbu@2cc9000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x2CC9000 0x1000>,
<0x2CC2208 0x8>;
reg = <0x2cc9000 0x1000>,
<0x2cc2208 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x400 0x400>;
};
};
apps_smmu: apps-smmu@0x15000000 {
apps_smmu: apps-smmu@15000000 {
compatible = "qcom,qsmmu-v500";
reg = <0x15000000 0x100000>,
<0x15182000 0x20>;
@ -152,7 +152,7 @@
&config_noc SLAVE_IMEM_CFG>;
qcom,active-only;
anoc_1_tbu: anoc_1_tbu@0x15185000 {
anoc_1_tbu: anoc_1_tbu@15185000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15185000 0x1000>,
<0x15182200 0x8>;
@ -165,7 +165,7 @@
&config_noc SLAVE_IMEM_CFG>;
};
anoc_2_tbu: anoc_2_tbu@0x15189000 {
anoc_2_tbu: anoc_2_tbu@15189000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15189000 0x1000>,
<0x15182208 0x8>;
@ -179,9 +179,9 @@
};
mnoc_hf_0_tbu: mnoc_hf_0_tbu@0x1518D000 {
mnoc_hf_0_tbu: mnoc_hf_0_tbu@1518D000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x1518D000 0x1000>,
reg = <0x1518d000 0x1000>,
<0x15182210 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x800 0x400>;
@ -192,7 +192,7 @@
&mmss_noc SLAVE_MNOC_HF_MEM_NOC>;
};
mnoc_hf_1_tbu: mnoc_hf_1_tbu@0x15191000 {
mnoc_hf_1_tbu: mnoc_hf_1_tbu@15191000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15191000 0x1000>,
<0x15182218 0x8>;
@ -205,7 +205,7 @@
&mmss_noc SLAVE_MNOC_HF_MEM_NOC>;
};
mnoc_sf_0_tbu: mnoc_sf_0_tbu@0x15195000 {
mnoc_sf_0_tbu: mnoc_sf_0_tbu@15195000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15195000 0x1000>,
<0x15182220 0x8>;
@ -218,7 +218,7 @@
&mmss_noc SLAVE_MNOC_SF_MEM_NOC>;
};
compute_dsp_0_tbu: compute_dsp_0_tbu@0x15199000 {
compute_dsp_0_tbu: compute_dsp_0_tbu@15199000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x15199000 0x1000>,
<0x15182228 0x8>;
@ -229,9 +229,9 @@
&compute_noc SLAVE_CDSP_MEM_NOC>;
};
adsp_tbu: adsp_tbu@0x1519D000 {
adsp_tbu: adsp_tbu@1519D000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x1519D000 0x1000>,
reg = <0x1519d000 0x1000>,
<0x15182230 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x1800 0x400>;
@ -242,9 +242,9 @@
&config_noc SLAVE_IMEM_CFG>;
};
anoc_1_pcie_tbu: anoc_1_pcie_tbu@0x151A1000 {
anoc_1_pcie_tbu: anoc_1_pcie_tbu@151A1000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x151A1000 0x1000>,
reg = <0x151a1000 0x1000>,
<0x15182238 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x1c00 0x400>;
@ -258,9 +258,9 @@
&config_noc SLAVE_IMEM_CFG>;
};
compute_dsp_1_tbu: compute_dsp_1_tbu@0x151A5000 {
compute_dsp_1_tbu: compute_dsp_1_tbu@151A5000 {
compatible = "qcom,qsmmuv500-tbu";
reg = <0x151A5000 0x1000>,
reg = <0x151a5000 0x1000>,
<0x15182240 0x8>;
reg-names = "base", "status-reg";
qcom,stream-id-range = <0x2000 0x400>;

View file

@ -92,7 +92,7 @@
};
};
ethqos_hw: qcom,ethernet@00020000 {
ethqos_hw: qcom,ethernet@20000 {
compatible = "qcom,stmmac-ethqos";
qcom,arm-smmu;
emac-core-version = <0x20030001>;

View file

@ -203,7 +203,7 @@
};
&reserved_memory {
uefi_log: uefi_log@0x9241C000 {
uefi_log: uefi_log@9241C000 {
reg = <0x0 0x9241C000 0x0 0x10000>;
label = "uefi_log";
};

View file

@ -43,10 +43,10 @@
ranges;
};
hsi2s: qcom,hsi2s {
hsi2s: qcom,hsi2s@1b40000 {
compatible = "qcom,sa6155-hsi2s", "qcom,hsi2s";
number-of-interfaces = <2>;
reg = <0x1B40000 0x28000>;
reg = <0x1b40000 0x28000>;
reg-names = "lpa_if";
interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_SDR_CORE_CLK>,

View file

@ -106,7 +106,7 @@
status = "ok"
};
qcom,spss@1880000 {
qcom,spss@188101c {
status = "ok"
};

View file

@ -120,7 +120,7 @@
};
};
ethqos_hw: qcom,ethernet@00020000 {
ethqos_hw: qcom,ethernet@20000 {
compatible = "qcom,stmmac-ethqos";
qcom,arm-smmu;
reg = <0x20000 0x10000>,
@ -204,11 +204,11 @@
mbox-names = "aop";
};
hsi2s: qcom,hsi2s {
hsi2s: qcom,hsi2s@172c0000 {
compatible = "qcom,sa8155-hsi2s", "qcom,hsi2s";
number-of-interfaces = <3>;
reg = <0x172C0000 0x28000>,
<0x17080000 0xE000>;
reg = <0x172c0000 0x28000>,
<0x17080000 0xe000>;
reg-names = "lpa_if", "lpass_tcsr";
interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
number-of-rate-detectors = <2>;
@ -377,7 +377,7 @@
*/
/delete-node/ pil_wlan_fw_mem;
uefi_log: uefi_log@0x9241C000 {
uefi_log: uefi_log@9241C000 {
reg = <0x0 0x9241C000 0x0 0x10000>;
label = "uefi_log";
};

View file

@ -378,7 +378,7 @@
};
/* Debug UART Instance for CDP/MTP platform */
qupv3_se12_2uart: qcom,qup_uart@0xa90000 {
qupv3_se12_2uart: qcom,qup_uart@a90000 {
compatible = "qcom,msm-geni-console";
reg = <0xa90000 0x4000>;
reg-names = "se_phys";
@ -395,7 +395,7 @@
};
/* 4-wire UART */
qupv3_se13_4uart: qcom,qup_uart@0xc8c000 {
qupv3_se13_4uart: qcom,qup_uart@c8c000 {
compatible = "qcom,msm-geni-serial-hs";
reg = <0xc8c000 0x4000>;
reg-names = "se_phys";
@ -417,7 +417,7 @@
status = "disabled";
};
qupv3_se16_2uart: qcom,qup_uart@0xa94000 {
qupv3_se16_2uart: qcom,qup_uart@a94000 {
compatible = "qcom,msm-geni-serial-hs";
reg = <0xa94000 0x4000>;
reg-names = "se_phys";
@ -646,7 +646,7 @@
status = "disabled";
};
qupv3_se14_i2c: i2c@0xc90000 {
qupv3_se14_i2c: i2c@c90000 {
compatible = "qcom,i2c-geni";
reg = <0xc90000 0x4000>;
interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
@ -663,7 +663,7 @@
status = "disabled";
};
qupv3_se15_i2c: i2c@0xc94000 {
qupv3_se15_i2c: i2c@c94000 {
compatible = "qcom,i2c-geni";
reg = <0xc94000 0x4000>;
interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
@ -680,7 +680,7 @@
status = "disabled";
};
qupv3_se16_i2c: i2c@0xa94000 {
qupv3_se16_i2c: i2c@a94000 {
compatible = "qcom,i2c-geni";
reg = <0xa94000 0x4000>;
interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
@ -697,7 +697,7 @@
status = "disabled";
};
qupv3_se17_i2c: i2c@0xc80000 {
qupv3_se17_i2c: i2c@c80000 {
compatible = "qcom,i2c-geni";
reg = <0xc80000 0x4000>;
interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
@ -714,7 +714,7 @@
status = "disabled";
};
qupv3_se18_i2c: i2c@0xc84000 {
qupv3_se18_i2c: i2c@c84000 {
compatible = "qcom,i2c-geni";
reg = <0xc84000 0x4000>;
interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
@ -731,7 +731,7 @@
status = "disabled";
};
qupv3_se19_i2c: i2c@0xc88000 {
qupv3_se19_i2c: i2c@c88000 {
compatible = "qcom,i2c-geni";
reg = <0xc88000 0x4000>;
interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;

View file

@ -62,7 +62,7 @@ status = "ok";
status = "ok"
};
qcom,spss@1880000 {
qcom,spss@188101c {
status = "ok"
};
@ -128,7 +128,7 @@ status = "ok";
};
};
ethqos_hw: qcom,ethernet@00020000 {
ethqos_hw: qcom,ethernet@20000 {
compatible = "qcom,stmmac-ethqos";
qcom,arm-smmu;
emac-core-version = <0x20010001>;

View file

@ -30,11 +30,11 @@
ranges;
};
hsi2s: qcom,hsi2s {
hsi2s: qcom,hsi2s@172c0000 {
compatible = "qcom,sa8195-hsi2s", "qcom,hsi2s";
number-of-interfaces = <3>;
reg = <0x172C0000 0x28000>,
<0x17080000 0xE000>;
reg = <0x172c0000 0x28000>,
<0x17080000 0xe000>;
reg-names = "lpa_if", "lpass_tcsr";
interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
number-of-rate-detectors = <2>;

View file

@ -321,52 +321,52 @@
reg = <0x0 0x8bc00000 0x0 0x180000>;
};
pil_npu_mem: pil_npu_region@0x8bd80000 {
pil_npu_mem: pil_npu_region@8bd80000 {
no-map;
reg = <0x0 0x8bd80000 0x0 0x80000>;
};
pil_adsp_mem: pil_adsp_region@0x8be00000 {
pil_adsp_mem: pil_adsp_region@8be00000 {
no-map;
reg = <0x0 0x8be00000 0x0 0x1a00000>;
};
pil_modem_mem: modem_region@0x8d800000 {
pil_modem_mem: modem_region@8d800000 {
no-map;
reg = <0x0 0x8d800000 0x0 0x9600000>;
};
pil_video_mem: pil_video_region@0x96e00000 {
pil_video_mem: pil_video_region@96e00000 {
no-map;
reg = <0x0 0x96e00000 0x0 0x500000>;
};
pil_slpi_mem: pil_slpi_region@0x97300000 {
pil_slpi_mem: pil_slpi_region@97300000 {
no-map;
reg = <0x0 0x97300000 0x0 0x1400000>;
};
pil_ipa_fw_mem: pil_ipa_fw_region@0x98700000 {
pil_ipa_fw_mem: pil_ipa_fw_region@98700000 {
no-map;
reg = <0x0 0x98700000 0x0 0x10000>;
};
pil_ipa_gsi_mem: pil_ipa_gsi_region@0x98710000 {
pil_ipa_gsi_mem: pil_ipa_gsi_region@98710000 {
no-map;
reg = <0x0 0x98710000 0x0 0x5000>;
};
pil_gpu_mem: pil_gpu_region@0x98715000 {
pil_gpu_mem: pil_gpu_region@98715000 {
no-map;
reg = <0x0 0x98715000 0x0 0x2000>;
};
pil_spss_mem: pil_spss_region@0x98800000 {
pil_spss_mem: pil_spss_region@98800000 {
no-map;
reg = <0x0 0x98800000 0x0 0x100000>;
};
pil_cdsp_mem: cdsp_regions@0x98900000 {
pil_cdsp_mem: cdsp_regions@98900000 {
no-map;
reg = <0x0 0x98900000 0x0 0x1400000>;
};
@ -380,12 +380,12 @@
};
cont_splash_memory: cont_splash_region@0x9c000000 {
cont_splash_memory: cont_splash_region@9c000000 {
reg = <0x0 0x9c000000 0x0 0x02400000>;
label = "cont_splash_region";
};
disp_rdump_memory: disp_rdump_region@0x9c000000 {
disp_rdump_memory: disp_rdump_region@9c000000 {
reg = <0x0 0x9c000000 0x0 0x02400000>;
label = "disp_rdump_region";
};
@ -445,7 +445,7 @@
size = <0 0x2400000>;
};
uefi_log: uefi_log@0x8bc00000 {
uefi_log: uefi_log@8bc00000 {
reg = <0x0 0x8bc00000 0x0 0x10000>;
label = "uefi_log";
};
@ -543,7 +543,7 @@
clock-frequency = <19200000>;
};
timer@0x17c20000 {
timer@17c20000 {
#address-cells = <1>;
#size-cells = <1>;
ranges;
@ -551,7 +551,7 @@
reg = <0x17c20000 0x1000>;
clock-frequency = <19200000>;
frame@0x17c21000 {
frame@17c21000 {
frame-number = <0>;
interrupts = <0 7 0x4>,
<0 6 0x4>;
@ -2334,7 +2334,7 @@
memory-region = <&pil_npu_mem>;
};
qcom,spss@1880000 {
qcom,spss@188101c {
compatible = "qcom,pil-tz-generic";
reg = <0x188101c 0x4>,
<0x1881024 0x4>,

View file

@ -604,10 +604,10 @@
};
};
kgsl_msm_iommu: qcom,kgsl-iommu@0x050a0000 {
kgsl_msm_iommu: qcom,kgsl-iommu@50a0000 {
compatible = "qcom,kgsl-smmu-v2";
reg = <0x050a0000 0x10000>;
reg = <0x50a0000 0x10000>;
gfx3d_user: gfx3d_user {
compatible = "qcom,smmu-kgsl-cb";

View file

@ -1,8 +1,8 @@
&soc {
slpi_tlmm: slpi_pinctrl@62B40000 {
slpi_tlmm: slpi_pinctrl@62b40000 {
compatible = "qcom,slpi-pinctrl";
reg = <0x62B40000 0x20000>;
reg = <0x62b40000 0x20000>;
qcom,num-pins = <32>;
clock-names = "ssc-clk";
clocks = <&scc SCC_QUPV3_S_HCLK_CLK>;

View file

@ -352,17 +352,17 @@
reg = <0x0 0x95900000 0x0 0x1e00000>;
};
pil_ipa_fw_mem: ips_fw_region@0x97700000 {
pil_ipa_fw_mem: ips_fw_region@97700000 {
no-map;
reg = <0x0 0x97700000 0x0 0x10000>;
};
pil_ipa_gsi_mem: ipa_gsi_region@0x97710000 {
pil_ipa_gsi_mem: ipa_gsi_region@97710000 {
no-map;
reg = <0x0 0x97710000 0x0 0x5000>;
};
pil_gpu_mem: gpu_region@0x97715000 {
pil_gpu_mem: gpu_region@97715000 {
no-map;
reg = <0x0 0x97715000 0x0 0x2000>;
};
@ -375,7 +375,7 @@
size = <0x0 0x1400000>;
};
cdsp_sec_mem: cdsp_sec_regions@0x9f800000 {
cdsp_sec_mem: cdsp_sec_regions@9f800000 {
no-map;
reg = <0x0 0x9f800000 0x0 0x1e00000>;
};
@ -497,7 +497,7 @@
clock-frequency = <19200000>;
};
timer@0x17c20000 {
timer@17c20000 {
#address-cells = <1>;
#size-cells = <1>;
ranges;
@ -505,7 +505,7 @@
reg = <0x17c20000 0x1000>;
clock-frequency = <19200000>;
frame@0x17c21000 {
frame@17c21000 {
frame-number = <0>;
interrupts = <0 8 0x4>,
<0 6 0x4>;
@ -932,7 +932,7 @@
&mc_virt SLAVE_EBI1>;
};
qcom,mpm2-sleep-counter@0xc221000 {
qcom,mpm2-sleep-counter@c221000 {
compatible = "qcom,mpm2-sleep-counter";
reg = <0xc221000 0x1000>;
clock-frequency = <32768>;

View file

@ -9,7 +9,7 @@
memory-region = <&pil_gpu_mem>;
};
msm_gpu: qcom,kgsl-3d0@2C00000 {
msm_gpu: qcom,kgsl-3d0@2c00000 {
label = "kgsl-3d0";
compatible = "qcom,kgsl-3d0", "qcom,kgsl-3d";
status = "ok"
@ -219,10 +219,10 @@
};
kgsl_msm_iommu: qcom,kgsl-iommu@0x02CA0000 {
kgsl_msm_iommu: qcom,kgsl-iommu@2ca0000 {
compatible = "qcom,kgsl-smmu-v2";
reg = <0x02CA0000 0x10000>;
reg = <0x2ca0000 0x10000>;
gfx3d_user: gfx3d_user {
compatible = "qcom,smmu-kgsl-cb";
@ -239,7 +239,7 @@
};
};
gmu: qcom,gmu@0x2C6A000 {
gmu: qcom,gmu@2c6a000 {
compatible = "qcom,gpu-gmu";
reg = <0x2c6a000 0x30000>,

View file

@ -1,5 +1,5 @@
&soc {
tlmm: pinctrl@03000000 {
tlmm: pinctrl@3100000 {
compatible = "qcom,sm8150-pinctrl";
reg = <0x03100000 0x300000>,
<0x03500000 0x300000>,

View file

@ -359,7 +359,7 @@
};
/* Debug UART Instance for CDP/MTP platform */
qupv3_se12_2uart: qcom,qup_uart@0xa90000 {
qupv3_se12_2uart: qcom,qup_uart@a90000 {
compatible = "qcom,msm-geni-console";
reg = <0xa90000 0x4000>;
reg-names = "se_phys";
@ -376,7 +376,7 @@
};
/* 4-wire UART */
qupv3_se13_4uart: qcom,qup_uart@0xc8c000 {
qupv3_se13_4uart: qcom,qup_uart@c8c000 {
compatible = "qcom,msm-geni-serial-hs";
reg = <0xc8c000 0x4000>;
reg-names = "se_phys";
@ -611,7 +611,7 @@
status = "disabled";
};
qupv3_se14_i2c: i2c@0xc90000 {
qupv3_se14_i2c: i2c@c90000 {
compatible = "qcom,i2c-geni";
reg = <0xc90000 0x4000>;
interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
@ -628,7 +628,7 @@
status = "disabled";
};
qupv3_se15_i2c: i2c@0xc94000 {
qupv3_se15_i2c: i2c@c94000 {
compatible = "qcom,i2c-geni";
reg = <0xc94000 0x4000>;
interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
@ -645,7 +645,7 @@
status = "disabled";
};
qupv3_se16_i2c: i2c@0xa94000 {
qupv3_se16_i2c: i2c@a94000 {
compatible = "qcom,i2c-geni";
reg = <0xa94000 0x4000>;
interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
@ -662,7 +662,7 @@
status = "disabled";
};
qupv3_se17_i2c: i2c@0xc80000 {
qupv3_se17_i2c: i2c@c80000 {
compatible = "qcom,i2c-geni";
reg = <0xc80000 0x4000>;
interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
@ -679,7 +679,7 @@
status = "disabled";
};
qupv3_se18_i2c: i2c@0xc84000 {
qupv3_se18_i2c: i2c@c84000 {
compatible = "qcom,i2c-geni";
reg = <0xc84000 0x4000>;
interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
@ -696,7 +696,7 @@
status = "disabled";
};
qupv3_se19_i2c: i2c@0xc88000 {
qupv3_se19_i2c: i2c@c88000 {
compatible = "qcom,i2c-geni";
reg = <0xc88000 0x4000>;
interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;

View file

@ -1,7 +1,7 @@
&soc {
slpi_tlmm: slpi_pinctrl@02B40000 {
slpi_tlmm: slpi_pinctrl@2b40000 {
compatible = "qcom,slpi-pinctrl";
reg = <0x2B40000 0x20000>;
reg = <0x2b40000 0x20000>;
clock-names = "ssc-clk";
clocks = <&scc SCC_QUPV3_S_HCLK_CLK>;
qcom,num-pins = <14>;

View file

@ -525,7 +525,7 @@
clock-frequency = <19200000>;
};
timer@0x17c20000 {
timer@17c20000 {
#address-cells = <1>;
#size-cells = <1>;
ranges;
@ -533,7 +533,7 @@
reg = <0x17c20000 0x1000>;
clock-frequency = <19200000>;
frame@0x17c21000 {
frame@17c21000 {
frame-number = <0>;
interrupts = <0 8 0x4>,
<0 6 0x4>;
@ -1105,7 +1105,7 @@
status = "disabled";
};
cpucc: syscon@182a0018 {
cpucc: syscon@182a0000 {
compatible = "syscon";
reg = <0x182a0000 0x4>;
};
@ -1240,7 +1240,7 @@
thermal_zones: thermal-zones {
};
osm_l3: interconnect@0x18321000 {
osm_l3: interconnect@18321000 {
reg = <0x18321000 0x1400>;
compatible = "qcom,sm8150-osm-l3";
clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>;
@ -2228,7 +2228,7 @@
mbox-names = "slpi-pil";
};
qcom,spss@1880000 {
qcom,spss@188101c {
compatible = "qcom,pil-tz-generic";
reg = <0x188101c 0x4>,
<0x1881024 0x4>,