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

Commit 2f3b6f05 authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  Add Main Camera AF Driver
  Add IMX486 Camera Driver for EP1

Change-Id: I7befe1e05fcad5793c91a62aabd817803c29e770
parents 382f100b 7639f56c

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-mtp.dtsi

100644 → 100755
+16 −17
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8953_l17>;

//		cam_vaf-supply = <&pm8953_l17>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-min-voltage = <2850000>;

		qcom,cam-vreg-max-voltage = <2850000>;
@@ -195,18 +195,17 @@ 
		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

		qcom,led-flash-src = <&led_flash0>;

		qcom,eeprom-src = <&eeprom0>;

//		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vaf-supply = <&pm8953_l17>;

//		cam_vio-supply = <&pm8953_l6>;

//		cam_vdig-supply = <&pm8953_l2>;

//		cam_vaf-supply = <&pm8953_l17>;

		cam_vana-supply = <&pm8953_l22>;

		cam_v_custom1-supply = <&pm8953_l23>;

		qcom,cam-vreg-name = "cam_vio", "cam_vdig", "cam_vaf",

						"cam_vana", "cam_v_custom1";

		qcom,cam-vreg-min-voltage = <0 1200000 2850000 2800000 1200000>;

		qcom,cam-vreg-max-voltage = <0 1200000 2850000 2800000 1200000>;

		qcom,cam-vreg-op-mode = <0 105000 100000 80000 105000>;

		cam_v_custom1-supply = <&pm8953_l2>;

		qcom,cam-vreg-name = "cam_vana", "cam_v_custom1";

		qcom,cam-vreg-min-voltage = <2800000 1200000>;

		qcom,cam-vreg-max-voltage = <2800000 1200000>;

		qcom,cam-vreg-op-mode = <80000 105000>;

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default
@@ -215,17 +214,17 @@ 
				&cam_sensor_rear_vana_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 40 0>,

			<&tlmm 39 0>,

			<&tlmm 134 0>;

			<&tlmm 130 0>,

			<&tlmm 128 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vana = <3>;

		qcom,gpio-vio = <2>;

		qcom,gpio-vaf = <3>;

		qcom,gpio-req-tbl-num = <0 1 2 3>;

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

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

			"CAM_RESET0",

			"CAM_STANDBY0",

			"CAM_VANA";

			"CAM_VIO",

			"CAM_VAF";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

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

+4 −4
Original line number Diff line number Diff line
@@ -234,12 +234,12 @@ 
		cam_sensor_rear_vana: cam_sensor_rear_vdig {

			/* VDIG */

			mux {

				pins = "gpio134";

				pins = "gpio128";

				function = "gpio";

			};



			config {

				pins = "gpio134";

				pins = "gpio128";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};
@@ -248,12 +248,12 @@ 
		cam_sensor_rear_vana_sleep: cam_sensor_rear_vdig_sleep {

			/* VDIG */

			mux {

				pins = "gpio134";

				pins = "gpio128";

				function = "gpio";

			};



			config {

				pins = "gpio134";

				pins = "gpio128";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};