Merge "ARM: dts: msm: Add pinctrl information for camera in DT" (a46665bb) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/boot/dts/qcom/kona-camera.dtsi

+8 −8

Original line number	Diff line number	Diff line
		@@ -193,10 +193,10 @@
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cci0_active &cci1_active>;
		pinctrl-1 = <&cci0_suspend &cci1_suspend>;
		gpios = <&tlmm 17 0>,
		<&tlmm 18 0>,
		<&tlmm 19 0>,
		<&tlmm 20 0>;
		gpios = <&tlmm 101 0>,
		<&tlmm 102 0>,
		<&tlmm 103 0>,
		<&tlmm 104 0>;
		gpio-req-tbl-num = <0 1 2 3>;
		gpio-req-tbl-flags = <1 1 1 1>;
		gpio-req-tbl-label = "CCI_I2C_DATA0",
		@@ -286,10 +286,10 @@
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cci2_active &cci3_active>;
		pinctrl-1 = <&cci2_suspend &cci3_suspend>;
		gpios = <&tlmm 31 0>,
		<&tlmm 32 0>,
		<&tlmm 33 0>,
		<&tlmm 34 0>;
		gpios = <&tlmm 105 0>,
		<&tlmm 106 0>,
		<&tlmm 107 0>,
		<&tlmm 108 0>;
		gpio-req-tbl-num = <0 1 2 3>;
		gpio-req-tbl-flags = <1 1 1 1>;
		gpio-req-tbl-label = "CCI_I2C_DATA2",

arch/arm64/boot/dts/qcom/kona-pinctrl.dtsi

+200 −0

Original line number	Diff line number	Diff line
		@@ -2054,6 +2054,90 @@
		};
		};

		cam_sensor_mclk4_active: cam_sensor_mclk4_active {
		/* MCLK4 */
		mux {
		pins = "gpio98";
		function = "cam_mclk";
		};

		config {
		pins = "gpio98";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_mclk4_suspend: cam_sensor_mclk4_suspend {
		/* MCLK4 */
		mux {
		pins = "gpio98";
		function = "cam_mclk";
		};

		config {
		pins = "gpio98";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_mclk5_active: cam_sensor_mclk5_active {
		/* MCLK5 */
		mux {
		pins = "gpio99";
		function = "cam_mclk";
		};

		config {
		pins = "gpio99";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_mclk5_suspend: cam_sensor_mclk5_suspend {
		/* MCLK5 */
		mux {
		pins = "gpio99";
		function = "cam_mclk";
		};

		config {
		pins = "gpio99";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_mclk6_active: cam_sensor_mclk6_active {
		/* MCLK6 */
		mux {
		pins = "gpio100";
		function = "cam_mclk";
		};

		config {
		pins = "gpio100";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_mclk6_suspend: cam_sensor_mclk6_suspend {
		/* MCLK6 */
		mux {
		pins = "gpio100";
		function = "cam_mclk";
		};

		config {
		pins = "gpio100";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_active_rear: cam_sensor_active_rear {
		/* RESET REAR */
		mux {
		@@ -2141,6 +2225,122 @@
		};
		};

		cam_sensor_active_3: cam_sensor_active_3 {
		/* RESET 3 */
		mux {
		pins = "gpio109";
		function = "gpio";
		};

		config {
		pins = "gpio109";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_suspend_3: cam_sensor_suspend_3 {
		/* RESET 3 */
		mux {
		pins = "gpio109";
		function = "gpio";
		};

		config {
		pins = "gpio109";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		output-low;
		};
		};

		cam_sensor_active_4: cam_sensor_active_4 {
		/* RESET 4 */
		mux {
		pins = "gpio130";
		function = "gpio";
		};

		config {
		pins = "gpio130";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_suspend_4: cam_sensor_suspend_4 {
		/* RESET 4 */
		mux {
		pins = "gpio130";
		function = "gpio";
		};

		config {
		pins = "gpio130";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		output-low;
		};
		};

		cam_sensor_active_5: cam_sensor_active_5 {
		/* RESET 5 */
		mux {
		pins = "gpio131";
		function = "gpio";
		};

		config {
		pins = "gpio131";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_suspend_5: cam_sensor_suspend_5 {
		/* RESET 5 */
		mux {
		pins = "gpio131";
		function = "gpio";
		};

		config {
		pins = "gpio131";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		output-low;
		};
		};

		cam_sensor_active_6: cam_sensor_active_6 {
		/* RESET 6 */
		mux {
		pins = "gpio114";
		function = "gpio";
		};

		config {
		pins = "gpio114";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_suspend_6: cam_sensor_suspend_6 {
		/* RESET 6 */
		mux {
		pins = "gpio114";
		function = "gpio";
		};

		config {
		pins = "gpio114";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		output-low;
		};
		};

		cci0_active: cci0_active {
		mux {
		/* CLK, DATA */