Merge "ARM: dts: msm: Add pcie, display and camera voter devices for TUNA"

This commit is contained in:
QCTECMDR Service
2024-11-29 00:46:00 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -770,6 +770,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 {
@@ -791,6 +796,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 {
@@ -812,6 +822,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;
};
}; };
}; };
@@ -2015,18 +2030,99 @@
compatible = "smmu-proxy-sender"; compatible = "smmu-proxy-sender";
}; };
pcie_crm_hw_0_bcm_voter: bcm_voter@0 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "pcie_crm";
qcom,crm-client-idx = <0>;
qcom,crm-pwr-states = <5>;
};
disp_crm_hw_0_bcm_voter: bcm_voter@1 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "disp_crm";
qcom,crm-client-idx = <0>;
qcom,crm-pwr-states = <2>;
};
disp_crm_hw_1_bcm_voter: bcm_voter@2 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "disp_crm";
qcom,crm-client-idx = <1>;
qcom,crm-pwr-states = <2>;
};
disp_crm_hw_2_bcm_voter: bcm_voter@3 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "disp_crm";
qcom,crm-client-idx = <2>;
qcom,crm-pwr-states = <2>;
};
disp_crm_hw_3_bcm_voter: bcm_voter@4 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "disp_crm";
qcom,crm-client-idx = <3>;
qcom,crm-pwr-states = <2>;
};
disp_crm_hw_4_bcm_voter: bcm_voter@5 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "disp_crm";
qcom,crm-client-idx = <4>;
qcom,crm-pwr-states = <2>;
};
disp_crm_hw_5_bcm_voter: bcm_voter@6 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "disp_crm";
qcom,crm-client-idx = <5>;
qcom,crm-pwr-states = <2>;
};
disp_crm_sw_0_bcm_voter: bcm_voter@7 {
compatible = "qcom,bcm-voter";
qcom,crm-name = "disp_crm";
qcom,crm-sw-client;
qcom,crm-client-idx = <0>;
qcom,crm-pwr-states = <1>;
};
clk_virt: interconnect@0 { clk_virt: interconnect@0 {
compatible = "qcom,tuna-clk_virt"; compatible = "qcom,tuna-clk_virt";
#interconnect-cells = <1>; #interconnect-cells = <1>;
qcom,bcm-voter-names = "hlos"; qcom,bcm-voter-names = "hlos",
qcom,bcm-voters = <&apps_bcm_voter>; "pcie_crm_hw_0";
qcom,bcm-voters = <&apps_bcm_voter>,
<&pcie_crm_hw_0_bcm_voter>;
}; };
mc_virt: interconnect@1 { mc_virt: interconnect@1 {
compatible = "qcom,tuna-mc_virt"; compatible = "qcom,tuna-mc_virt";
#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",
"cam_ife_1",
"cam_ife_2",
"pcie_crm_hw_0",
"disp_crm_hw_0",
"disp_crm_hw_1",
"disp_crm_hw_2",
"disp_crm_hw_3",
"disp_crm_hw_4",
"disp_crm_hw_5",
"disp_crm_sw_0";
qcom,bcm-voters = <&apps_bcm_voter>,
<&cam_bcm_voter0>,
<&cam_bcm_voter1>,
<&cam_bcm_voter2>,
<&pcie_crm_hw_0_bcm_voter>,
<&disp_crm_hw_0_bcm_voter>,
<&disp_crm_hw_1_bcm_voter>,
<&disp_crm_hw_2_bcm_voter>,
<&disp_crm_hw_3_bcm_voter>,
<&disp_crm_hw_4_bcm_voter>,
<&disp_crm_hw_5_bcm_voter>,
<&disp_crm_sw_0_bcm_voter>;
}; };
config_noc: interconnect@1600000 { config_noc: interconnect@1600000 {
@@ -2060,8 +2156,10 @@
compatible = "qcom,tuna-pcie_anoc"; compatible = "qcom,tuna-pcie_anoc";
reg = <0x16c0000 0x11400>; reg = <0x16c0000 0x11400>;
#interconnect-cells = <1>; #interconnect-cells = <1>;
qcom,bcm-voter-names = "hlos"; qcom,bcm-voter-names = "hlos",
qcom,bcm-voters = <&apps_bcm_voter>; "pcie_crm_hw_0";
qcom,bcm-voters = <&apps_bcm_voter>,
<&pcie_crm_hw_0_bcm_voter>;
qcom,skip-qos; qcom,skip-qos;
}; };
@@ -2087,8 +2185,28 @@
compatible = "qcom,tuna-mmss_noc"; compatible = "qcom,tuna-mmss_noc";
reg = <0x1780000 0x7d800>; reg = <0x1780000 0x7d800>;
#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",
"cam_ife_1",
"cam_ife_2",
"disp_crm_hw_0",
"disp_crm_hw_1",
"disp_crm_hw_2",
"disp_crm_hw_3",
"disp_crm_hw_4",
"disp_crm_hw_5",
"disp_crm_sw_0";
qcom,bcm-voters = <&apps_bcm_voter>,
<&cam_bcm_voter0>,
<&cam_bcm_voter1>,
<&cam_bcm_voter2>,
<&disp_crm_hw_0_bcm_voter>,
<&disp_crm_hw_1_bcm_voter>,
<&disp_crm_hw_2_bcm_voter>,
<&disp_crm_hw_3_bcm_voter>,
<&disp_crm_hw_4_bcm_voter>,
<&disp_crm_hw_5_bcm_voter>,
<&disp_crm_sw_0_bcm_voter>;
qcom,skip-qos; qcom,skip-qos;
}; };
@@ -2096,8 +2214,30 @@
compatible = "qcom,tuna-gem_noc"; compatible = "qcom,tuna-gem_noc";
reg = <0x24100000 0x14d080>; reg = <0x24100000 0x14d080>;
#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",
"cam_ife_1",
"cam_ife_2",
"pcie_crm_hw_0",
"disp_crm_hw_0",
"disp_crm_hw_1",
"disp_crm_hw_2",
"disp_crm_hw_3",
"disp_crm_hw_4",
"disp_crm_hw_5",
"disp_crm_sw_0";
qcom,bcm-voters = <&apps_bcm_voter>,
<&cam_bcm_voter0>,
<&cam_bcm_voter1>,
<&cam_bcm_voter2>,
<&pcie_crm_hw_0_bcm_voter>,
<&disp_crm_hw_0_bcm_voter>,
<&disp_crm_hw_1_bcm_voter>,
<&disp_crm_hw_2_bcm_voter>,
<&disp_crm_hw_3_bcm_voter>,
<&disp_crm_hw_4_bcm_voter>,
<&disp_crm_hw_5_bcm_voter>,
<&disp_crm_sw_0_bcm_voter>;
qcom,skip-qos; qcom,skip-qos;
}; };