Merge "msm: ais: Configure gpios for bridge error report" (25c6a29c) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/arm64/boot/dts/qcom/sa8155-camera-sensor.dtsi

+33 −29

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -32,13 +32,14 @@
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_bob";
		gpios = <&tlmm 13 0>,
		<&tlmm 21 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK0",
		"CAM_RESET0";
		pinctrl-names = "sensor_default", "sensor_suspend";
		pinctrl-0 = <&cam_sensor0_active>;
		pinctrl-1 = <&cam_sensor0_suspend>;
		gpios = <&tlmm 21 0>;
		gpio-reset = <0>;
		gpio-req-tbl-num = <0 >;
		gpio-req-tbl-flags = < 0>;
		gpio-req-tbl-label = "CAM_RESET0";
		sensor-mode = <0>;
		cci-master = <0>;
		status = "ok";
		@@ -63,13 +64,14 @@
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_bob";
		gpios = <&tlmm 14 0>,
		<&tlmm 22 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK1",
		"CAM_RESET1";
		pinctrl-names = "sensor_default", "sensor_suspend";
		pinctrl-0 = <&cam_sensor1_active>;
		pinctrl-1 = <&cam_sensor1_suspend>;
		gpios = <&tlmm 22 0>;
		gpio-reset = <0>;
		gpio-req-tbl-num = <0>;
		gpio-req-tbl-flags = <0>;
		gpio-req-tbl-label = "CAM_RESET1";
		sensor-mode = <0>;
		cci-master = <0>;
		status = "ok";
		@@ -94,13 +96,14 @@
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_bob";
		gpios = <&tlmm 15 0>,
		<&tlmm 23 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK2",
		"CAM_RESET2";
		pinctrl-names = "sensor_default", "sensor_suspend";
		pinctrl-0 = <&cam_sensor2_active>;
		pinctrl-1 = <&cam_sensor2_suspend>;
		gpios = <&tlmm 23 0>;
		gpio-reset = <0>;
		gpio-req-tbl-num = <0>;
		gpio-req-tbl-flags = <0>;
		gpio-req-tbl-label = "CAM_RESET2";
		sensor-mode = <0>;
		cci-master = <1>;
		status = "ok";
		@@ -125,13 +128,14 @@
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_bob";
		gpios = <&tlmm 16 0>,
		<&tlmm 25 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK3",
		"CAM_RESET3";
		pinctrl-names = "sensor_default", "sensor_suspend";
		pinctrl-0 = <&cam_sensor3_active>;
		pinctrl-1 = <&cam_sensor3_suspend>;
		gpios = <&tlmm 25 0>;
		gpio-reset = <0>;
		gpio-req-tbl-num = <0>;
		gpio-req-tbl-flags = <0>;
		gpio-req-tbl-label = "CAM_RESET3";
		sensor-mode = <0>;
		cci-master = <1>;
		status = "ok";

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

+112 −0

Original line number	Diff line number	Diff line
		@@ -2002,6 +2002,118 @@
		};
		};

		cam_sensor0_active: cam_sensor0_active {
		/* intr gpio for bridge chip 0 */
		mux {
		pins = "gpio13";
		function = "gpio";
		};

		config {
		pins = "gpio13";
		bias-pull-up; /* PULL UP */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor0_suspend: cam_sensor0_suspend {
		/* intr gpio for bridge chip 0 */
		mux {
		pins = "gpio13";
		function = "gpio";
		};

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

		cam_sensor1_active: cam_sensor1_active {
		/* intr gpio for bridge chip 1 */
		mux {
		pins = "gpio14";
		function = "gpio";
		};

		config {
		pins = "gpio14";
		bias-pull-up; /* PULL UP*/
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor1_suspend: cam_sensor1_suspend {
		/* intr gpio for bridge chip 1 */
		mux {
		pins = "gpio14";
		function = "gpio";
		};

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

		cam_sensor2_active: cam_sensor2_active {
		/* intr gpio for bridge chip 2 */
		mux {
		pins = "gpio15";
		function = "gpio";
		};

		config {
		pins = "gpio15";
		bias-pull-up; /* PULL UP */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor2_suspend: cam_sensor2_suspend {
		/* intr gpio for bridge chip 2 */
		mux {
		pins = "gpio15";
		function = "gpio";
		};

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

		cam_sensor3_active: cam_sensor3_active {
		/* intr gpio for bridge chip 3 */
		mux {
		pins = "gpio16";
		function = "gpio";
		};

		config {
		pins = "gpio16";
		bias-pull-up; /* PULL UP */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor3_suspend: cam_sensor3_suspend {
		/* intr gpio for bridge chip 3 */
		mux {
		pins = "gpio16";
		function = "gpio";
		};

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

		cam_sensor_eldo2_default: cam_sensor_eldo2_default {
		/* AVDD ELDO2 */
		mux {

arch/arm64/boot/dts/qcom/sm6150-camera-sensor-adp.dtsi

+17 −17

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -33,14 +33,14 @@
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk";

		gpios = <&tlmm 43 0>,
		<&tlmm 28 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK0",
		"CAM_RESET0";
		pinctrl-names = "sensor_default", "sensor_suspend";
		pinctrl-0 = <&cam_sensor0_active>;
		pinctrl-1 = <&cam_sensor0_suspend>;
		gpios = <&tlmm 28 0>;
		gpio-reset = <0>;
		gpio-req-tbl-num = <0>;
		gpio-req-tbl-flags = <0>;
		gpio-req-tbl-label = "CAM_RESET0";
		sensor-mode = <0>;
		cci-master = <0>;
		status = "ok";
		@@ -65,14 +65,14 @@
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk";

		gpios = <&tlmm 31 0>,
		<&tlmm 29 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK1",
		"CAM_RESET1";
		pinctrl-names = "sensor_default", "sensor_suspend";
		pinctrl-0 = <&cam_sensor1_active>;
		pinctrl-1 = <&cam_sensor1_suspend>;
		gpios = <&tlmm 29 0>;
		gpio-reset = <0>;
		gpio-req-tbl-num = <0>;
		gpio-req-tbl-flags = <0>;
		gpio-req-tbl-label = "CAM_RESET1";
		sensor-mode = <0>;
		cci-master = <0>;
		status = "ok";

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

+57 −0

Original line number	Diff line number	Diff line
		@@ -1712,6 +1712,63 @@
		};
		};


		cam_sensor0_active: cam_sensor0_active {
		/* intr gpio for bridge chip 0 */
		mux {
		pins = "gpio43";
		function = "gpio";
		};

		config {
		pins = "gpio43";
		bias-pull-up; /* PULL UP */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor0_suspend: cam_sensor0_suspend {
		/* intr gpio for bridge chip 0 */
		mux {
		pins = "gpio43";
		function = "gpio";
		};

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

		cam_sensor1_active: cam_sensor1_active {
		/* intr gpio for bridge chip 1 */
		mux {
		pins = "gpio31";
		function = "gpio";
		};

		config {
		pins = "gpio31";
		bias-pull-up; /* PULL UP*/
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor1_suspend: cam_sensor1_suspend {
		/* intr gpio for bridge chip 1 */
		mux {
		pins = "gpio31";
		function = "gpio";
		};

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

		flash_led3_front {
		flash_led3_front_en: flash_led3_front_en {
		mux {

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

+112 −0

Original line number	Diff line number	Diff line
		@@ -3964,6 +3964,118 @@
		};
		};

		cam_sensor0_active: cam_sensor0_active {
		/* intr gpio for bridge chip 0 */
		mux {
		pins = "gpio13";
		function = "gpio";
		};

		config {
		pins = "gpio13";
		bias-pull-up; /* PULL UP */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor0_suspend: cam_sensor0_suspend {
		/* intr gpio for bridge chip 0 */
		mux {
		pins = "gpio13";
		function = "gpio";
		};

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

		cam_sensor1_active: cam_sensor1_active {
		/* intr gpio for bridge chip 1 */
		mux {
		pins = "gpio14";
		function = "gpio";
		};

		config {
		pins = "gpio14";
		bias-pull-up; /* PULL UP*/
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor1_suspend: cam_sensor1_suspend {
		/* intr gpio for bridge chip 1 */
		mux {
		pins = "gpio14";
		function = "gpio";
		};

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

		cam_sensor2_active: cam_sensor2_active {
		/* intr gpio for bridge chip 2 */
		mux {
		pins = "gpio15";
		function = "gpio";
		};

		config {
		pins = "gpio15";
		bias-pull-up; /* PULL UP */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor2_suspend: cam_sensor2_suspend {
		/* intr gpio for bridge chip 2 */
		mux {
		pins = "gpio15";
		function = "gpio";
		};

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

		cam_sensor3_active: cam_sensor3_active {
		/* intr gpio for bridge chip 3 */
		mux {
		pins = "gpio16";
		function = "gpio";
		};

		config {
		pins = "gpio16";
		bias-pull-up; /* PULL UP */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor3_suspend: cam_sensor3_suspend {
		/* intr gpio for bridge chip 3 */
		mux {
		pins = "gpio16";
		function = "gpio";
		};

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

		cam_sensor_eldo2_default: cam_sensor_eldo2_default {
		/* AVDD ELDO2 */
		mux {