evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: camera: isp: Clock changes for isp and ispif

Browse source 
Add the mmssnoc_axi clock for isp and ispif nodes and
remove mnoc_maxi clock.

Change-Id: I01f3f726c484a929db3a1d8dff6f31806beb8dc3
CRs-Fixed: 1050172
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
This commit is contained in:
Shubhraprakash Das 2016-08-31 23:38:25 -07:00
parent e268f6315e
commit e1e955199d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi
View file

@ -442,7 +442,7 @@
qcom,vdd-names = "camss-vdd", "vfe0-vdd", qcom,vdd-names = "camss-vdd", "vfe0-vdd",
"vfe1-vdd"; "vfe1-vdd";
qcom,clock-cntl-support; qcom,clock-cntl-support;
clocks = <&clock_mmss clk_mmss_mnoc_maxi_clk>, clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
<&clock_mmss clk_mmss_mnoc_ahb_clk>, <&clock_mmss clk_mmss_mnoc_ahb_clk>,
<&clock_mmss clk_mmss_camss_ahb_clk>, <&clock_mmss clk_mmss_camss_ahb_clk>,
<&clock_mmss clk_mmss_camss_top_ahb_clk>, <&clock_mmss clk_mmss_camss_top_ahb_clk>,
@ -469,7 +469,7 @@
<&clock_mmss clk_mmss_camss_vfe1_clk>, <&clock_mmss clk_mmss_camss_vfe1_clk>,
<&clock_mmss clk_vfe1_clk_src>, <&clock_mmss clk_vfe1_clk_src>,
<&clock_mmss clk_mmss_camss_csi_vfe1_clk>; <&clock_mmss clk_mmss_camss_csi_vfe1_clk>;
clock-names = "mnoc_maxi_clk", "mnoc_ahb_clk", clock-names = "mmssnoc_axi", "mnoc_ahb_clk",
"camss_ahb_clk", "camss_ahb_clk",
"camss_top_ahb_clk", "ispif_ahb_clk", "camss_top_ahb_clk", "ispif_ahb_clk",
"csi0_src_clk", "csi1_src_clk", "csi0_src_clk", "csi1_src_clk",
@ -521,7 +521,7 @@
camss-vdd-supply = <&gdsc_camss_top>; camss-vdd-supply = <&gdsc_camss_top>;
smmu-vdd-supply = <&gdsc_bimc_smmu>; smmu-vdd-supply = <&gdsc_bimc_smmu>;
qcom,vdd-names = "vdd", "camss-vdd", "smmu-vdd"; qcom,vdd-names = "vdd", "camss-vdd", "smmu-vdd";
clocks = <&clock_mmss clk_mmss_mnoc_maxi_clk>, clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
<&clock_mmss clk_mmss_mnoc_ahb_clk>, <&clock_mmss clk_mmss_mnoc_ahb_clk>,
<&clock_mmss clk_mmss_bimc_smmu_ahb_clk>, <&clock_mmss clk_mmss_bimc_smmu_ahb_clk>,
<&clock_mmss clk_mmss_bimc_smmu_axi_clk>, <&clock_mmss clk_mmss_bimc_smmu_axi_clk>,
@ -534,7 +534,7 @@
<&clock_mmss clk_mmss_camss_vfe_vbif_axi_clk>, <&clock_mmss clk_mmss_camss_vfe_vbif_axi_clk>,
<&clock_mmss clk_vfe0_clk_src>, <&clock_mmss clk_vfe0_clk_src>,
<&clock_mmss clk_mmss_camss_csi_vfe0_clk>; <&clock_mmss clk_mmss_camss_csi_vfe0_clk>;
clock-names = "mnoc_maxi_clk", "mnoc_ahb_clk", clock-names = "mmssnoc_axi", "mnoc_ahb_clk",
"bimc_smmu_ahb_clk", "bimc_smmu_axi_clk", "bimc_smmu_ahb_clk", "bimc_smmu_axi_clk",
"camss_ahb_clk", "camss_top_ahb_clk", "camss_ahb_clk", "camss_top_ahb_clk",
"camss_vfe_clk", "camss_vfe_stream_clk", "camss_vfe_clk", "camss_vfe_stream_clk",
@ -601,7 +601,7 @@
camss-vdd-supply = <&gdsc_camss_top>; camss-vdd-supply = <&gdsc_camss_top>;
smmu-vdd-supply = <&gdsc_bimc_smmu>; smmu-vdd-supply = <&gdsc_bimc_smmu>;
qcom,vdd-names = "vdd", "camss-vdd", "smmu-vdd"; qcom,vdd-names = "vdd", "camss-vdd", "smmu-vdd";
clocks = <&clock_mmss clk_mmss_mnoc_maxi_clk>, clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
<&clock_mmss clk_mmss_mnoc_ahb_clk>, <&clock_mmss clk_mmss_mnoc_ahb_clk>,
<&clock_mmss clk_mmss_bimc_smmu_ahb_clk>, <&clock_mmss clk_mmss_bimc_smmu_ahb_clk>,
<&clock_mmss clk_mmss_bimc_smmu_axi_clk>, <&clock_mmss clk_mmss_bimc_smmu_axi_clk>,
@ -614,7 +614,7 @@
<&clock_mmss clk_mmss_camss_vfe_vbif_axi_clk>, <&clock_mmss clk_mmss_camss_vfe_vbif_axi_clk>,
<&clock_mmss clk_vfe1_clk_src>, <&clock_mmss clk_vfe1_clk_src>,
<&clock_mmss clk_mmss_camss_csi_vfe1_clk>; <&clock_mmss clk_mmss_camss_csi_vfe1_clk>;
clock-names = "mnoc_maxi_clk", "mnoc_ahb_clk", clock-names = "mmssnoc_axi", "mnoc_ahb_clk",
"bimc_smmu_ahb_clk", "bimc_smmu_axi_clk", "bimc_smmu_ahb_clk", "bimc_smmu_axi_clk",
"camss_ahb_clk", "camss_top_ahb_clk", "camss_ahb_clk", "camss_top_ahb_clk",
"camss_vfe_clk", "camss_vfe_stream_clk", "camss_vfe_clk", "camss_vfe_stream_clk",