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

Commit ca7748b9 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge c09f92db on remote branch 

Change-Id: I581ba2cea7928cc926850441eebd20a8e4d534df
parents cc711ff8 c09f92db

bengal-camera.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -616,9 +616,9 @@ 
			<&gcc GCC_CAMSS_TFE_0_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_0_CLK>;

		clock-rates =

			<240000000 0 240000000 0 256000000 0>,

			<384000000 0 341333333 0 460800000 0>,

			<426400000 0 384000000 0 576000000 0>;

			<240000000 0 0 0 256000000 0>,

			<384000000 0 0 0 460800000 0>,

			<426400000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -681,9 +681,9 @@ 
			<&gcc GCC_CAMSS_TFE_1_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_1_CLK>;

		clock-rates =

			<240000000 0 240000000 0 256000000 0>,

			<384000000 0 341333333 0 460800000 0>,

			<426400000 0 384000000 0 576000000 0>;

			<240000000 0 0 0 256000000 0>,

			<384000000 0 0 0 460800000 0>,

			<426400000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -746,9 +746,9 @@ 
			<&gcc GCC_CAMSS_TFE_2_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_2_CLK>;

		clock-rates =

			<240000000 0 240000000 0 256000000 0>,

			<384000000 0 341333333 0 460800000 0>,

			<426400000 0 384000000 0 576000000 0>;

			<240000000 0 0 0 256000000 0>,

			<384000000 0 0 0 460800000 0>,

			<426400000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";

bindings/msm-cam-cci.txt

+4 −4
Original line number Diff line number Diff line
@@ -253,13 +253,13 @@ sensor resource. 
  Value type: <string>

  Definition: Should be "qcom,cam-res-mgr".



- shared-gpios

- gpios-shared

  Usage: optional

  Value type: <u32>

  Definition: should contain the gpios which are used by two or more

	cameras, and these cameras may be opened together.



- shared-pinctrl-gpios

- gpios-shared-pinctrl

  Usage: optional

  Value type: <u32>

  Definition: should contain the pinctrl gpios which are used by two or more
@@ -778,8 +778,8 @@ Example: 
    qcom,cam-res-mgr {

         compatible = "qcom,cam-res-mgr";

         status = "ok";

         shared-gpios = <18 19>;

	 shared-pinctrl-gpios = <408 409>;

         gpios-shared = <18 19>;

	 gpios-shared-pinctrl = <408 409>;

	 shared-pctrl-gpio-names = "mclk0", "mclk1";

         pinctrl-names = "mclk0_active", "mclk0_suspend",

		"mclk1_active", "mclk1_suspend";

holi-camera-sensor-mtp.dtsi

+47 −0
Original line number Diff line number Diff line
@@ -206,6 +206,53 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

	};



    /*TPG0*/

	qcom,cam-tpg0 {

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <4>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		gpios = <&tlmm 30 0>,

			<&tlmm 35 0>;

		gpio-reset = <1>;

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

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

		gpio-req-tbl-label = "CAMIF_MCLK1",

					"CAM_RESET1";

		sensor-mode = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

	};



    /*TPG1*/

	qcom,cam-tpg1 {

		cell-index = <5>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <5>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		gpios = <&tlmm 30 0>,

			<&tlmm 35 0>;

		gpio-reset = <1>;

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

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

		gpio-req-tbl-label = "CAMIF_MCLK1",

					"CAM_RESET1";

		sensor-mode = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

	};



};



&cam_cci1 {

holi-camera-sensor-qrd.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ 
			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 2800000 1056000 0 2800000>;

		rgltr-max-voltage = <1800000 2800000 1056000 0 2800000>;

		rgltr-min-voltage = <1800000 2880000 1056000 0 2800000>;

		rgltr-max-voltage = <1800000 2880000 1056000 0 2800000>;

		rgltr-load-current = <120000 80000 1200000 0 100000>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -139,8 +139,8 @@ 
			"cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 2800000 1056000 0>;

		rgltr-max-voltage = <1800000 2800000 1056000 0>;

		rgltr-min-voltage = <1800000 2880000 1056000 0>;

		rgltr-max-voltage = <1800000 2880000 1056000 0>;

		rgltr-load-current = <120000 80000 1200000 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

holi-camera.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -731,9 +731,9 @@ 
			<&gcc GCC_CAMSS_TFE_0_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_0_CLK>;

		clock-rates =

			<300000000 0 240000000 0 300000000 0>,

			<426400000 0 341333333 0 460800000 0>,

			<466500000 0 384000000 0 576000000 0>;

			<300000000 0 0 0 300000000 0>,

			<426400000 0 0 0 460800000 0>,

			<466500000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -795,9 +795,9 @@ 
			<&gcc GCC_CAMSS_TFE_1_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_1_CLK>;

		clock-rates =

			<300000000 0 240000000 0 300000000 0>,

			<426400000 0 341333333 0 460800000 0>,

			<466500000 0 384000000 0 576000000 0>;

			<300000000 0 0 0 300000000 0>,

			<426400000 0 0 0 460800000 0>,

			<466500000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -859,9 +859,9 @@ 
			<&gcc GCC_CAMSS_TFE_2_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_2_CLK>;

		clock-rates =

			<300000000 0 240000000 0 300000000 0>,

			<426400000 0 341333333 0 460800000 0>,

			<466500000 0 384000000 0 576000000 0>;

			<300000000 0 0 0 300000000 0>,

			<426400000 0 0 0 460800000 0>,

			<466500000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";