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

Commit c61e74e3 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Mauro Carvalho Chehab
Browse files

[media] media: mt9m111: move mt9m111 out of soc_camera 



As the mt9m111 is now working as a standalone v4l2 subdevice sensor,
move it out of soc_camera directory and sever its dependency on
soc_camera.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 1a412faa

drivers/media/i2c/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -578,6 +578,13 @@ config VIDEO_MT9M032 
	  This driver supports MT9M032 camera sensors from Aptina, monochrome

	  models only.



config VIDEO_MT9M111

	tristate "mt9m111, mt9m112 and mt9m131 support"

	depends on I2C && VIDEO_V4L2

	help

	  This driver supports MT9M111, MT9M112 and MT9M131 cameras from

	  Micron/Aptina



config VIDEO_MT9P031

	tristate "Aptina MT9P031 support"

	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API

drivers/media/i2c/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ obj-$(CONFIG_VIDEO_OV7640) += ov7640.o 
obj-$(CONFIG_VIDEO_OV7670) += ov7670.o

obj-$(CONFIG_VIDEO_OV9650) += ov9650.o

obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o

obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o

obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o

obj-$(CONFIG_VIDEO_MT9T001) += mt9t001.o

obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o

drivers/media/i2c/soc_camera/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -14,11 +14,14 @@ config SOC_CAMERA_MT9M001 
	  and colour models.



config SOC_CAMERA_MT9M111

	tristate "mt9m111, mt9m112 and mt9m131 support"

	tristate "legacy soc_camera mt9m111, mt9m112 and mt9m131 support"

	depends on SOC_CAMERA && I2C

	select VIDEO_MT9M111

	help

	  This driver supports MT9M111, MT9M112 and MT9M131 cameras from

	  Micron/Aptina

	  Micron/Aptina.

	  This is the legacy configuration which shouldn't be used anymore,

	  while VIDEO_MT9M111 should be used instead.



config SOC_CAMERA_MT9T031

	tristate "mt9t031 support"

drivers/media/i2c/soc_camera/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_SOC_CAMERA_IMX074)		+= imx074.o

obj-$(CONFIG_SOC_CAMERA_MT9M001)	+= mt9m001.o

obj-$(CONFIG_SOC_CAMERA_MT9M111)	+= mt9m111.o

obj-$(CONFIG_SOC_CAMERA_MT9T031)	+= mt9t031.o

obj-$(CONFIG_SOC_CAMERA_MT9T112)	+= mt9t112.o

obj-$(CONFIG_SOC_CAMERA_MT9V022)	+= mt9v022.o