diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-24 16:04:55 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-09-24 16:04:55 -0700 |
| commit | 376ed84cd949d7232762b4d8f4872ef848b9cc14 (patch) | |
| tree | 6b7e89ff620304770d2540716da918a7874910be | |
| parent | 50765a66c58b918a10cd528b702dc1235300777d (diff) | |
| parent | 2540a3f2d6766e597dcae90d589e40786733f8fc (diff) | |
| download | camera-devicetree-376ed84cd949d7232762b4d8f4872ef848b9cc14.tar.gz | |
Merge 2540a3f2d6766e597dcae90d589e40786733f8fc on remote branch
Change-Id: I8cc052863ad279385cb18cdd4009b671fee0802d
| -rw-r--r-- | kona-camera.dtsi | 7 | ||||
| -rw-r--r-- | lito-camera.dtsi | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/kona-camera.dtsi b/kona-camera.dtsi index e9931d2..0bab6bd 100644 --- a/kona-camera.dtsi +++ b/kona-camera.dtsi @@ -564,14 +564,15 @@ <0 0 0 80000000 0 0 400000000 0>, <0 0 0 80000000 0 0 400000000 0>, <0 0 0 80000000 0 0 400000000 0>, + <0 0 0 80000000 0 0 400000000 0>, <0 0 0 80000000 0 0 480000000 0>; clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs", - "svs_l1", "nominal", "turbo"; + "svs_l1", "nominal", "nominal_l1", "turbo"; control-camnoc-axi-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <20>; qcom,msm-bus,name = "cam_ahb"; - qcom,msm-bus,num-cases = <7>; + qcom,msm-bus,num-cases = <8>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = <MSM_BUS_MASTER_AMPSS_M0 @@ -587,6 +588,8 @@ <MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_CAMERA_CFG 0 300000>, <MSM_BUS_MASTER_AMPSS_M0 + MSM_BUS_SLAVE_CAMERA_CFG 0 300000>, + <MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_CAMERA_CFG 0 300000>; vdd-corners = <RPMH_REGULATOR_LEVEL_RETENTION RPMH_REGULATOR_LEVEL_MIN_SVS diff --git a/lito-camera.dtsi b/lito-camera.dtsi index 4478009..10751f4 100644 --- a/lito-camera.dtsi +++ b/lito-camera.dtsi @@ -1068,14 +1068,15 @@ <0 0 0 80000000 0 240000000 0>, <0 0 0 80000000 0 320000000 0>, <0 0 0 80000000 0 400000000 0>, + <0 0 0 80000000 0 400000000 0>, <0 0 0 80000000 0 480000000 0>; clock-cntl-level = "suspend", "lowsvs", "svs", - "svs_l1", "nominal", "turbo"; + "svs_l1", "nominal", "nominal_l1", "turbo"; control-camnoc-axi-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <20>; qcom,msm-bus,name = "cam_ahb"; - qcom,msm-bus,num-cases = <7>; + qcom,msm-bus,num-cases = <8>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = <MSM_BUS_MASTER_AMPSS_M0 @@ -1091,6 +1092,8 @@ <MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_CAMERA_CFG 0 250000>, <MSM_BUS_MASTER_AMPSS_M0 + MSM_BUS_SLAVE_CAMERA_CFG 0 250000>, + <MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_CAMERA_CFG 0 250000>; vdd-corners = <RPMH_REGULATOR_LEVEL_RETENTION RPMH_REGULATOR_LEVEL_MIN_SVS |