A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ARM: dts: msm: Fixes label_is_string warning" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-08-31 13:22:12 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2b63cc782b
8 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bengal-camera.dtsi
View file

@ -208,7 +208,7 @@
iommus = <&apps_smmu 0x400 0x000>;
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "tfe";
cam-smmu-label = "tfe";
tfe_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -228,7 +228,7 @@
qcom,iommu-faults = "non-fatal";
multiple-client-devices;
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "ope", "ope-cdm";
cam-smmu-label = "ope", "ope-cdm";
ope_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -244,7 +244,7 @@
msm_cam_smmu_cpas_cdm {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x800 0x000>;
label = "cpas-cdm";
cam-smmu-label = "cpas-cdm";
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
cpas_cdm_iova_mem_map: iova-mem-map {
@ -261,7 +261,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};

8
holi-camera.dtsi
View file

@ -346,7 +346,7 @@
iommus = <&apps_smmu 0x800 0x000>;
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "tfe";
cam-smmu-label = "tfe";
tfe_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -366,7 +366,7 @@
qcom,iommu-faults = "non-fatal";
multiple-client-devices;
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "ope", "ope-cdm";
cam-smmu-label = "ope", "ope-cdm0";
ope_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -382,7 +382,7 @@
msm_cam_smmu_cpas_cdm {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0xc00 0x000>;
label = "cpas-cdm";
cam-smmu-label = "cpas-cdm0";
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
cpas_cdm_iova_mem_map: iova-mem-map {
@ -399,7 +399,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};

12
kona-camera.dtsi
View file

@ -377,7 +377,7 @@
<&apps_smmu 0xC00 0x400>,
<&apps_smmu 0xC40 0x400>;
qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
label = "ife", "ife-cdm";
cam-smmu-label = "ife", "ife-cdm";
multiple-client-devices;
ife_iova_mem_map: iova-mem-map {
/* IO region is approximately 4.0 GB */
@ -397,7 +397,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x2040 0x400>,
<&apps_smmu 0x2440 0x400>;
label = "jpeg";
cam-smmu-label = "jpeg";
qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
jpeg_iova_mem_map: iova-mem-map {
/* IO region is approximately 4.0 GB */
@ -435,7 +435,7 @@
<&apps_smmu 0x2021 0x400>,
<&apps_smmu 0x2420 0x400>,
<&apps_smmu 0x2421 0x400>;
label = "icp";
cam-smmu-label = "icp";
qcom,iommu-dma-addr-pool = <0x10c00000 0xee300000>;
iova-region-discard = <0xdff00000 0x300000>;
icp_iova_mem_map: iova-mem-map {
@ -492,7 +492,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x20C0 0x400>,
<&apps_smmu 0x24C0 0x400>;
label = "cpas-cdm";
cam-smmu-label = "cpas-cdm";
qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
cpas_cdm_iova_mem_map: iova-mem-map {
iova-mem-region-io {
@ -510,7 +510,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};
@ -519,7 +519,7 @@
iommus = <&apps_smmu 0x2080 0x400>,
<&apps_smmu 0x2480 0x400>;
qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
label = "fd";
cam-smmu-label = "fd";
fd_iova_mem_map: iova-mem-map {
iova-mem-region-io {
/* IO region is approximately 4.0 GB */

12
lagoon-camera.dtsi
View file

@ -341,7 +341,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0xD40 0x20>,
<&apps_smmu 0xD60 0x20>;
label = "lrme";
cam-smmu-label = "lrme";
lrme_iova_mem_map: iova-mem-map {
iova-mem-region-shared {
/* Shared region is 100MB long */
@ -368,7 +368,7 @@
<&apps_smmu 0x840 0x0>,
<&apps_smmu 0x860 0xc0>,
<&apps_smmu 0x880 0x0>;
label = "ife";
cam-smmu-label = "ife";
ife_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -385,7 +385,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0xD00 0x20>,
<&apps_smmu 0xD20 0x20>;
label = "jpeg";
cam-smmu-label = "jpeg";
jpeg_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -409,7 +409,7 @@
iommus = <&apps_smmu 0xCA2 0x0>,
<&apps_smmu 0xCC0 0x20>,
<&apps_smmu 0xCE0 0x20>;
label = "icp";
cam-smmu-label = "icp";
icp_iova_mem_map: iova-mem-map {
iova-mem-region-firmware {
/* Firmware region is 5MB */
@ -463,7 +463,7 @@
msm_cam_smmu_cpas_cdm {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0xC80 0x0>;
label = "cpas-cdm0";
cam-smmu-label = "cpas-cdm0";
cpas_cdm_iova_mem_map: iova-mem-map {
iova-mem-region-io {
/* IO region is approximately 3.4 GB */
@ -478,7 +478,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};

10
lahaina-camera.dtsi
View file

@ -396,7 +396,7 @@
<&apps_smmu 0xC40 0x440>;
qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
dma-coherent-hint-cached;
label = "ife", "ife-cdm";
cam-smmu-label = "ife", "ife-cdm";
multiple-client-devices;
ife_iova_mem_map: iova-mem-map {
/* IO region is approximately 4.0 GB */
@ -416,7 +416,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x2040 0x400>,
<&apps_smmu 0x2440 0x400>;
label = "jpeg";
cam-smmu-label = "jpeg";
qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
dma-coherent-hint-cached;
jpeg_iova_mem_map: iova-mem-map {
@ -455,7 +455,7 @@
<&apps_smmu 0x2021 0xc60>,
<&apps_smmu 0x2420 0x400>,
<&apps_smmu 0x2421 0xc60>;
label = "icp";
cam-smmu-label = "icp";
qcom,iommu-dma-addr-pool = <0x10c00000 0xee300000>;
iova-region-discard = <0xdff00000 0x300000>;
dma-coherent-hint-cached;
@ -513,7 +513,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x20C0 0x400>,
<&apps_smmu 0x24C0 0x400>;
label = "cpas-cdm";
cam-smmu-label = "cpas-cdm";
qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>;
dma-coherent-hint-cached;
cpas_cdm_iova_mem_map: iova-mem-map {
@ -532,7 +532,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};
};

14
lito-camera.dtsi
View file

@ -335,7 +335,7 @@
<&apps_smmu 0xCC0 0x5E0>;
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "ife";
cam-smmu-label = "ife";
ife_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -352,7 +352,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x1280 0x20>,
<&apps_smmu 0x12A0 0x20>;
label = "jpeg";
cam-smmu-label = "jpeg";
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
jpeg_iova_mem_map: iova-mem-map {
@ -384,7 +384,7 @@
<&apps_smmu 0x1200 0x0>,
<&apps_smmu 0x11E0 0x0>,
<&apps_smmu 0x1260 0x0>;
label = "icp";
cam-smmu-label = "icp";
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x10c00000 0xee300000>;
iova-region-discard = <0xdff00000 0x300000>;
@ -441,7 +441,7 @@
msm_cam_smmu_cpas_cdm {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x1000 0x0>;
label = "cpas-cdm0";
cam-smmu-label = "cpas-cdm0";
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
cpas_cdm_iova_mem_map: iova-mem-map {
@ -458,7 +458,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};
@ -468,7 +468,7 @@
<&apps_smmu 0x12E0 0x20>;
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "fd";
cam-smmu-label = "fd";
fd_iova_mem_map: iova-mem-map {
iova-mem-region-io {
/* IO region is approximately 3.4 GB */
@ -485,7 +485,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x11C0 0x0>,
<&apps_smmu 0x1240 0x0>;
label = "lrme";
cam-smmu-label = "lrme";
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
lrme_iova_mem_map: iova-mem-map {

8
scuba-camera.dtsi
View file

@ -170,7 +170,7 @@
iommus = <&apps_smmu 0x400 0x000>;
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "tfe";
cam-smmu-label = "tfe";
tfe_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -190,7 +190,7 @@
qcom,iommu-faults = "non-fatal";
multiple-client-devices;
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "ope", "ope-cdm0";
cam-smmu-label = "ope", "ope-cdm0";
ope_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
iova-mem-region-io {
@ -206,7 +206,7 @@
msm_cam_smmu_cpas_cdm {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x800 0x000>;
label = "cpas-cdm0";
cam-smmu-label = "cpas-cdm0";
qcom,iommu-faults = "non-fatal";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
cpas_cdm_iova_mem_map: iova-mem-map {
@ -223,7 +223,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};

10
shima-camera.dtsi
View file

@ -412,7 +412,7 @@
<&apps_smmu 0x1400 0x440>,
<&apps_smmu 0x1440 0x440>;
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
label = "ife", "ife-cdm";
cam-smmu-label = "ife", "ife-cdm";
multiple-client-devices;
ife_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
@ -430,7 +430,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x2840 0x400>,
<&apps_smmu 0x2C40 0x400>;
label = "jpeg";
cam-smmu-label = "jpeg";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
jpeg_iova_mem_map: iova-mem-map {
/* IO region is approximately 3.4 GB */
@ -460,9 +460,9 @@
<&apps_smmu 0x2C60 0x400>,
<&apps_smmu 0x2820 0x400>,
<&apps_smmu 0x2C20 0x400>;
label = "icp";
qcom,iommu-dma-addr-pool = <0x10c00000 0xee300000>;
iova-region-discard = <0xdff00000 0x300000>;
cam-smmu-label = "icp";
icp_iova_mem_map: iova-mem-map {
iova-mem-region-firmware {
/* Firmware region is 5MB */
@ -517,7 +517,7 @@
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_smmu 0x28C0 0x400>,
<&apps_smmu 0x2CC0 0x400>;
label = "cpas-cdm";
cam-smmu-label = "cpas-cdm";
qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
cpas_cdm_iova_mem_map: iova-mem-map {
iova-mem-region-io {
@ -533,7 +533,7 @@
msm_cam_smmu_secure {
compatible = "qcom,msm-cam-smmu-cb";
label = "cam-secure";
cam-smmu-label = "cam-secure";
qcom,secure-cb;
};
};