[media] move soc_camera i2c drivers into its own dir

+4

drivers/media/i2c/Kconfig

··· 562 562 To compile this driver as a module, choose M here: the 563 563 module will be called m52790. 564 564 565 + if SOC_CAMERA 566 + source "drivers/media/i2c/soc_camera/Kconfig" 567 + endif 568 + 565 569 endmenu 566 570 endif

+1

drivers/media/i2c/Makefile

··· 4 4 obj-$(CONFIG_VIDEO_SMIAPP) += smiapp/ 5 5 obj-$(CONFIG_VIDEO_CX25840) += cx25840/ 6 6 obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/ 7 + obj-y += soc_camera/ 7 8 8 9 obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o 9 10 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o

+89

drivers/media/i2c/soc_camera/Kconfig

··· 1 + comment "soc_camera sensor drivers" 2 + 3 + config SOC_CAMERA_IMX074 4 + tristate "imx074 support" 5 + depends on SOC_CAMERA && I2C 6 + help 7 + This driver supports IMX074 cameras from Sony 8 + 9 + config SOC_CAMERA_MT9M001 10 + tristate "mt9m001 support" 11 + depends on SOC_CAMERA && I2C 12 + select GPIO_PCA953X if MT9M001_PCA9536_SWITCH 13 + help 14 + This driver supports MT9M001 cameras from Micron, monochrome 15 + and colour models. 16 + 17 + config SOC_CAMERA_MT9M111 18 + tristate "mt9m111, mt9m112 and mt9m131 support" 19 + depends on SOC_CAMERA && I2C 20 + help 21 + This driver supports MT9M111, MT9M112 and MT9M131 cameras from 22 + Micron/Aptina 23 + 24 + config SOC_CAMERA_MT9T031 25 + tristate "mt9t031 support" 26 + depends on SOC_CAMERA && I2C 27 + help 28 + This driver supports MT9T031 cameras from Micron. 29 + 30 + config SOC_CAMERA_MT9T112 31 + tristate "mt9t112 support" 32 + depends on SOC_CAMERA && I2C 33 + help 34 + This driver supports MT9T112 cameras from Aptina. 35 + 36 + config SOC_CAMERA_MT9V022 37 + tristate "mt9v022 support" 38 + depends on SOC_CAMERA && I2C 39 + select GPIO_PCA953X if MT9V022_PCA9536_SWITCH 40 + help 41 + This driver supports MT9V022 cameras from Micron 42 + 43 + config SOC_CAMERA_OV2640 44 + tristate "ov2640 camera support" 45 + depends on SOC_CAMERA && I2C 46 + help 47 + This is a ov2640 camera driver 48 + 49 + config SOC_CAMERA_OV5642 50 + tristate "ov5642 camera support" 51 + depends on SOC_CAMERA && I2C 52 + help 53 + This is a V4L2 camera driver for the OmniVision OV5642 sensor 54 + 55 + config SOC_CAMERA_OV6650 56 + tristate "ov6650 sensor support" 57 + depends on SOC_CAMERA && I2C 58 + ---help--- 59 + This is a V4L2 SoC camera driver for the OmniVision OV6650 sensor 60 + 61 + config SOC_CAMERA_OV772X 62 + tristate "ov772x camera support" 63 + depends on SOC_CAMERA && I2C 64 + help 65 + This is a ov772x camera driver 66 + 67 + config SOC_CAMERA_OV9640 68 + tristate "ov9640 camera support" 69 + depends on SOC_CAMERA && I2C 70 + help 71 + This is a ov9640 camera driver 72 + 73 + config SOC_CAMERA_OV9740 74 + tristate "ov9740 camera support" 75 + depends on SOC_CAMERA && I2C 76 + help 77 + This is a ov9740 camera driver 78 + 79 + config SOC_CAMERA_RJ54N1 80 + tristate "rj54n1cb0c support" 81 + depends on SOC_CAMERA && I2C 82 + help 83 + This is a rj54n1cb0c video driver 84 + 85 + config SOC_CAMERA_TW9910 86 + tristate "tw9910 support" 87 + depends on SOC_CAMERA && I2C 88 + help 89 + This is a tw9910 video driver

+14

drivers/media/i2c/soc_camera/Makefile

··· 1 + obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o 2 + obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o 3 + obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o 4 + obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o 5 + obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o 6 + obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o 7 + obj-$(CONFIG_SOC_CAMERA_OV2640) += ov2640.o 8 + obj-$(CONFIG_SOC_CAMERA_OV5642) += ov5642.o 9 + obj-$(CONFIG_SOC_CAMERA_OV6650) += ov6650.o 10 + obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o 11 + obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o 12 + obj-$(CONFIG_SOC_CAMERA_OV9740) += ov9740.o 13 + obj-$(CONFIG_SOC_CAMERA_RJ54N1) += rj54n1cb0c.o 14 + obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o

-87

drivers/media/video/Kconfig

··· 127 127 over a bus like PCI or USB. For example some i2c camera connected 128 128 directly to the data bus of an SoC. 129 129 130 - config SOC_CAMERA_IMX074 131 - tristate "imx074 support" 132 - depends on SOC_CAMERA && I2C 133 - help 134 - This driver supports IMX074 cameras from Sony 135 - 136 - config SOC_CAMERA_MT9M001 137 - tristate "mt9m001 support" 138 - depends on SOC_CAMERA && I2C 139 - select GPIO_PCA953X if MT9M001_PCA9536_SWITCH 140 - help 141 - This driver supports MT9M001 cameras from Micron, monochrome 142 - and colour models. 143 - 144 - config SOC_CAMERA_MT9M111 145 - tristate "mt9m111, mt9m112 and mt9m131 support" 146 - depends on SOC_CAMERA && I2C 147 - help 148 - This driver supports MT9M111, MT9M112 and MT9M131 cameras from 149 - Micron/Aptina 150 - 151 - config SOC_CAMERA_MT9T031 152 - tristate "mt9t031 support" 153 - depends on SOC_CAMERA && I2C 154 - help 155 - This driver supports MT9T031 cameras from Micron. 156 - 157 - config SOC_CAMERA_MT9T112 158 - tristate "mt9t112 support" 159 - depends on SOC_CAMERA && I2C 160 - help 161 - This driver supports MT9T112 cameras from Aptina. 162 - 163 - config SOC_CAMERA_MT9V022 164 - tristate "mt9v022 support" 165 - depends on SOC_CAMERA && I2C 166 - select GPIO_PCA953X if MT9V022_PCA9536_SWITCH 167 - help 168 - This driver supports MT9V022 cameras from Micron 169 - 170 - config SOC_CAMERA_RJ54N1 171 - tristate "rj54n1cb0c support" 172 - depends on SOC_CAMERA && I2C 173 - help 174 - This is a rj54n1cb0c video driver 175 - 176 - config SOC_CAMERA_TW9910 177 - tristate "tw9910 support" 178 - depends on SOC_CAMERA && I2C 179 - help 180 - This is a tw9910 video driver 181 130 182 131 config SOC_CAMERA_PLATFORM 183 132 tristate "platform camera support" 184 133 depends on SOC_CAMERA 185 134 help 186 135 This is a generic SoC camera platform driver, useful for testing 187 - 188 - config SOC_CAMERA_OV2640 189 - tristate "ov2640 camera support" 190 - depends on SOC_CAMERA && I2C 191 - help 192 - This is a ov2640 camera driver 193 - 194 - config SOC_CAMERA_OV5642 195 - tristate "ov5642 camera support" 196 - depends on SOC_CAMERA && I2C 197 - help 198 - This is a V4L2 camera driver for the OmniVision OV5642 sensor 199 - 200 - config SOC_CAMERA_OV6650 201 - tristate "ov6650 sensor support" 202 - depends on SOC_CAMERA && I2C 203 - ---help--- 204 - This is a V4L2 SoC camera driver for the OmniVision OV6650 sensor 205 - 206 - config SOC_CAMERA_OV772X 207 - tristate "ov772x camera support" 208 - depends on SOC_CAMERA && I2C 209 - help 210 - This is a ov772x camera driver 211 - 212 - config SOC_CAMERA_OV9640 213 - tristate "ov9640 camera support" 214 - depends on SOC_CAMERA && I2C 215 - help 216 - This is a ov9640 camera driver 217 - 218 - config SOC_CAMERA_OV9740 219 - tristate "ov9740 camera support" 220 - depends on SOC_CAMERA && I2C 221 - help 222 - This is a ov9740 camera driver 223 136 224 137 config MX1_VIDEO 225 138 bool

+1 -15

drivers/media/video/Makefile

··· 6 6 7 7 obj-$(CONFIG_VIDEO_VINO) += indycam.o 8 8 9 - obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o 10 - obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o 11 - obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o 12 - obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o 13 - obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o 14 - obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o 15 - obj-$(CONFIG_SOC_CAMERA_OV2640) += ov2640.o 16 - obj-$(CONFIG_SOC_CAMERA_OV5642) += ov5642.o 17 - obj-$(CONFIG_SOC_CAMERA_OV6650) += ov6650.o 18 - obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o 19 - obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o 20 - obj-$(CONFIG_SOC_CAMERA_OV9740) += ov9740.o 21 - obj-$(CONFIG_SOC_CAMERA_RJ54N1) += rj54n1cb0c.o 22 - obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o 23 - 24 9 obj-$(CONFIG_VIDEO_VINO) += vino.o 25 10 obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o 26 11 ··· 63 78 ccflags-y += -I$(srctree)/drivers/media/dvb-core 64 79 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends 65 80 ccflags-y += -I$(srctree)/drivers/media/tuners 81 + ccflags-y += -I$(srctree)/drivers/media/i2c/soc_camera

drivers/media/video/imx074.c drivers/media/i2c/soc_camera/imx074.c

drivers/media/video/mt9m001.c drivers/media/i2c/soc_camera/mt9m001.c

drivers/media/video/mt9m111.c drivers/media/i2c/soc_camera/mt9m111.c

drivers/media/video/mt9t031.c drivers/media/i2c/soc_camera/mt9t031.c

drivers/media/video/mt9t112.c drivers/media/i2c/soc_camera/mt9t112.c

drivers/media/video/mt9v022.c drivers/media/i2c/soc_camera/mt9v022.c

drivers/media/video/ov2640.c drivers/media/i2c/soc_camera/ov2640.c

drivers/media/video/ov5642.c drivers/media/i2c/soc_camera/ov5642.c

drivers/media/video/ov6650.c drivers/media/i2c/soc_camera/ov6650.c

drivers/media/video/ov772x.c drivers/media/i2c/soc_camera/ov772x.c

drivers/media/video/ov9640.c drivers/media/i2c/soc_camera/ov9640.c

drivers/media/video/ov9640.h drivers/media/i2c/soc_camera/ov9640.h

drivers/media/video/ov9740.c drivers/media/i2c/soc_camera/ov9740.c

drivers/media/video/rj54n1cb0c.c drivers/media/i2c/soc_camera/rj54n1cb0c.c

drivers/media/video/sh_mobile_csi2.c drivers/media/i2c/soc_camera/sh_mobile_csi2.c

drivers/media/video/soc_camera.c drivers/media/i2c/soc_camera/soc_camera.c

drivers/media/video/tw9910.c drivers/media/i2c/soc_camera/tw9910.c