Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbd0b4dd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add csiphy refgen for sdm845 v2"

parents e8ffd5c8 ef83177d

Documentation/devicetree/bindings/media/video/msm-cam-csiphy.txt

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ qcom,csiphy@ac65000 { 
     reg-names = "csiphy";

     interrupts = <0 477 0>;

     interrupt-names = "csiphy";

     regulator-names = "gdscr", "refgen";

     gdscr-supply = <&titan_top_gdsc>;

     refgen-supply = <&refgen>;

     clock-names = "camnoc_axi_clk", "soc_ahb_clk",

              "slow_ahb_src_clk", "cpas_ahb_clk",

              "cphy_rx_clk_src", "csiphy0_clk",
@@ -34,6 +37,5 @@ qcom,csiphy@ac65000 { 
     clock-rates =

           <0 0 80000000 0 320000000 0 269333333 0 0 384000000>;

     clock-cntl-level = "turbo";

     regulator-names = "gdscr";

     status = "ok";

};

arch/arm64/boot/dts/qcom/sdm845-v2-camera.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ 
		reg-cam-base = <0x65000>;

		interrupts = <0 477 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		regulator-names = "gdscr", "refgen";

		gdscr-supply = <&titan_top_gdsc>;

		refgen-supply = <&refgen>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;
@@ -55,8 +56,9 @@ 
		reg-cam-base = <0x66000>;

		interrupts = <0 478 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		regulator-names = "gdscr", "refgen";

		gdscr-supply = <&titan_top_gdsc>;

		refgen-supply = <&refgen>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;
@@ -91,8 +93,9 @@ 
		reg-cam-base = <0x67000>;

		interrupts = <0 479 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		regulator-names = "gdscr", "refgen";

		gdscr-supply = <&titan_top_gdsc>;

		refgen-supply = <&refgen>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;
@@ -126,8 +129,9 @@ 
		reg-cam-base = <0x68000>;

		interrupts = <0 448 0>;

		interrupt-names = "csiphy";

		regulator-names = "gdscr";

		regulator-names = "gdscr", "refgen";

		gdscr-supply = <&titan_top_gdsc>;

		refgen-supply = <&refgen>;

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-dsi-vdd-supply = <&pm8998_l1>;