Skip to content

Commit

Permalink
drivers: media: video: Removed unneeded sensor drivers
Browse files Browse the repository at this point in the history
  • Loading branch information
sirmordred committed May 30, 2015
1 parent 284d85d commit cf55d42
Show file tree
Hide file tree
Showing 40 changed files with 16 additions and 58,593 deletions.
112 changes: 16 additions & 96 deletions drivers/media/video/msm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,104 +12,30 @@ config MSM_CAMERA_V4L2
comment "Camera Sensor Selection"

config OEM_CAMERA
bool "use oem camera feature"
default y
bool "use oem camera feature"
default y

config USE_QUP_I2C
bool "use qup i2c feature"
default y
config SENSOR_MC7
bool "Fujitsu MC7 ISP (BAYER 5M)"
default n
bool "use qup i2c feature"
default y

config SENSOR_CE147
bool "NEC ISP (BAYER 5M)"
default n
bool "NEC ISP (BAYER 5M)"
default n

config SENSOR_S5K4ECGX
bool "LSI (BAYER 5M)"
default n
bool "LSI (BAYER 5M)"
default n

config SENSOR_S5KA3DFX
bool "LSI CIS (VGA)"
default n
config MT9T013
bool "Sensor mt9t013 (BAYER 3M)"
depends on MSM_CAMERA && !ARCH_MSM8X60 && !MSM_CAMERA_V4L2
default y
---help---
MICRON 3M Bayer Sensor with AutoFocus
config MT9D112
bool "Sensor mt9d112 (YUV 2M)"
depends on MSM_CAMERA && !ARCH_MSM8X60 && !MSM_CAMERA_V4L2
default y
---help---
MICRON 2M YUV Sensor
config IMX074
bool "Sensor IMX074 (BAYER 13.5M)"
depends on MSM_CAMERA && ARCH_MSM8X60 && !MSM_CAMERA_V4L2
default y
---help---
SONY 13.5 MP Bayer Sensor
bool "LSI CIS (VGA)"
default n

config SENSOR_S5K5CCAF
bool "Sensor s5k5cc 1/5 (3M/AF)"
default n
---help---
SAMSUNG 3M CMOS Sensor
config WEBCAM_OV7692
bool "Sensor OV7692 (VGA YUV)"
depends on MSM_CAMERA && ARCH_MSM8X60 && !MSM_CAMERA_V4L2
default y
---help---
Omni Vision VGA YUV Sensor.
# This Senosr is used as a webcam.
# This uses the CSI interface.
# Need to enable CSI1 clks for this sensor.
config VX6953
bool "Sensor VX6953 (BAYER 5M)"
depends on MSM_CAMERA && ARCH_MSM7X30
default y
---help---
STM 5M Bayer Sensor with EDOF
config SN12M0PZ
bool "Sensor sn12m0pz (Bayer 12 MP)"
depends on MSM_CAMERA && ARCH_MSM7X30 && !MSM_CAMERA_V4L2
default y
---help---
Sony 12 MP Bayer Sensor
config MT9P012
bool "Sensor mt9p012 (BAYER 5M)"
depends on MSM_CAMERA && !ARCH_MSM8X60 && !MSM_CAMERA_V4L2
default y
---help---
MICRON 5M Bayer Sensor with Autofocus

choice
prompt "AF module"
depends on MT9P012 && !ARCH_MSM8X60 && !MSM_CAMERA_V4L2
default MSM_CAMERA_AF_FOXCONN

config MSM_CAMERA_AF_FOXCONN
bool "FOXCONN Module"
help
This driver supports FOXCONN AF module for 5M Bayer sensor

config MSM_CAMERA_AF_BAM
bool "BAM Module"
help
This driver supports BAM AF module for 5M Bayer sensor

endchoice

config MT9P012_KM
bool "Sensor mt9p012 KM module (BAYER 5M)"
depends on MSM_CAMERA && !ARCH_MSM8X60 && !MSM_CAMERA_V4L2
default y
---help---
MICRON 5M Bayer Sensor KM modules with Autofocus

config MT9E013
bool "Sensor mt9e013 module (BAYER 8M)"
depends on MSM_CAMERA && ARCH_MSM7X30 && !MSM_CAMERA_V4L2
default y
---help---
Aptina 8M Bayer Sensor modules with Autofocus

config S5K3E2FX
bool "Sensor s5k3e2fx (Samsung 5M)"
Expand All @@ -118,12 +44,6 @@ config S5K3E2FX
---help---
Samsung 5M with Autofocus

config VB6801
bool "Sensor vb6801"
depends on MSM_CAMERA && !ARCH_MSM8X60 && !MSM_CAMERA_V4L2
---help---
5M with flash

config MSM_CAMERA_FLASH
bool "Qualcomm MSM camera flash support"
depends on MSM_CAMERA
Expand Down Expand Up @@ -164,4 +84,4 @@ config SENSOR_SR030PC30_T679
default n
config SENSOR_SR130PC10
bool "use SGH-I847[Apache ATT] VGA camera feature"
default n
default n
19 changes: 0 additions & 19 deletions drivers/media/video/msm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,10 @@ endif
obj-$(CONFIG_ARCH_MSM_ARM11) += msm_vfe7x.o msm_io7x.o
obj-$(CONFIG_ARCH_MSM7X30) += msm_vfe31.o msm_io_vfe31.o msm_vpe1.o
obj-$(CONFIG_ARCH_QSD8X50) += msm_vfe8x.o msm_vfe8x_proc.o msm_io8x.o
obj-$(CONFIG_ARCH_MSM8X60) += msm_vfe31.o msm_io_8x60.o msm_vpe1.o
obj-$(CONFIG_MT9T013) += mt9t013.o mt9t013_reg.o
obj-$(CONFIG_SN12M0PZ) += sn12m0pz.o sn12m0pz_reg.o
obj-$(CONFIG_MT9P012) += mt9p012_reg.o
obj-$(CONFIG_MSM_CAMERA_AF_FOXCONN) += mt9p012_fox.o
obj-$(CONFIG_MSM_CAMERA_AF_BAM) += mt9p012_bam.o
obj-$(CONFIG_MT9P012_KM) += mt9p012_km.o mt9p012_km_reg.o
obj-$(CONFIG_MT9E013) += mt9e013.o mt9e013_reg.o
obj-$(CONFIG_S5K3E2FX) += s5k3e2fx.o
#FIXME: Merge the two ifeq causes VX6953 preview not coming up.
ifeq ($(CONFIG_MSM_CAMERA_V4L2),y)
obj-$(CONFIG_VX6953) += vx6953_v4l2.o vx6953_reg_v4l2.o
else
obj-$(CONFIG_VX6953) += vx6953.o vx6953_reg.o
endif
obj-$(CONFIG_VB6801) += vb6801.o
obj-$(CONFIG_IMX074) += imx074.o imx074_reg.o
obj-$(CONFIG_WEBCAM_OV7692) += ov7692.o
obj-$(CONFIG_SENSOR_MC7) += lsi_mc7.o
obj-$(CONFIG_SENSOR_CE147) += ce147.o
obj-$(CONFIG_SENSOR_S5KA3DFX) += s5ka3dfx.o
obj-$(CONFIG_SENSOR_S5K4ECGX) += s5k4ecgx.o
obj-$(CONFIG_MT9D112) += mt9d112.o mt9d112_reg.o
obj-$(CONFIG_MSM_GEMINI) += msm_gemini_dev.o msm_gemini_sync.o msm_gemini_core.o msm_gemini_hw.o msm_gemini_platform.o
obj-$(CONFIG_SENSOR_S5K5CCAF) += s5k5ccaf.o
obj-$(CONFIG_SENSOR_SR030PC30) += sr030pc30.o
Expand Down
Loading

0 comments on commit cf55d42

Please sign in to comment.