Restore Sony camera driver

Change-Id: Id0e9c4ddf7f0aaf819c235f02fb8ad8004af85dc

Conflicts:
	arch/arm/mach-msm/include/mach/camera.h
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/actuators/msm_actuator.h
	drivers/media/video/msm/cci/msm_cam_cci_hwreg.h
	drivers/media/video/msm/cci/msm_cci.c
	drivers/media/video/msm/cci/msm_cci.h
	drivers/media/video/msm/csi/include/csi2.0/msm_csid_hwreg.h
	drivers/media/video/msm/csi/include/csi2.0/msm_csiphy_hwreg.h
	drivers/media/video/msm/csi/include/csi2.0/msm_ispif_hwreg.h
	drivers/media/video/msm/csi/include/csi3.0/msm_csid_hwreg.h
	drivers/media/video/msm/csi/include/csi3.0/msm_csiphy_hwreg.h
	drivers/media/video/msm/csi/include/csi3.0/msm_ispif_hwreg.h
	drivers/media/video/msm/csi/msm_csid.h
	drivers/media/video/msm/csi/msm_csiphy.c
	drivers/media/video/msm/csi/msm_csiphy.h
	drivers/media/video/msm/csi/msm_ispif.c
	drivers/media/video/msm/csi/msm_ispif.h
	drivers/media/video/msm/flash.c
	drivers/media/video/msm/gemini/msm_gemini_hw.c
	drivers/media/video/msm/gemini/msm_gemini_hw.h
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/gemini/msm_gemini_sync.h
	drivers/media/video/msm/io/msm_camera_i2c.h
	drivers/media/video/msm/io/msm_camera_io_util.c
	drivers/media/video/msm/io/msm_io_8960.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.c
	drivers/media/video/msm/jpeg_10/msm_jpeg_hw.h
	drivers/media/video/msm/jpeg_10/msm_jpeg_sync.c
	drivers/media/video/msm/mercury/msm_mercury_common.h
	drivers/media/video/msm/mercury/msm_mercury_core.c
	drivers/media/video/msm/mercury/msm_mercury_core.h
	drivers/media/video/msm/mercury/msm_mercury_dev.c
	drivers/media/video/msm/mercury/msm_mercury_hw.c
	drivers/media/video/msm/mercury/msm_mercury_hw.h
	drivers/media/video/msm/mercury/msm_mercury_hw_reg.h
	drivers/media/video/msm/mercury/msm_mercury_macros.h
	drivers/media/video/msm/mercury/msm_mercury_platform.c
	drivers/media/video/msm/mercury/msm_mercury_platform.h
	drivers/media/video/msm/mercury/msm_mercury_sync.c
	drivers/media/video/msm/mercury/msm_mercury_sync.h
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm.h
	drivers/media/video/msm/msm_isp.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_mctl_buf.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/msm_vfe32.h
	drivers/media/video/msm/msm_vpe.c
	drivers/media/video/msm/mt9d112.c
	drivers/media/video/msm/mt9p012.h
	drivers/media/video/msm/mt9p012_km.h
	drivers/media/video/msm/mt9t013.c
	drivers/media/video/msm/mt9t013.h
	drivers/media/video/msm/sensors/Makefile
	drivers/media/video/msm/sensors/imx091.c
	drivers/media/video/msm/sensors/imx091.h
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/msm_sensor_bayer.c
	drivers/media/video/msm/sensors/msm_sensor_bayer.h
	drivers/media/video/msm/sensors/msm_sensor_common.c
	drivers/media/video/msm/sensors/msm_sensor_common.h
	drivers/media/video/msm/sensors/msm_sensor_init.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/media/video/msm/sensors/ov9726_v4l2.c
	drivers/media/video/msm/server/msm_cam_server.h
	drivers/media/video/msm/sn12m0pz.c
	drivers/media/video/msm/vfe/msm_vfe40.c
	drivers/media/video/msm/vfe/msm_vfe40.h
	drivers/media/video/msm/vfe/msm_vfe40_axi.c
	drivers/media/video/msm/vx6953.c
	include/media/msm_gemini.h
	include/media/msm_isp.h