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

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

Merge "msm: msm8916: camera: Add ov5645 sensor driver and device tree changes"

parents 7edbae3d 8e6cf43a

Documentation/devicetree/bindings/media/video/msm-cci.txt

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ Required properties: 
    - "shinetech,gc0339"

    - "shinetech,hi256"

    - "shinetech,s5k4e1"

    - "ovti,ov5645"

- reg : should contain i2c slave address of the device

- qcom,csiphy-sd-index : should contain csiphy instance that will used to

    receive sensor data

arch/arm/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 




	qcom,camera@78 {

		compatible = "qcom,ov5645";

		compatible = "ovti,ov5645";

		reg = <0x78 0x0>;

		qcom,slave-id = <0x78 0x300a 0x5645>;

		qcom,csiphy-sd-index = <1>;

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 




	qcom,camera@78 {

		compatible = "qcom,ov5645";

		compatible = "ovti,ov5645";

		reg = <0x78 0x0>;

		qcom,slave-id = <0x78 0x300a 0x5645>;

		qcom,csiphy-sd-index = <1>;

drivers/media/platform/msm/camera_v2/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -164,6 +164,14 @@ config MT9M114 
		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 SP1628

	bool "Sensor SP1628 (YUV 720P)"

drivers/media/platform/msm/camera_v2/sensor/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,5 +15,6 @@ obj-$(CONFIG_OV9724) += ov9724.o 
obj-$(CONFIG_HI256) += hi256.o

obj-$(CONFIG_OV5648) += ov5648.o

obj-$(CONFIG_MT9M114) += mt9m114.o

obj-$(CONFIG_MT9M114) += ov5645.o

obj-$(CONFIG_SP1628) += sp1628.o

obj-$(CONFIG_GC0339) += gc0339.o