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

Commit 535e4bb0 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: Add generic camera node for 8974MTP slot #2"

parents befa8285 3da14098

arch/arm/boot/dts/msm8974-camera-sensor-mtp.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -254,4 +254,32 @@ 
		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

		qcom,csiphy-sd-index = <2>;

		qcom,csid-sd-index = <2>;

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vana", "cam_vio";

		qcom,cam-vreg-type = <0 0 1>;

		qcom,cam-vreg-min-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-max-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-op-mode = <105000 80000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,

			<&msmgpio 18 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-req-tbl-num = <0 1>;

		qcom,gpio-req-tbl-flags = <1 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

					  "CAM_RESET1";

		qcom,cci-master = <1>;

		status = "ok";

	};



};

arch/arm/mach-msm/clock-8974.c

+4 −4
Original line number Diff line number Diff line
@@ -4845,11 +4845,11 @@ static struct clk_lookup msm_clocks_8974pro_only[] __initdata = { 
	CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, "90.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, "6d.qcom,camera"),

	CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "0.qcom,camera"),

	CLK_LOOKUP("cam_src_clk", mclk2_clk_src.c, "1.qcom,camera"),

	CLK_LOOKUP("cam_src_clk", mclk1_clk_src.c, "2.qcom,camera"),

	CLK_LOOKUP("cam_src_clk", mclk1_clk_src.c, "1.qcom,camera"),

	CLK_LOOKUP("cam_src_clk", mclk2_clk_src.c, "2.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk0_clk.c, "0.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, "1.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, "2.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, "1.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, "2.qcom,camera"),

};



static struct clk_lookup msm_clocks_8974_only[] __initdata = {