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

Commit 6ebf9c57 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: cci-camera: Add 1MHZ in CCI for I2C operation"

parents d2b4d73e 0c978e90

arch/arm/boot/dts/qcom/apq8084-camera.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ 
		interrupt-names = "cci";

        clock-names = "camss_top_ahb_clk", "camss_ahb_clk", "cci_src_clk",

                           "cci_ahb_clk", "cci_clk";

        qcom,clock-rates = <0 0 19200000 0 0>;

        qcom,clock-rates = <0 0 19200000 0 0>,

			<0 0 37500000 0 0>;

		gpios = <&msmgpio 19 0>,

			<&msmgpio 20 0>,

			<&msmgpio 21 0>,
@@ -264,6 +265,11 @@ 
		i2c_freq_custom: qcom,i2c_custom_mode {

			status = "disabled";

		};



		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {

			status = "disabled";

		};



	};

};
@@ -308,3 +314,18 @@ 
	qcom,hw-tsp = <3>;

	status = "ok";

};



&i2c_freq_1Mhz {

	qcom,hw-thigh = <16>;

	qcom,hw-tlow = <22>;

	qcom,hw-tsu-sto = <17>;

	qcom,hw-tsu-sta = <18>;

	qcom,hw-thd-dat = <16>;

	qcom,hw-thd-sta = <15>;

	qcom,hw-tbuf = <19>;

	qcom,hw-scl-stretch-en = <1>;

	qcom,hw-trdhld = <3>;

	qcom,hw-tsp = <3>;

	qcom,cci-clk-src = <37500000>;

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8226-camera.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ 
		interrupt-names = "cci";

        clock-names = "camss_top_ahb_clk", "cci_src_clk",

                           "cci_ahb_clk", "cci_clk";

        qcom,clock-rates = <0 19200000 0 0>;

        qcom,clock-rates = <0 19200000 0 0>,

			<0 37500000 0 0>;

		gpios = <&msmgpio 29 0>,

			<&msmgpio 30 0>;

		qcom,gpio-tbl-num = <0 1>;
@@ -183,6 +184,11 @@ 
		i2c_freq_custom: qcom,i2c_custom_mode {

			status = "disabled";

		};



		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {

			status = "disabled";

		};



	};

};
@@ -227,3 +233,18 @@ 
	qcom,hw-tsp = <3>;

	status = "ok";

};



&i2c_freq_1Mhz {

	qcom,hw-thigh = <16>;

	qcom,hw-tlow = <22>;

	qcom,hw-tsu-sto = <17>;

	qcom,hw-tsu-sta = <18>;

	qcom,hw-thd-dat = <16>;

	qcom,hw-thd-sta = <15>;

	qcom,hw-tbuf = <19>;

	qcom,hw-scl-stretch-en = <1>;

	qcom,hw-trdhld = <3>;

	qcom,hw-tsp = <3>;

	qcom,cci-clk-src = <37500000>;

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8916-camera.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ 
			 <&clock_gcc clk_gcc_camss_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "cci_src_clk",

			"cci_ahb_clk", "cci_clk", "camss_ahb_clk";

		qcom,clock-rates = <0 19200000 80000000 0 0>;

		qcom,clock-rates = <0 19200000 80000000 0 0>,

				<0 37500000 80000000 0 0>;

		pinctrl-names = "cci_default", "cci_suspend";

		pinctrl-0 = <&cci0_default>;

		pinctrl-1 = <&cci0_sleep>;
@@ -268,6 +269,11 @@ 
		i2c_freq_custom: qcom,i2c_custom_mode {

			status = "disabled";

		};



		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {

			status = "disabled";

		};



	};

};
@@ -312,3 +318,18 @@ 
	qcom,hw-tsp = <3>;

	status = "ok";

};



&i2c_freq_1Mhz {

	qcom,hw-thigh = <16>;

	qcom,hw-tlow = <22>;

	qcom,hw-tsu-sto = <17>;

	qcom,hw-tsu-sta = <18>;

	qcom,hw-thd-dat = <16>;

	qcom,hw-thd-sta = <15>;

	qcom,hw-tbuf = <19>;

	qcom,hw-scl-stretch-en = <1>;

	qcom,hw-trdhld = <3>;

	qcom,hw-tsp = <3>;

	qcom,cci-clk-src = <37500000>;

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8939-camera.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ 
		clock-names = "ispif_ahb_clk", "camss_top_ahb_clk",

			"cci_src_clk", "cci_ahb_clk",

			"cci_clk", "camss_ahb_clk";

		qcom,clock-rates = <80000000 0 19200000 0 0 0>;

		qcom,clock-rates = <80000000 0 19200000 0 0 0>,

						<80000000 0 37500000 0 0 0>;

		pinctrl-names = "cci_default", "cci_suspend";

		pinctrl-0 = <&cci0_default>;

		pinctrl-1 = <&cci0_sleep>;
@@ -310,6 +311,11 @@ 
		i2c_freq_custom: qcom,i2c_custom_mode {

			status = "disabled";

		};



		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {

			status = "disabled";

		};



	};

};
@@ -354,3 +360,18 @@ 
	qcom,hw-tsp = <3>;

	status = "ok";

};



&i2c_freq_1Mhz {

	qcom,hw-thigh = <16>;

	qcom,hw-tlow = <22>;

	qcom,hw-tsu-sto = <17>;

	qcom,hw-tsu-sta = <18>;

	qcom,hw-thd-dat = <16>;

	qcom,hw-thd-sta = <15>;

	qcom,hw-tbuf = <19>;

	qcom,hw-scl-stretch-en = <1>;

	qcom,hw-trdhld = <3>;

	qcom,hw-tsp = <3>;

	qcom,cci-clk-src = <37500000>;

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8974-camera.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ 
		interrupt-names = "cci";

        clock-names = "camss_top_ahb_clk", "cci_src_clk",

                           "cci_ahb_clk", "cci_clk";

        qcom,clock-rates = <0 19200000 0 0>;

        qcom,clock-rates = <0 19200000 0 0>,

			<0 37500000 0 0>;

		gpios = <&msmgpio 19 0>,

			<&msmgpio 20 0>,

			<&msmgpio 21 0>,
@@ -287,6 +288,11 @@ 
		i2c_freq_custom: qcom,i2c_custom_mode {

			status = "disabled";

		};



		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {

			status = "disabled";

		};



	};

};
@@ -331,3 +337,18 @@ 
	qcom,hw-tsp = <3>;

	status = "ok";

};



&i2c_freq_1Mhz {

	qcom,hw-thigh = <16>;

	qcom,hw-tlow = <22>;

	qcom,hw-tsu-sto = <17>;

	qcom,hw-tsu-sta = <18>;

	qcom,hw-thd-dat = <16>;

	qcom,hw-thd-sta = <15>;

	qcom,hw-tbuf = <19>;

	qcom,hw-scl-stretch-en = <1>;

	qcom,hw-trdhld = <3>;

	qcom,hw-tsp = <3>;

	qcom,cci-clk-src = <37500000>;

	status = "ok";

};