diff --git a/kera-camera-sensor-mtp.dtsi b/kera-camera-sensor-mtp.dtsi index bfd880a2..acc3c9d0 100644 --- a/kera-camera-sensor-mtp.dtsi +++ b/kera-camera-sensor-mtp.dtsi @@ -48,7 +48,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <2800000>; rgltr-max-voltage = <3000000>; - rgltr-load-current = <103000>; + rgltr-load-current = <118930>; status = "ok"; }; @@ -62,7 +62,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <2800000>; rgltr-max-voltage = <3000000>; - rgltr-load-current = <103000>; + rgltr-load-current = <103360>; status = "ok"; }; @@ -78,7 +78,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; rgltr-max-voltage = <1980000 3000000 0>; - rgltr-load-current = <3500 214290 0>; + rgltr-load-current = <3500 220000 0>; status = "ok"; }; @@ -97,7 +97,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1104000 0 2800000 2800000 1800000>; rgltr-max-voltage = <1980000 1200000 0 2900000 3000000 1900000>; - rgltr-load-current = <3500 913200 0 91430 103000 63100>; + rgltr-load-current = <3500 913200 0 91430 118930 63100>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -133,7 +133,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1100000 0 2800000 2800000>; rgltr-max-voltage = <1980000 1200000 0 2900000 3000000>; - rgltr-load-current = <3500 522730 0 107140 103000>; + rgltr-load-current = <4060 523640 0 107500 103360>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active @@ -176,7 +176,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1100000 0 2800000 2800000>; rgltr-max-voltage = <1980000 1200000 0 2900000 3000000>; - rgltr-load-current = <3500 522730 0 107140 103000>; + rgltr-load-current = <4060 523640 0 107500 103360>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active @@ -221,7 +221,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1104000 0 2800000 2800000 1800000>; rgltr-max-voltage = <1980000 1200000 0 2900000 3000000 1900000>; - rgltr-load-current = <3500 913200 0 91430 103000 63100>; + rgltr-load-current = <3500 913200 0 91430 118930 63100>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -255,7 +255,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <2800000>; rgltr-max-voltage = <3000000>; - rgltr-load-current = <130000>; + rgltr-load-current = <130040>; status = "ok"; }; @@ -273,7 +273,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1056000 0 2800000 2800000>; rgltr-max-voltage = <1980000 1150000 0 2900000 3000000>; - rgltr-load-current = <4000 261000 0 68000 130000>; + rgltr-load-current = <4500 266330 0 69000 130040>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk2_active @@ -309,7 +309,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1056000 0 2800000 1800000>; rgltr-max-voltage = <1980000 1150000 0 2900000 1900000>; - rgltr-load-current = <5000 453330 0 77500 28890>; + rgltr-load-current = <5560 454290 0 77860 29440>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active @@ -350,7 +350,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1056000 0 2800000 1800000>; rgltr-max-voltage = <1980000 1150000 0 2900000 1900000>; - rgltr-load-current = <5000 453330 0 77500 28890>; + rgltr-load-current = <5560 454290 0 77860 29440>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active @@ -393,7 +393,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 1056000 0 2800000 2800000>; rgltr-max-voltage = <1980000 1150000 0 2900000 3000000>; - rgltr-load-current = <4000 261000 0 68000 130000>; + rgltr-load-current = <4500 266330 0 69000 130040>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk2_active diff --git a/kera-camera.dtsi b/kera-camera.dtsi index 790ff951..c08f5417 100644 --- a/kera-camera.dtsi +++ b/kera-camera.dtsi @@ -487,7 +487,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy0_clk", @@ -521,7 +521,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy1_clk", @@ -555,7 +555,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy2_clk", @@ -576,7 +576,7 @@ cam_csiphy3: qcom,csiphy3@adaf000 { cell-index = <3>; - compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; + compatible = "qcom,csiphy-v2.2.1", "qcom,csiphy"; reg = <0x0adaf000 0x2000>; reg-names = "csiphy"; reg-cam-base = <0x1af000>; @@ -589,7 +589,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy3_clk", @@ -840,6 +840,35 @@ status = "ok"; }; + cam_csiphy_tpg15: qcom,tpg15@ad8c000 { + cell-index = <15>; + phy-id = <1>; + hw-no-ops; + compatible = "qcom,cam-tpg104"; + reg-names = "tpg1", "cam_cpas_top"; + reg = <0x0ad8c000 0x400>, + <0x0ac04000 0x1000>; + reg-cam-base = <0x18c000 0x04000>; + regulator-names = "gdsc"; + gdsc-supply = <&cam_cc_titan_top_gdsc>; + interrupt-names = "tpg1"; + interrupts = ; + shared-clks = <1 0>; + clock-names = + "cphy_rx_clk_src", + "csid_csiphy_rx_clk"; + clocks = + <&camcc CAM_CC_CPHY_RX_CLK_SRC>, + <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; + clock-rates = + <400000000 0>, + <400000000 0>, + <480000000 0>; + clock-cntl-level = "lowsvs", "svs", "nominal"; + src-clock-name = "cphy_rx_clk_src"; + status = "ok"; + }; + qcom,cam_smmu { compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; @@ -1214,7 +1243,7 @@ "ife0", "ife1", "ife2", "ife3", "ipe0", "rt-cdm0", "rt-cdm1", "rt-cdm2", "rt-cdm3", "cam-cdm-intf0", "icp0", "icp1", "ofe0", "cre0", - "jpeg-dma0", "jpeg-enc0", "tpg13", "tpg14"; + "jpeg-dma0", "jpeg-enc0", "tpg13", "tpg14", "tpg15"; sys-cache-names = "ofe_ip", "ipe_rt_ip", "ipe_srt_ip", "ipe_rt_rf", "ipe_srt_rf"; sys-cache-uids = <71 72 73 74 75>; sys-cache-concur = <1 1 1 0 0>;