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

Merge "ARM: dts: msm: Add csi1 settings for early camera"

Browse source
This commit is contained in:
Linux Build Service Account 2018-12-04 00:21:58 -08:00 • committed by Gerrit - the friendly Code Review server
commit c471768d9c
2 changed files with 60 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
View file

@ -846,7 +846,14 @@
<&clock_mmss clk_camss_csi2rdi_clk>, <&clock_mmss clk_camss_csi2rdi_clk>,
<&clock_mmss clk_camss_ispif_ahb_clk>, <&clock_mmss clk_camss_ispif_ahb_clk>,
<&clock_mmss clk_camss_vfe0_clk>, <&clock_mmss clk_camss_vfe0_clk>,
<&clock_mmss clk_camss_vfe1_clk>; <&clock_mmss clk_camss_vfe1_clk>,
<&clock_mmss clk_camss_csi1_ahb_clk>,
<&clock_mmss clk_camss_csi1_clk>,
<&clock_mmss clk_camss_csi1phy_clk>,
<&clock_mmss clk_csi1phytimer_clk_src>,
<&clock_mmss clk_camss_csi1phytimer_clk>,
<&clock_mmss clk_camss_csi1rdi_clk>;
clock-names = clock-names =
"mmss_mmagic_ahb_clk", "mmss_mmagic_ahb_clk",
"camss_top_ahb_clk", "camss_top_ahb_clk",
@ -875,7 +882,14 @@
"camss_csi2rdi_clk", "camss_csi2rdi_clk",
"camss_ispif_ahb_clk", "camss_ispif_ahb_clk",
"clk_camss_vfe0_clk", "clk_camss_vfe0_clk",
"clk_camss_vfe1_clk"; "clk_camss_vfe1_clk",
"camss_csi1_ahb_clk",
"camss_csi1_clk",
"camss_csi1phy_clk",
"csi1phytimer_clk_src",
"camss_csi1phytimer_clk",
"camss_csi1rdi_clk";
qcom,clock-rates = <19200000 qcom,clock-rates = <19200000
19200000 19200000
19200000 19200000
@ -903,7 +917,13 @@
200000000 200000000
0 0
100000000 100000000
100000000>; 100000000
0
200000000
200000000
200000000
200000000
200000000>;
qcom,clock-cntl-support; qcom,clock-cntl-support;
qcom,clock-control = "NO_SET_RATE", "NO_SET_RATE", qcom,clock-control = "NO_SET_RATE", "NO_SET_RATE",
"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",
@ -918,6 +938,9 @@
"INIT_RATE","NO_SET_RATE", "INIT_RATE","NO_SET_RATE",
"INIT_RATE", "NO_SET_RATE", "INIT_RATE", "NO_SET_RATE",
"NO_SET_RATE","NO_SET_RATE", "NO_SET_RATE","NO_SET_RATE",
"NO_SET_RATE", "NO_SET_RATE",
"NO_SET_RATE","INIT_RATE",
"NO_SET_RATE","SET_RATE",
"NO_SET_RATE", "NO_SET_RATE"; "NO_SET_RATE", "NO_SET_RATE";
}; };
@ -1330,10 +1353,13 @@
}; };
gpio@c300 { /* GPIO 4 - adv7481 RST */ gpio@c300 { /* GPIO 4 - adv7481 RST */
qcom,mode = <1>; qcom,mode = <1>; /* DIGITAL OUT */
qcom,output-type = <0>; /* CMOS logic */
qcom,invert = <1>; /* output hight initially */
qcom,pull = <0>; qcom,pull = <0>;
qcom,vin-sel = <2>; qcom,vin-sel = <2>;
qcom,src-sel = <0>; qcom,src-sel = <0>;
qcom,out-strength = <1>;/* Low drive strength */
status = "okay"; status = "okay";
}; };

34
arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
View file

@ -611,7 +611,14 @@
<&clock_mmss clk_camss_csi2rdi_clk>, <&clock_mmss clk_camss_csi2rdi_clk>,
<&clock_mmss clk_camss_ispif_ahb_clk>, <&clock_mmss clk_camss_ispif_ahb_clk>,
<&clock_mmss clk_camss_vfe0_clk>, <&clock_mmss clk_camss_vfe0_clk>,
<&clock_mmss clk_camss_vfe1_clk>; <&clock_mmss clk_camss_vfe1_clk>,
<&clock_mmss clk_camss_csi1_ahb_clk>,
<&clock_mmss clk_camss_csi1_clk>,
<&clock_mmss clk_camss_csi1phy_clk>,
<&clock_mmss clk_csi1phytimer_clk_src>,
<&clock_mmss clk_camss_csi1phytimer_clk>,
<&clock_mmss clk_camss_csi1rdi_clk>;
clock-names = clock-names =
"mmss_mmagic_ahb_clk", "mmss_mmagic_ahb_clk",
"camss_top_ahb_clk", "camss_top_ahb_clk",
@ -640,7 +647,14 @@
"camss_csi2rdi_clk", "camss_csi2rdi_clk",
"camss_ispif_ahb_clk", "camss_ispif_ahb_clk",
"clk_camss_vfe0_clk", "clk_camss_vfe0_clk",
"clk_camss_vfe1_clk"; "clk_camss_vfe1_clk",
"camss_csi1_ahb_clk",
"camss_csi1_clk",
"camss_csi1phy_clk",
"csi1phytimer_clk_src",
"camss_csi1phytimer_clk",
"camss_csi1rdi_clk";
qcom,clock-rates = <19200000 qcom,clock-rates = <19200000
19200000 19200000
19200000 19200000
@ -668,7 +682,13 @@
200000000 200000000
0 0
100000000 100000000
100000000>; 100000000
0
200000000
200000000
200000000
200000000
200000000>;
qcom,clock-cntl-support; qcom,clock-cntl-support;
qcom,clock-control = "NO_SET_RATE", "NO_SET_RATE", qcom,clock-control = "NO_SET_RATE", "NO_SET_RATE",
"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",
@ -683,6 +703,9 @@
"INIT_RATE","NO_SET_RATE", "INIT_RATE","NO_SET_RATE",
"INIT_RATE", "NO_SET_RATE", "INIT_RATE", "NO_SET_RATE",
"NO_SET_RATE","NO_SET_RATE", "NO_SET_RATE","NO_SET_RATE",
"NO_SET_RATE", "NO_SET_RATE",
"NO_SET_RATE","INIT_RATE",
"NO_SET_RATE","SET_RATE",
"NO_SET_RATE", "NO_SET_RATE"; "NO_SET_RATE", "NO_SET_RATE";
}; };
@ -1152,10 +1175,13 @@
}; };
gpio@c300 { /* GPIO 4 - adv7481 RST */ gpio@c300 { /* GPIO 4 - adv7481 RST */
qcom,mode = <0>; qcom,mode = <1>; /* DIGITAL OUT */
qcom,output-type = <0>; /* CMOS logic */
qcom,invert = <1>; /* output hight initially */
qcom,pull = <0>; qcom,pull = <0>;
qcom,vin-sel = <2>; qcom,vin-sel = <2>;
qcom,src-sel = <0>; qcom,src-sel = <0>;
qcom,out-strength = <1>;/* Low drive strength */
status = "okay"; status = "okay";
}; };