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

Commit 32829884 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Move YUV driver to userpsace"

parents 86f7c9e4 f35f5a28
Loading
Loading
Loading
Loading
+39 −52
Original line number Diff line number Diff line
@@ -63,15 +63,6 @@ MSM sensor node contains properties of camera sensor
Required properties:
- compatible : should be manufacturer name followed by sensor name
    - "qcom,camera"
    - "qcom,s5k3l1yx"
    - "sne,imx134"
    - "qcom,imx135"
    - "shinetech,gc0339"
    - "shinetech,hi256"
    - "shinetech,s5k4e1"
    - "ovti,ov2685"
    - "ovti,ov5645"
    - "qcom,mt9m114"
- reg : should contain i2c slave address of the device
- qcom,csiphy-sd-index : should contain csiphy instance that will used to
    receive sensor data
@@ -274,48 +265,44 @@ Example:
		qcom,cam-vreg-op-mode = <100000>;
        };

       qcom,s5k3l1yx@6e {
               compatible = "qcom,s5k3l1yx";
               reg = <0x6e>;
               qcom,slave-id = <0x6e 0x0 0x3121>;
               qcom,csiphy-sd-index = <2>;
	qcom,camera@0 {
		cell-index = <0>;
		compatible = "qcom,camera";
		reg = <0x0>;
		qcom,csiphy-sd-index = <0>;
		qcom,csid-sd-index = <0>;
               qcom,actuator-src = <&actuator0>;
               qcom,eeprom-src = <&eeprom0 &eeprom1>;
               qcom,led-flash-src = <&led_flash0>;
		qcom,mount-angle = <90>;
               qcom,sensor-name = "s5k3l1yx";
               qcom,vdd-cx-supply = <&pm8841_s2>;
               qcom,vdd-cx-name = "qcom,vdd-cx";
               cam_vdig-supply = <&pm8941_l3>;
               cam_vana-supply = <&pm8941_l17>;
               cam_vio-supply = <&pm8941_lvs3>;
               cam_vaf-supply = <&pm8941_l23>;
               qcom,cam-vreg-name = "cam_vdig", "cam_vana", "cam_vio", "cam_vaf";
               qcom,cam-vreg-min-voltage = <1225000 2850000 0 3000000>;
               qcom,cam-vreg-max-voltage = <1225000 2850000 0 3000000>;
               qcom,cam-vreg-op-mode = <105000 80000 0 100000>;
		qcom,led-flash-src = <&led_flash0>;
		qcom,actuator-src = <&actuator0>;
		qcom,eeprom-src = <&eeprom0>;
		cam_vdig-supply = <&pm8994_s3>;
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l17>;
		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;
		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
		qcom,cam-vreg-op-mode = <105000 0 80000>;
		qcom,gpio-no-mux = <0>;
               gpios = <&msmgpio 15 0>,
                       <&msmgpio 90 0>,
                       <&msmgpio 89 0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_rear_active>;
		pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_rear_suspend>;
		gpios = <&tlmm 13 0>,
			<&tlmm 30 0>,
			<&tlmm 29 0>;
		qcom,gpio-reset = <1>;
		qcom,gpio-standby = <2>;
		qcom,gpio-req-tbl-num = <0 1 2>;
		qcom,gpio-req-tbl-flags = <1 0 0>;
               qcom,gpio-req-tbl-label = "CAMIF_MCLK",
                                         "CAM_RESET1",
                                         "CAM_STANDBY";
               qcom,gpio-set-tbl-num = <1 1>;
               qcom,gpio-set-tbl-flags = <0 2>;
               qcom,gpio-set-tbl-delay = <1000 4000>;
               qcom,csi-lane-assign = <0x4320>;
               qcom,csi-lane-mask = <0x1F>;
               qcom,csi-phy-sel = <0>;
		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",
					  "CAM_RESET0",
					  "CAM_STANDBY0";
		qcom,sensor-position = <0>;
               qcom,sensor-mode = <1>;
               qcom,mclk-23880000
       };
		qcom,sensor-mode = <0>;
		qcom,cci-master = <0>;
		status = "ok";
		clocks = <&clock_mmss clk_mclk0_clk_src>,
				<&clock_mmss clk_camss_mclk0_clk>;
		clock-names = "cam_src_clk", "cam_clk";
	};

&i2c_freq_100Khz {
+0 −41
Original line number Diff line number Diff line
@@ -408,47 +408,6 @@
		clock-names = "cam_src_clk", "cam_clk";
	};

	qcom,camera@90 {
		cell-index = <1>;
		compatible = "qcom,mt9m114";
		reg = <0x90>;
		qcom,slave-id = <0x90 0x0 0x2481>;
		qcom,csiphy-sd-index = <1>;
		qcom,csid-sd-index = <1>;
		qcom,mount-angle = <90>;
		qcom,sensor-name = "mt9m114";
		cam_vdig-supply = <&pm8994_l27>;
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pmi8994_boostbypass>;
		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
		qcom,cam-vreg-min-voltage = <1000000 0 3150000>;
		qcom,cam-vreg-max-voltage = <1000000 0 3600000>;
		qcom,cam-vreg-op-mode = <105000 0 80000>;
		qcom,gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_rear2_active>;
		pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_rear2_suspend>;
		gpios = <&tlmm 14 0>,
			<&tlmm 63 0>,
			<&tlmm 62 0>;
		qcom,gpio-reset = <1>;
		qcom,gpio-req-tbl-num = <0 1>;
		qcom,gpio-req-tbl-flags = <1 0>;
		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",
					  "CAM_RESET1";
		qcom,gpio-set-tbl-num = <1 1>;
		qcom,gpio-set-tbl-flags = <0 2>;
		qcom,gpio-set-tbl-delay = <1000 30000>;
		qcom,csi-lane-assign = <0x4321>;
		qcom,csi-lane-mask = <0x3>;
		qcom,sensor-position = <1>;
		qcom,sensor-mode = <1>;
		qcom,cci-master = <0>;
		clocks = <&clock_mmss clk_mclk1_clk_src>,
			<&clock_mmss clk_camss_mclk1_clk>;
		clock-names = "cam_src_clk", "cam_clk";
	};

	qcom,camera@2 {
		cell-index = <2>;
		compatible = "qcom,camera";
+0 −44
Original line number Diff line number Diff line
@@ -140,15 +140,6 @@ config OV9724
		hfr video at 60, 90 and 120 fps. This sensor driver does
		not support auto focus.

config HI256
        bool "Hynix hi256 (YUV 2MP)"
        depends on MSMB_CAMERA
        ---help---
                OmniVision 8 MP Bayer Sensor with auto focus.uses
                2 mipi lanes, preview config = 1632*1224 30 fps,
                snapshot config = 3264 * 2448 at 18 fps.
                2 lanes max fps is 18, 4 lanes max fps is 24.

config OV5648
	bool "Sensor OV5648 (BAYER 5M)"
	depends on MSMB_CAMERA
@@ -158,41 +149,6 @@ config OV5648
		snapshot set to 2592*1944 at 12 fps,
		This sensor driver does not support auto focus.

config MT9M114
	bool "Sensor MT9M114 (YUV 1.26MP)"
	depends on MSMB_CAMERA
	---help---
		MT9M114 is Aptina YUV sensor. It supports 1.26 MP preview
		and snapshot. The preview and snapshot resolution shall be
		1280 * 270. It does not support auto focus. It supports
		few special effects like saturation.
config OV5645
	bool "Sensor OV5645 (YUV 5.0MP)"
	depends on MSMB_CAMERA
	---help---
		OV5645 is Omnivision YUV sensor. It supports 5.0 MP preview
		and snapshot. The preview and snapshot resolution shall be
		1280 * 270. It does not support auto focus. It supports
		few special effects like saturation.

config OV2685
	bool "Sensor OV2685 (YUV 1.92MP)"
	depends on MSMB_CAMERA
	---help---
		OV2685 is Omnivision YUV sensor. It supports 1.92 MP preview
		and snapshot. The preview and snapshot resolution shall be
		1600 * 1200 at 30fps. It supports 1080 * 720 at 60fps.It does
		not support auto focus. It supports 2 mipi lanes.

config SP1628
	bool "Sensor SP1628 (YUV 720P)"
	depends on MSMB_CAMERA
	---help---
		SP1628 is SuperPix YUV sensor. It supports 720P preview
		and snapshot. The preview and snapshot resolution shall be
		1280 * 270. It does not support auto focus. It supports
		few special effects like mono.

config GC0339
	bool "Sensor GC0339 (BAYER .3M)"
	depends on MSMB_CAMERA
+0 −3
Original line number Diff line number Diff line
@@ -5,6 +5,3 @@ ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci
obj-$(CONFIG_MSMB_CAMERA) += cci/ io/ csiphy/ csid/ actuator/ eeprom/ ois/ flash/
obj-$(CONFIG_MSM_CAMERA_SENSOR) += msm_sensor_init.o msm_sensor_driver.o msm_sensor.o
obj-$(CONFIG_MT9M114) += mt9m114.o
obj-$(CONFIG_OV5645) += ov5645.o
obj-$(CONFIG_OV2685) += ov2685.o
+0 −1668

File deleted.

Preview size limit exceeded, changes collapsed.

Loading