Merge "ARM: dts: msm: Reset GPIO configuration for flash on 8909 MTP" (fe157034) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/msm8909-camera-sensor-mtp.dtsi

+6 −4

Original line number	Diff line number	Diff line
		@@ -105,13 +105,15 @@
		pinctrl-0 = <&cam_sensor_flash_default>;
		pinctrl-1 = <&cam_sensor_flash_sleep>;
		gpios = <&msm_gpio 31 0>,
		<&msm_gpio 32 0>;
		<&msm_gpio 32 0>,
		<&msm_gpio 36 0>;
		qcom,gpio-flash-en = <0>;
		qcom,gpio-flash-now = <1>;
		qcom,gpio-req-tbl-num = <0 1>;
		qcom,gpio-req-tbl-flags = <0 0>;
		qcom,gpio-flash-rst = <2>;
		qcom,gpio-req-tbl-num = <0 1 2>;
		qcom,gpio-req-tbl-flags = <0 0 0>;
		qcom,gpio-req-tbl-label = "FLASH_EN",
		"FLASH_NOW";
		"FLASH_NOW", "FLASH_RST";
		qcom,cci-master = <0>;
		};

+19 −12

Original line number	Diff line number	Diff line
		@@ -137,21 +137,28 @@
		};
		};

		cam_sensor_flash {
		cam_sensor_flash_default: cam_sensor_flash_default {
		/* FLASH_RESET,FLASH_EN,FLASH_NOW */
		qcom,pins = "gpio 36", "gpio 31", "gpio 32";
		qcom,num-grp-pins = <3>;
		qcom,pin-func = <0>;
		label = "cam_sensor_flash";
		/* active state */
		cam_sensor_flash_default: default {
		mux {
		pins = "gpio36", "gpio31", "gpio32";
		function = "gpio";
		};
		config {
		pins = "gpio36", "gpio31", "gpio32";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		bias-disable = <0>; /* No PULL */
		};
		/* suspended state */
		cam_sensor_flash_sleep: sleep {
		};

		cam_sensor_flash_sleep: cam_sensor_flash_sleep {
		mux {
		pins = "gpio36", "gpio31", "gpio32";
		function = "gpio";
		};
		config {
		pins = "gpio36", "gpio31", "gpio32";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		bias-pull-down = <0>; /* PULL DOWN */
		};
		};