Merge "ARM: dts: msm: Enable cam_ife BCM voters for Sun"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
21e01c9487
@@ -905,13 +905,16 @@
|
|||||||
compatible = "qcom,sun-mc_virt";
|
compatible = "qcom,sun-mc_virt";
|
||||||
#interconnect-cells = <1>;
|
#interconnect-cells = <1>;
|
||||||
qcom,bcm-voter-names = "hlos",
|
qcom,bcm-voter-names = "hlos",
|
||||||
"pcie_crm_hw_0";
|
|
||||||
qcom,bcm-voters = <&apps_bcm_voter>,
|
|
||||||
<&pcie_crm_hw_0_bcm_voter>;
|
|
||||||
qcom,disabled-voters = "disp",
|
|
||||||
"cam_ife_0",
|
"cam_ife_0",
|
||||||
"cam_ife_1",
|
"cam_ife_1",
|
||||||
"cam_ife_2";
|
"cam_ife_2",
|
||||||
|
"pcie_crm_hw_0";
|
||||||
|
qcom,bcm-voters = <&apps_bcm_voter>,
|
||||||
|
<&cam_bcm_voter0>,
|
||||||
|
<&cam_bcm_voter1>,
|
||||||
|
<&cam_bcm_voter2>,
|
||||||
|
<&pcie_crm_hw_0_bcm_voter>;
|
||||||
|
qcom,disabled-voters = "disp";
|
||||||
};
|
};
|
||||||
|
|
||||||
config_noc: interconnect@1600000 {
|
config_noc: interconnect@1600000 {
|
||||||
@@ -976,9 +979,15 @@
|
|||||||
compatible = "qcom,sun-mmss_noc";
|
compatible = "qcom,sun-mmss_noc";
|
||||||
reg = <0x1780000 0x5b800>;
|
reg = <0x1780000 0x5b800>;
|
||||||
#interconnect-cells = <1>;
|
#interconnect-cells = <1>;
|
||||||
qcom,bcm-voter-names = "hlos";
|
qcom,bcm-voter-names = "hlos",
|
||||||
qcom,bcm-voters = <&apps_bcm_voter>;
|
"cam_ife_0",
|
||||||
qcom,disabled-voters = "disp", "cam_ife_0", "cam_ife_1", "cam_ife_2";
|
"cam_ife_1",
|
||||||
|
"cam_ife_2";
|
||||||
|
qcom,bcm-voters = <&apps_bcm_voter>,
|
||||||
|
<&cam_bcm_voter0>,
|
||||||
|
<&cam_bcm_voter1>,
|
||||||
|
<&cam_bcm_voter2>;
|
||||||
|
qcom,disabled-voters = "disp";
|
||||||
qcom,skip-qos;
|
qcom,skip-qos;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -987,13 +996,16 @@
|
|||||||
reg = <0x24100000 0x14b080>;
|
reg = <0x24100000 0x14b080>;
|
||||||
#interconnect-cells = <1>;
|
#interconnect-cells = <1>;
|
||||||
qcom,bcm-voter-names = "hlos",
|
qcom,bcm-voter-names = "hlos",
|
||||||
"pcie_crm_hw_0";
|
|
||||||
qcom,bcm-voters = <&apps_bcm_voter>,
|
|
||||||
<&pcie_crm_hw_0_bcm_voter>;
|
|
||||||
qcom,disabled-voters = "disp",
|
|
||||||
"cam_ife_0",
|
"cam_ife_0",
|
||||||
"cam_ife_1",
|
"cam_ife_1",
|
||||||
"cam_ife_2";
|
"cam_ife_2",
|
||||||
|
"pcie_crm_hw_0";
|
||||||
|
qcom,bcm-voters = <&apps_bcm_voter>,
|
||||||
|
<&cam_bcm_voter0>,
|
||||||
|
<&cam_bcm_voter1>,
|
||||||
|
<&cam_bcm_voter2>,
|
||||||
|
<&pcie_crm_hw_0_bcm_voter>;
|
||||||
|
qcom,disabled-voters = "disp";
|
||||||
qcom,skip-qos;
|
qcom,skip-qos;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1104,6 +1116,11 @@
|
|||||||
<CONTROL_TCS 0>,
|
<CONTROL_TCS 0>,
|
||||||
<FAST_PATH_TCS 0>;
|
<FAST_PATH_TCS 0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
cam_bcm_voter0: bcm_voter {
|
||||||
|
compatible = "qcom,bcm-voter";
|
||||||
|
qcom,no-amc;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
cam_rsc_drv1: drv@1 {
|
cam_rsc_drv1: drv@1 {
|
||||||
@@ -1125,6 +1142,11 @@
|
|||||||
<CONTROL_TCS 0>,
|
<CONTROL_TCS 0>,
|
||||||
<FAST_PATH_TCS 0>;
|
<FAST_PATH_TCS 0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
cam_bcm_voter1: bcm_voter {
|
||||||
|
compatible = "qcom,bcm-voter";
|
||||||
|
qcom,no-amc;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
cam_rsc_drv2: drv@2 {
|
cam_rsc_drv2: drv@2 {
|
||||||
@@ -1146,6 +1168,11 @@
|
|||||||
<CONTROL_TCS 0>,
|
<CONTROL_TCS 0>,
|
||||||
<FAST_PATH_TCS 0>;
|
<FAST_PATH_TCS 0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
cam_bcm_voter2: bcm_voter {
|
||||||
|
compatible = "qcom,bcm-voter";
|
||||||
|
qcom,no-amc;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user