mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 23:24:22 -04:00
Merge "ARM: dts: msm: Add simple-bus compat string in camera for all archs" into camera-kernel.lnx.4.0
This commit is contained in:
commit
25ba017fcb
4 changed files with 11 additions and 11 deletions
|
|
@ -98,7 +98,7 @@
|
|||
|
||||
cam_cci0: qcom,cci0 {
|
||||
cell-index = <0>;
|
||||
compatible = "qcom,cci";
|
||||
compatible = "qcom,cci", "simple-bus";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x05C1B000 0x1000>;
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
};
|
||||
|
||||
qcom,cam_smmu {
|
||||
compatible = "qcom,msm-cam-smmu";
|
||||
compatible = "qcom,msm-cam-smmu", "simple-bus";
|
||||
status = "ok"
|
||||
|
||||
msm_cam_smmu_tfe {
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@
|
|||
|
||||
cam_cci0: qcom,cci@ac4f000 {
|
||||
cell-index = <0>;
|
||||
compatible = "qcom,cci";
|
||||
compatible = "qcom,cci", "simple-bus";
|
||||
reg = <0xac4f000 0x1000>;
|
||||
reg-names = "cci";
|
||||
reg-cam-base = <0x4f000>;
|
||||
|
|
@ -275,7 +275,7 @@
|
|||
|
||||
cam_cci1: qcom,cci@ac50000 {
|
||||
cell-index = <1>;
|
||||
compatible = "qcom,cci";
|
||||
compatible = "qcom,cci", "simple-bus";
|
||||
reg = <0xac50000 0x1000>;
|
||||
reg-names = "cci";
|
||||
reg-cam-base = <0x50000>;
|
||||
|
|
@ -367,7 +367,7 @@
|
|||
};
|
||||
|
||||
qcom,cam_smmu {
|
||||
compatible = "qcom,msm-cam-smmu";
|
||||
compatible = "qcom,msm-cam-smmu", "simple-bus";
|
||||
status = "ok"
|
||||
|
||||
msm_cam_smmu_ife {
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@
|
|||
|
||||
cam_cci0: qcom,cci0 {
|
||||
cell-index = <0>;
|
||||
compatible = "qcom,cci";
|
||||
compatible = "qcom,cci", "simple-bus";
|
||||
reg = <0xac4f000 0x1000>;
|
||||
reg-names = "cci";
|
||||
reg-cam-base = <0x4f000>;
|
||||
|
|
@ -275,7 +275,7 @@
|
|||
|
||||
cam_cci1: qcom,cci1 {
|
||||
cell-index = <1>;
|
||||
compatible = "qcom,cci";
|
||||
compatible = "qcom,cci", "simple-bus";
|
||||
reg = <0xac50000 0x1000>;
|
||||
reg-names = "cci";
|
||||
reg-cam-base = <0x50000>;
|
||||
|
|
@ -367,7 +367,7 @@
|
|||
};
|
||||
|
||||
qcom,cam_smmu {
|
||||
compatible = "qcom,msm-cam-smmu";
|
||||
compatible = "qcom,msm-cam-smmu", "simple-bus";
|
||||
status = "ok"
|
||||
|
||||
msm_cam_smmu_ife {
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
|
||||
cam_cci0: qcom,cci0 {
|
||||
cell-index = <0>;
|
||||
compatible = "qcom,cci";
|
||||
compatible = "qcom,cci", "simple-bus";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
reg = <0xac4a000 0x1000>;
|
||||
|
|
@ -224,7 +224,7 @@
|
|||
|
||||
cam_cci1: qcom,cci1 {
|
||||
cell-index = <1>;
|
||||
compatible = "qcom,cci";
|
||||
compatible = "qcom,cci", "simple-bus";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
reg = <0xac4b000 0x1000>;
|
||||
|
|
@ -314,7 +314,7 @@
|
|||
};
|
||||
|
||||
qcom,cam_smmu {
|
||||
compatible = "qcom,msm-cam-smmu";
|
||||
compatible = "qcom,msm-cam-smmu", "simple-bus";
|
||||
status = "ok"
|
||||
|
||||
msm_cam_smmu_ife {
|
||||
|
|
|
|||
Loading…
Reference in a new issue