From f8efeb8182d6deaa0df2d7ea7616ed14723ae363 Mon Sep 17 00:00:00 2001
From: Shuzhen Wang <shuzhenw@codeaurora.org>
Date: Mon, 25 Feb 2013 11:34:05 -0800
Subject: [PATCH] msm: camera: reorganize directory structure

Change-Id: Ice4b29a8e88b395025706f44a1851003b8be4e0b
Signed-off-by: Shuzhen Wang <shuzhenw@codeaurora.org>
---
 drivers/media/Kconfig                         |  2 +
 drivers/media/Makefile                        |  2 +-
 drivers/media/platform/Kconfig                |  1 +
 drivers/media/platform/Makefile               |  1 +
 drivers/media/platform/msm/Kconfig            | 43 ++++++++++++++++++
 drivers/media/platform/msm/Makefile           |  2 +
 .../msm => platform/msm/camera_v1}/Kconfig    |  0
 .../msm => platform/msm/camera_v1}/Makefile   |  0
 .../msm/camera_v1}/actuators/Makefile         |  0
 .../msm/camera_v1}/actuators/msm_actuator.c   |  0
 .../msm/camera_v1}/actuators/msm_actuator.h   |  0
 .../msm/camera_v1}/cci/Makefile               |  0
 .../msm/camera_v1}/cci/msm_cam_cci_hwreg.h    |  0
 .../msm/camera_v1}/cci/msm_cci.c              |  0
 .../msm/camera_v1}/cci/msm_cci.h              |  0
 .../msm/camera_v1}/cpp/Makefile               |  0
 .../msm/camera_v1}/cpp/msm_cpp.c              |  0
 .../msm/camera_v1}/cpp/msm_cpp.h              |  0
 .../msm/camera_v1}/csi/Makefile               |  0
 .../csi/include/csi2.0/msm_csid_hwreg.h       |  0
 .../csi/include/csi2.0/msm_csiphy_hwreg.h     |  0
 .../csi/include/csi2.0/msm_ispif_hwreg.h      |  0
 .../csi/include/csi3.0/msm_csid_hwreg.h       |  0
 .../csi/include/csi3.0/msm_csiphy_hwreg.h     |  0
 .../csi/include/csi3.0/msm_ispif_hwreg.h      |  0
 .../msm/camera_v1}/csi/msm_csi2_register.c    |  0
 .../msm/camera_v1}/csi/msm_csi_register.h     |  0
 .../msm/camera_v1}/csi/msm_csic.c             |  0
 .../msm/camera_v1}/csi/msm_csic.h             |  0
 .../msm/camera_v1}/csi/msm_csic_register.c    |  0
 .../msm/camera_v1}/csi/msm_csid.c             |  0
 .../msm/camera_v1}/csi/msm_csid.h             |  0
 .../msm/camera_v1}/csi/msm_csiphy.c           |  0
 .../msm/camera_v1}/csi/msm_csiphy.h           |  0
 .../msm/camera_v1}/csi/msm_ispif.c            |  0
 .../msm/camera_v1}/csi/msm_ispif.h            |  0
 .../msm/camera_v1}/eeprom/Makefile            |  0
 .../msm/camera_v1}/eeprom/imx074_eeprom.c     |  0
 .../msm/camera_v1}/eeprom/imx091_eeprom.c     |  0
 .../msm/camera_v1}/eeprom/msm_camera_eeprom.c |  0
 .../msm/camera_v1}/eeprom/msm_camera_eeprom.h |  0
 .../msm => platform/msm/camera_v1}/flash.c    |  0
 .../msm/camera_v1}/flash_lm3559.c             |  0
 .../msm/camera_v1}/gemini/Makefile            |  0
 .../msm/camera_v1}/gemini/msm_gemini_common.h |  0
 .../msm/camera_v1}/gemini/msm_gemini_core.c   |  0
 .../msm/camera_v1}/gemini/msm_gemini_core.h   |  0
 .../msm/camera_v1}/gemini/msm_gemini_dev.c    |  0
 .../msm/camera_v1}/gemini/msm_gemini_hw.c     |  0
 .../msm/camera_v1}/gemini/msm_gemini_hw.h     |  0
 .../msm/camera_v1}/gemini/msm_gemini_hw_reg.h |  0
 .../camera_v1}/gemini/msm_gemini_platform.c   |  0
 .../camera_v1}/gemini/msm_gemini_platform.h   |  0
 .../msm/camera_v1}/gemini/msm_gemini_sync.c   |  0
 .../msm/camera_v1}/gemini/msm_gemini_sync.h   |  0
 .../msm => platform/msm/camera_v1}/imx072.c   |  0
 .../msm => platform/msm/camera_v1}/imx072.h   |  0
 .../msm/camera_v1}/imx072_reg.c               |  0
 .../msm => platform/msm/camera_v1}/imx074.c   |  0
 .../msm => platform/msm/camera_v1}/imx074.h   |  0
 .../msm/camera_v1}/imx074_reg.c               |  0
 .../msm/camera_v1}/io/Makefile                |  0
 .../msm/camera_v1}/io/msm_camera_i2c.c        |  0
 .../msm/camera_v1}/io/msm_camera_i2c.h        |  0
 .../msm/camera_v1}/io/msm_camera_i2c_mux.c    |  0
 .../msm/camera_v1}/io/msm_camera_i2c_mux.h    |  0
 .../msm/camera_v1}/io/msm_camera_io_util.c    |  0
 .../msm/camera_v1}/io/msm_io7x.c              |  0
 .../msm/camera_v1}/io/msm_io8x.c              |  0
 .../msm/camera_v1}/io/msm_io_7x27a.c          |  0
 .../msm/camera_v1}/io/msm_io_7x27a_v4l2.c     |  0
 .../msm/camera_v1}/io/msm_io_8960.c           |  0
 .../msm/camera_v1}/io/msm_io_8x60.c           |  0
 .../msm/camera_v1}/io/msm_io_vfe31.c          |  0
 .../msm/camera_v1}/io/msm_io_vfe31_v4l2.c     |  0
 .../msm/camera_v1}/mercury/Makefile           |  0
 .../camera_v1}/mercury/msm_mercury_common.h   |  0
 .../msm/camera_v1}/mercury/msm_mercury_core.c |  0
 .../msm/camera_v1}/mercury/msm_mercury_core.h |  0
 .../msm/camera_v1}/mercury/msm_mercury_dev.c  |  0
 .../msm/camera_v1}/mercury/msm_mercury_hw.c   |  0
 .../msm/camera_v1}/mercury/msm_mercury_hw.h   |  0
 .../camera_v1}/mercury/msm_mercury_hw_reg.h   |  0
 .../camera_v1}/mercury/msm_mercury_macros.h   |  0
 .../camera_v1}/mercury/msm_mercury_platform.c |  0
 .../camera_v1}/mercury/msm_mercury_platform.h |  0
 .../msm/camera_v1}/mercury/msm_mercury_sync.c |  0
 .../msm/camera_v1}/mercury/msm_mercury_sync.h |  0
 .../msm => platform/msm/camera_v1}/msm.c      |  0
 .../msm => platform/msm/camera_v1}/msm.h      |  0
 .../msm/camera_v1}/msm_axi_qos.c              |  0
 .../msm/camera_v1}/msm_camera.c               |  0
 .../msm/camera_v1}/msm_camirq_router.c        |  0
 .../msm/camera_v1}/msm_camirq_router.h        |  0
 .../msm/camera_v1}/msm_gesture.c              |  0
 .../msm => platform/msm/camera_v1}/msm_isp.c  |  0
 .../msm => platform/msm/camera_v1}/msm_mctl.c |  0
 .../msm/camera_v1}/msm_mctl_buf.c             |  0
 .../msm/camera_v1}/msm_mctl_pp.c              |  0
 .../msm => platform/msm/camera_v1}/msm_mem.c  |  0
 .../msm/camera_v1}/msm_v4l2_video.c           |  0
 .../msm/camera_v1}/msm_v4l2_video.h           |  0
 .../msm => platform/msm/camera_v1}/msm_vpe.c  |  0
 .../msm => platform/msm/camera_v1}/msm_vpe.h  |  0
 .../msm => platform/msm/camera_v1}/msm_vpe1.c |  0
 .../msm => platform/msm/camera_v1}/msm_vpe1.h |  0
 .../msm => platform/msm/camera_v1}/mt9d112.c  |  0
 .../msm => platform/msm/camera_v1}/mt9d112.h  |  0
 .../msm/camera_v1}/mt9d112_reg.c              |  0
 .../msm => platform/msm/camera_v1}/mt9d113.c  |  0
 .../msm => platform/msm/camera_v1}/mt9d113.h  |  0
 .../msm/camera_v1}/mt9d113_reg.c              |  0
 .../msm => platform/msm/camera_v1}/mt9e013.c  |  0
 .../msm => platform/msm/camera_v1}/mt9e013.h  |  0
 .../msm/camera_v1}/mt9e013_reg.c              |  0
 .../msm => platform/msm/camera_v1}/mt9p012.h  |  0
 .../msm/camera_v1}/mt9p012_bam.c              |  0
 .../msm/camera_v1}/mt9p012_fox.c              |  0
 .../msm/camera_v1}/mt9p012_km.c               |  0
 .../msm/camera_v1}/mt9p012_km.h               |  0
 .../msm/camera_v1}/mt9p012_km_reg.c           |  0
 .../msm/camera_v1}/mt9p012_reg.c              |  0
 .../msm => platform/msm/camera_v1}/mt9t013.c  |  0
 .../msm => platform/msm/camera_v1}/mt9t013.h  |  0
 .../msm/camera_v1}/mt9t013_reg.c              |  0
 .../msm => platform/msm/camera_v1}/ov5640.c   |  0
 .../msm => platform/msm/camera_v1}/ov5640.h   |  0
 .../msm => platform/msm/camera_v1}/ov5647.c   |  0
 .../msm => platform/msm/camera_v1}/ov5647.h   |  0
 .../msm/camera_v1}/ov5647_reg.c               |  0
 .../msm => platform/msm/camera_v1}/ov7692.c   |  0
 .../msm => platform/msm/camera_v1}/ov7692.h   |  0
 .../msm/camera_v1}/ov7692_qrd.c               |  0
 .../msm => platform/msm/camera_v1}/ov9726.c   |  0
 .../msm => platform/msm/camera_v1}/ov9726.h   |  0
 .../msm/camera_v1}/ov9726_reg.c               |  0
 .../msm/camera_v1}/qs_s5k4e1.c                |  0
 .../msm/camera_v1}/qs_s5k4e1.h                |  0
 .../msm/camera_v1}/qs_s5k4e1_reg.c            |  0
 .../msm => platform/msm/camera_v1}/s5k3e2fx.c |  0
 .../msm => platform/msm/camera_v1}/s5k3e2fx.h |  0
 .../msm => platform/msm/camera_v1}/s5k4e1.c   |  0
 .../msm => platform/msm/camera_v1}/s5k4e1.h   |  0
 .../msm/camera_v1}/s5k4e1_reg.c               |  0
 .../msm/camera_v1}/sensors/Makefile           |  0
 .../msm/camera_v1}/sensors/imx074_v4l2.c      |  0
 .../msm/camera_v1}/sensors/imx091.c           |  0
 .../msm/camera_v1}/sensors/imx111.c           |  0
 .../msm/camera_v1}/sensors/imx119_v4l2.c      |  0
 .../msm/camera_v1}/sensors/msm_sensor.c       |  0
 .../msm/camera_v1}/sensors/msm_sensor.h       |  0
 .../msm/camera_v1}/sensors/mt9e013_v4l2.c     |  0
 .../msm/camera_v1}/sensors/mt9m114_v4l2.c     |  0
 .../msm/camera_v1}/sensors/ov2720.c           |  0
 .../msm/camera_v1}/sensors/ov2720.h           |  0
 .../msm/camera_v1}/sensors/ov5647_v4l2.c      |  0
 .../msm/camera_v1}/sensors/ov7692_v4l2.c      |  0
 .../msm/camera_v1}/sensors/ov8825_v4l2.c      |  0
 .../msm/camera_v1}/sensors/ov9726_v4l2.c      |  0
 .../msm/camera_v1}/sensors/s5k3l1yx.c         |  0
 .../msm/camera_v1}/sensors/s5k4e1_v4l2.c      |  0
 .../msm/camera_v1}/sensors/vx6953.c           |  0
 .../msm/camera_v1}/sensors/vx6953.h           |  0
 .../msm/camera_v1}/sensors/vx6953_reg.h       |  0
 .../msm/camera_v1}/server/Makefile            |  0
 .../msm/camera_v1}/server/msm_cam_server.c    |  0
 .../msm/camera_v1}/server/msm_cam_server.h    |  0
 .../msm => platform/msm/camera_v1}/sn12m0pz.c |  0
 .../msm => platform/msm/camera_v1}/sn12m0pz.h |  0
 .../msm/camera_v1}/sn12m0pz_reg.c             |  0
 .../msm => platform/msm/camera_v1}/vb6801.c   |  0
 .../msm => platform/msm/camera_v1}/vb6801.h   |  0
 .../msm/camera_v1}/vfe/Makefile               |  0
 .../msm/camera_v1}/vfe/msm_vfe31.c            |  0
 .../msm/camera_v1}/vfe/msm_vfe31.h            |  0
 .../msm/camera_v1}/vfe/msm_vfe31_v4l2.c       |  0
 .../msm/camera_v1}/vfe/msm_vfe31_v4l2.h       |  0
 .../msm/camera_v1}/vfe/msm_vfe32.c            |  0
 .../msm/camera_v1}/vfe/msm_vfe32.h            |  0
 .../msm/camera_v1}/vfe/msm_vfe40.c            |  0
 .../msm/camera_v1}/vfe/msm_vfe40.h            |  0
 .../msm/camera_v1}/vfe/msm_vfe40_axi.c        |  0
 .../msm/camera_v1}/vfe/msm_vfe7x.c            |  0
 .../msm/camera_v1}/vfe/msm_vfe7x.h            |  0
 .../msm/camera_v1}/vfe/msm_vfe7x27a.c         |  0
 .../msm/camera_v1}/vfe/msm_vfe7x27a.h         |  0
 .../msm/camera_v1}/vfe/msm_vfe7x27a_v4l2.c    |  0
 .../msm/camera_v1}/vfe/msm_vfe7x27a_v4l2.h    |  0
 .../msm/camera_v1}/vfe/msm_vfe8x.c            |  0
 .../msm/camera_v1}/vfe/msm_vfe8x.h            |  0
 .../msm/camera_v1}/vfe/msm_vfe8x_proc.c       |  0
 .../msm/camera_v1}/vfe/msm_vfe8x_proc.h       |  0
 .../msm/camera_v1}/vfe/msm_vfe_stats_buf.c    |  0
 .../msm/camera_v1}/vfe/msm_vfe_stats_buf.h    |  0
 .../msm => platform/msm/camera_v1}/vx6953.c   |  0
 .../msm => platform/msm/camera_v1}/vx6953.h   |  0
 .../msm/camera_v1}/vx6953_reg.c               |  0
 .../msm/camera_v1}/vx6953_reg_v4l2.c          |  0
 .../msm/camera_v1}/vx6953_v4l2.c              |  0
 .../msm/camera_v1}/vx6953_v4l2.h              |  0
 .../msmb => platform/msm/camera_v2}/Kconfig   |  0
 drivers/media/platform/msm/camera_v2/Makefile | 15 +++++++
 .../platform/msm/camera_v2/camera/Makefile    |  3 ++
 .../msm/camera_v2}/camera/camera.c            |  0
 .../msm/camera_v2}/camera/camera.h            |  0
 .../msm/camera_v2}/isp/Makefile               |  4 +-
 .../msm/camera_v2}/isp/msm_buf_mgr.c          |  0
 .../msm/camera_v2}/isp/msm_buf_mgr.h          |  0
 .../msm/camera_v2}/isp/msm_isp.c              |  0
 .../msm/camera_v2}/isp/msm_isp.h              |  0
 .../msm/camera_v2}/isp/msm_isp32.c            |  0
 .../msm/camera_v2}/isp/msm_isp32.h            |  0
 .../msm/camera_v2}/isp/msm_isp40.c            |  0
 .../msm/camera_v2}/isp/msm_isp40.h            |  0
 .../msm/camera_v2}/isp/msm_isp_axi_util.c     |  0
 .../msm/camera_v2}/isp/msm_isp_axi_util.h     |  0
 .../msm/camera_v2}/isp/msm_isp_stats_util.c   |  0
 .../msm/camera_v2}/isp/msm_isp_stats_util.h   |  0
 .../msm/camera_v2}/isp/msm_isp_util.c         |  0
 .../msm/camera_v2}/isp/msm_isp_util.h         |  0
 .../platform/msm/camera_v2/ispif/Makefile     |  3 ++
 .../msm/camera_v2}/ispif/msm_ispif.c          |  0
 .../msm/camera_v2}/ispif/msm_ispif.h          |  0
 .../msm/camera_v2}/ispif/msm_ispif_hwreg_v1.h |  0
 .../msm/camera_v2}/ispif/msm_ispif_hwreg_v2.h |  0
 .../msmb => platform/msm/camera_v2}/msm.c     |  0
 .../msmb => platform/msm/camera_v2}/msm.h     |  0
 .../msm/camera_v2/msm_buf_mgr/Makefile        |  2 +
 .../msm_buf_mgr/msm_generic_buf_mgr.c         |  0
 .../msm_buf_mgr/msm_generic_buf_mgr.h         |  0
 .../msmb => platform/msm/camera_v2}/msm_sd.h  |  0
 .../platform/msm/camera_v2/msm_vb2/Makefile   |  3 ++
 .../msm/camera_v2}/msm_vb2/msm_vb2.c          |  0
 .../msm/camera_v2}/msm_vb2/msm_vb2.h          |  0
 .../platform/msm/camera_v2/sensor/Makefile    | 10 +++++
 .../msm/camera_v2/sensor/actuator/Makefile    |  4 ++
 .../camera_v2}/sensor/actuator/msm_actuator.c |  0
 .../camera_v2}/sensor/actuator/msm_actuator.h |  0
 .../msm/camera_v2/sensor/cci/Makefile         |  3 ++
 .../camera_v2}/sensor/cci/msm_cam_cci_hwreg.h |  0
 .../msm/camera_v2}/sensor/cci/msm_cci.c       |  0
 .../msm/camera_v2}/sensor/cci/msm_cci.h       |  0
 .../msm/camera_v2/sensor/csid/Makefile        |  8 ++++
 .../csid/include/csi2.0/msm_csid_hwreg.h      |  0
 .../csid/include/csi3.0/msm_csid_hwreg.h      |  0
 .../msm/camera_v2}/sensor/csid/msm_csid.c     |  0
 .../msm/camera_v2}/sensor/csid/msm_csid.h     |  0
 .../msm/camera_v2/sensor/csiphy/Makefile      |  8 ++++
 .../csiphy/include/csi2.0/msm_csiphy_hwreg.h  |  0
 .../csiphy/include/csi3.0/msm_csiphy_hwreg.h  |  0
 .../msm/camera_v2}/sensor/csiphy/msm_csiphy.c |  0
 .../msm/camera_v2}/sensor/csiphy/msm_csiphy.h |  0
 .../camera_v2}/sensor/flash/msm_led_flash.c   |  0
 .../camera_v2}/sensor/flash/msm_led_flash.h   |  0
 .../camera_v2}/sensor/flash/msm_led_trigger.c |  0
 .../msm/camera_v2}/sensor/imx111.c            |  0
 .../msm/camera_v2}/sensor/imx119.c            |  0
 .../msm/camera_v2}/sensor/io/Makefile         |  4 +-
 .../camera_v2}/sensor/io/msm_camera_cci_i2c.c |  0
 .../msm/camera_v2}/sensor/io/msm_camera_i2c.h |  0
 .../camera_v2}/sensor/io/msm_camera_i2c_mux.c |  0
 .../camera_v2}/sensor/io/msm_camera_i2c_mux.h |  0
 .../camera_v2}/sensor/io/msm_camera_io_util.c |  0
 .../camera_v2}/sensor/io/msm_camera_io_util.h |  0
 .../camera_v2}/sensor/io/msm_camera_qup_i2c.c |  0
 .../msm/camera_v2}/sensor/msm_sensor.c        |  0
 .../msm/camera_v2}/sensor/msm_sensor.h        |  0
 .../msm/camera_v2}/sensor/s5k3l1yx.c          |  0
 drivers/media/video/Kconfig                   | 44 -------------------
 drivers/media/video/Makefile                  |  2 -
 drivers/media/video/msmb/Makefile             | 15 -------
 drivers/media/video/msmb/camera/Makefile      |  3 --
 drivers/media/video/msmb/ispif/Makefile       |  3 --
 drivers/media/video/msmb/msm_buf_mgr/Makefile |  2 -
 drivers/media/video/msmb/msm_vb2/Makefile     |  3 --
 drivers/media/video/msmb/sensor/Makefile      | 10 -----
 .../media/video/msmb/sensor/actuator/Makefile |  4 --
 drivers/media/video/msmb/sensor/cci/Makefile  |  3 --
 drivers/media/video/msmb/sensor/csid/Makefile |  8 ----
 .../media/video/msmb/sensor/csiphy/Makefile   |  8 ----
 280 files changed, 113 insertions(+), 110 deletions(-)
 create mode 100644 drivers/media/platform/Kconfig
 create mode 100644 drivers/media/platform/Makefile
 create mode 100644 drivers/media/platform/msm/Kconfig
 create mode 100644 drivers/media/platform/msm/Makefile
 rename drivers/media/{video/msm => platform/msm/camera_v1}/Kconfig (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/actuators/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/actuators/msm_actuator.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/actuators/msm_actuator.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/cci/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/cci/msm_cam_cci_hwreg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/cci/msm_cci.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/cci/msm_cci.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/cpp/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/cpp/msm_cpp.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/cpp/msm_cpp.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/include/csi2.0/msm_csid_hwreg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/include/csi2.0/msm_csiphy_hwreg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/include/csi2.0/msm_ispif_hwreg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/include/csi3.0/msm_csid_hwreg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/include/csi3.0/msm_csiphy_hwreg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/include/csi3.0/msm_ispif_hwreg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csi2_register.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csi_register.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csic.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csic.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csic_register.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csid.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csid.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csiphy.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_csiphy.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_ispif.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/csi/msm_ispif.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/eeprom/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/eeprom/imx074_eeprom.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/eeprom/imx091_eeprom.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/eeprom/msm_camera_eeprom.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/eeprom/msm_camera_eeprom.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/flash.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/flash_lm3559.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_common.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_core.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_core.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_dev.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_hw.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_hw.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_hw_reg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_platform.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_platform.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_sync.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/gemini/msm_gemini_sync.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/imx072.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/imx072.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/imx072_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/imx074.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/imx074.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/imx074_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_camera_i2c.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_camera_i2c.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_camera_i2c_mux.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_camera_i2c_mux.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_camera_io_util.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io7x.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io8x.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io_7x27a.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io_7x27a_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io_8960.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io_8x60.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io_vfe31.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/io/msm_io_vfe31_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_common.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_core.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_core.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_dev.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_hw.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_hw.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_hw_reg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_macros.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_platform.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_platform.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_sync.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mercury/msm_mercury_sync.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_axi_qos.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_camera.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_camirq_router.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_camirq_router.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_gesture.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_isp.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_mctl.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_mctl_buf.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_mctl_pp.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_mem.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_v4l2_video.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_v4l2_video.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_vpe.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_vpe.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_vpe1.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/msm_vpe1.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9d112.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9d112.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9d112_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9d113.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9d113.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9d113_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9e013.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9e013.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9e013_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9p012.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9p012_bam.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9p012_fox.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9p012_km.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9p012_km.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9p012_km_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9p012_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9t013.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9t013.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/mt9t013_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov5640.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov5640.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov5647.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov5647.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov5647_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov7692.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov7692.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov7692_qrd.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov9726.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov9726.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/ov9726_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/qs_s5k4e1.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/qs_s5k4e1.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/qs_s5k4e1_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/s5k3e2fx.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/s5k3e2fx.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/s5k4e1.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/s5k4e1.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/s5k4e1_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/imx074_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/imx091.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/imx111.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/imx119_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/msm_sensor.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/msm_sensor.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/mt9e013_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/mt9m114_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/ov2720.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/ov2720.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/ov5647_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/ov7692_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/ov8825_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/ov9726_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/s5k3l1yx.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/s5k4e1_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/vx6953.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/vx6953.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sensors/vx6953_reg.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/server/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/server/msm_cam_server.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/server/msm_cam_server.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sn12m0pz.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sn12m0pz.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/sn12m0pz_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vb6801.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vb6801.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/Makefile (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe31.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe31.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe31_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe31_v4l2.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe32.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe32.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe40.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe40.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe40_axi.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe7x.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe7x.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe7x27a.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe7x27a.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe7x27a_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe7x27a_v4l2.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe8x.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe8x.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe8x_proc.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe8x_proc.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe_stats_buf.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vfe/msm_vfe_stats_buf.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vx6953.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vx6953.h (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vx6953_reg.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vx6953_reg_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vx6953_v4l2.c (100%)
 rename drivers/media/{video/msm => platform/msm/camera_v1}/vx6953_v4l2.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/Kconfig (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/Makefile
 create mode 100644 drivers/media/platform/msm/camera_v2/camera/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/camera/camera.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/camera/camera.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/Makefile (58%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_buf_mgr.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_buf_mgr.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp32.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp32.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp40.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp40.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp_axi_util.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp_axi_util.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp_stats_util.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp_stats_util.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp_util.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/isp/msm_isp_util.h (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/ispif/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/ispif/msm_ispif.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/ispif/msm_ispif.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/ispif/msm_ispif_hwreg_v1.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/ispif/msm_ispif_hwreg_v2.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/msm.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/msm.h (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/msm_buf_mgr/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/msm_buf_mgr/msm_generic_buf_mgr.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/msm_buf_mgr/msm_generic_buf_mgr.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/msm_sd.h (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/msm_vb2/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/msm_vb2/msm_vb2.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/msm_vb2/msm_vb2.h (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/sensor/Makefile
 create mode 100644 drivers/media/platform/msm/camera_v2/sensor/actuator/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/actuator/msm_actuator.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/actuator/msm_actuator.h (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/sensor/cci/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/cci/msm_cam_cci_hwreg.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/cci/msm_cci.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/cci/msm_cci.h (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/sensor/csid/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csid/include/csi2.0/msm_csid_hwreg.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csid/include/csi3.0/msm_csid_hwreg.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csid/msm_csid.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csid/msm_csid.h (100%)
 create mode 100644 drivers/media/platform/msm/camera_v2/sensor/csiphy/Makefile
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csiphy/include/csi2.0/msm_csiphy_hwreg.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csiphy/include/csi3.0/msm_csiphy_hwreg.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csiphy/msm_csiphy.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/csiphy/msm_csiphy.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/flash/msm_led_flash.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/flash/msm_led_flash.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/flash/msm_led_trigger.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/imx111.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/imx119.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/Makefile (50%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/msm_camera_cci_i2c.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/msm_camera_i2c.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/msm_camera_i2c_mux.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/msm_camera_i2c_mux.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/msm_camera_io_util.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/msm_camera_io_util.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/io/msm_camera_qup_i2c.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/msm_sensor.c (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/msm_sensor.h (100%)
 rename drivers/media/{video/msmb => platform/msm/camera_v2}/sensor/s5k3l1yx.c (100%)
 delete mode 100644 drivers/media/video/msmb/Makefile
 delete mode 100644 drivers/media/video/msmb/camera/Makefile
 delete mode 100644 drivers/media/video/msmb/ispif/Makefile
 delete mode 100644 drivers/media/video/msmb/msm_buf_mgr/Makefile
 delete mode 100644 drivers/media/video/msmb/msm_vb2/Makefile
 delete mode 100644 drivers/media/video/msmb/sensor/Makefile
 delete mode 100644 drivers/media/video/msmb/sensor/actuator/Makefile
 delete mode 100644 drivers/media/video/msmb/sensor/cci/Makefile
 delete mode 100644 drivers/media/video/msmb/sensor/csid/Makefile
 delete mode 100644 drivers/media/video/msmb/sensor/csiphy/Makefile

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 9575db429df4..890037a0c737 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -106,6 +106,8 @@ comment "Multimedia drivers"
 source "drivers/media/common/Kconfig"
 source "drivers/media/rc/Kconfig"
 
+source "drivers/media/platform/Kconfig"
+
 #
 # Tuner drivers for DVB and V4L
 #
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 64755c99ded2..133a74fdab44 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
   obj-$(CONFIG_MEDIA_SUPPORT) += media.o
 endif
 
-obj-y += common/ rc/ video/
+obj-y += common/ platform/ rc/ video/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
new file mode 100644
index 000000000000..10c803e82e14
--- /dev/null
+++ b/drivers/media/platform/Kconfig
@@ -0,0 +1 @@
+source "drivers/media/platform/msm/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
new file mode 100644
index 000000000000..3d080b74db5b
--- /dev/null
+++ b/drivers/media/platform/Makefile
@@ -0,0 +1 @@
+obj-y += msm/
diff --git a/drivers/media/platform/msm/Kconfig b/drivers/media/platform/msm/Kconfig
new file mode 100644
index 000000000000..d2f4296d7d50
--- /dev/null
+++ b/drivers/media/platform/msm/Kconfig
@@ -0,0 +1,43 @@
+#
+# MSM camera configuration
+#
+
+comment "Qualcomm MSM Camera And Video"
+
+menuconfig MSM_CAMERA
+        bool "Qualcomm MSM camera and video capture support"
+        depends on ARCH_MSM && VIDEO_V4L2 && I2C
+        default y
+        help
+          Say Y here to enable selecting the video adapters for
+          Qualcomm msm camera and video encoding
+
+config MSM_CAMERA_DEBUG
+        bool "Qualcomm MSM camera debugging with printk"
+        depends on MSM_CAMERA
+        default n
+        help
+          Enable printk() debug for msm camera
+
+if MSM_CAMERA
+source "drivers/media/platform/msm/camera_v1/Kconfig"
+endif # MSM_CAMERA
+
+menuconfig MSMB_CAMERA
+        bool "Qualcomm MSM camera and video capture 2.0 support"
+        depends on ARCH_MSM && VIDEO_V4L2 && I2C
+        ---help---
+          Say Y here to enable selecting the video adapters for
+          Qualcomm msm camera and video capture 2.0, enabling this
+          adds support for the camera driver stack including sensor, isp
+          and postprocessing drivers.
+
+config MSMB_CAMERA_DEBUG
+        bool "Qualcomm MSM camera 2.0 debugging with printk"
+        depends on MSMB_CAMERA
+        ---help---
+          Enable printk() debug for msm camera 2.0
+
+if MSMB_CAMERA
+source "drivers/media/platform/msm/camera_v2/Kconfig"
+endif # MSMB_CAMERA
diff --git a/drivers/media/platform/msm/Makefile b/drivers/media/platform/msm/Makefile
new file mode 100644
index 000000000000..596542d310fb
--- /dev/null
+++ b/drivers/media/platform/msm/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MSM_CAMERA) += camera_v1/
+obj-$(CONFIG_MSMB_CAMERA) += camera_v2/
diff --git a/drivers/media/video/msm/Kconfig b/drivers/media/platform/msm/camera_v1/Kconfig
similarity index 100%
rename from drivers/media/video/msm/Kconfig
rename to drivers/media/platform/msm/camera_v1/Kconfig
diff --git a/drivers/media/video/msm/Makefile b/drivers/media/platform/msm/camera_v1/Makefile
similarity index 100%
rename from drivers/media/video/msm/Makefile
rename to drivers/media/platform/msm/camera_v1/Makefile
diff --git a/drivers/media/video/msm/actuators/Makefile b/drivers/media/platform/msm/camera_v1/actuators/Makefile
similarity index 100%
rename from drivers/media/video/msm/actuators/Makefile
rename to drivers/media/platform/msm/camera_v1/actuators/Makefile
diff --git a/drivers/media/video/msm/actuators/msm_actuator.c b/drivers/media/platform/msm/camera_v1/actuators/msm_actuator.c
similarity index 100%
rename from drivers/media/video/msm/actuators/msm_actuator.c
rename to drivers/media/platform/msm/camera_v1/actuators/msm_actuator.c
diff --git a/drivers/media/video/msm/actuators/msm_actuator.h b/drivers/media/platform/msm/camera_v1/actuators/msm_actuator.h
similarity index 100%
rename from drivers/media/video/msm/actuators/msm_actuator.h
rename to drivers/media/platform/msm/camera_v1/actuators/msm_actuator.h
diff --git a/drivers/media/video/msm/cci/Makefile b/drivers/media/platform/msm/camera_v1/cci/Makefile
similarity index 100%
rename from drivers/media/video/msm/cci/Makefile
rename to drivers/media/platform/msm/camera_v1/cci/Makefile
diff --git a/drivers/media/video/msm/cci/msm_cam_cci_hwreg.h b/drivers/media/platform/msm/camera_v1/cci/msm_cam_cci_hwreg.h
similarity index 100%
rename from drivers/media/video/msm/cci/msm_cam_cci_hwreg.h
rename to drivers/media/platform/msm/camera_v1/cci/msm_cam_cci_hwreg.h
diff --git a/drivers/media/video/msm/cci/msm_cci.c b/drivers/media/platform/msm/camera_v1/cci/msm_cci.c
similarity index 100%
rename from drivers/media/video/msm/cci/msm_cci.c
rename to drivers/media/platform/msm/camera_v1/cci/msm_cci.c
diff --git a/drivers/media/video/msm/cci/msm_cci.h b/drivers/media/platform/msm/camera_v1/cci/msm_cci.h
similarity index 100%
rename from drivers/media/video/msm/cci/msm_cci.h
rename to drivers/media/platform/msm/camera_v1/cci/msm_cci.h
diff --git a/drivers/media/video/msm/cpp/Makefile b/drivers/media/platform/msm/camera_v1/cpp/Makefile
similarity index 100%
rename from drivers/media/video/msm/cpp/Makefile
rename to drivers/media/platform/msm/camera_v1/cpp/Makefile
diff --git a/drivers/media/video/msm/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v1/cpp/msm_cpp.c
similarity index 100%
rename from drivers/media/video/msm/cpp/msm_cpp.c
rename to drivers/media/platform/msm/camera_v1/cpp/msm_cpp.c
diff --git a/drivers/media/video/msm/cpp/msm_cpp.h b/drivers/media/platform/msm/camera_v1/cpp/msm_cpp.h
similarity index 100%
rename from drivers/media/video/msm/cpp/msm_cpp.h
rename to drivers/media/platform/msm/camera_v1/cpp/msm_cpp.h
diff --git a/drivers/media/video/msm/csi/Makefile b/drivers/media/platform/msm/camera_v1/csi/Makefile
similarity index 100%
rename from drivers/media/video/msm/csi/Makefile
rename to drivers/media/platform/msm/camera_v1/csi/Makefile
diff --git a/drivers/media/video/msm/csi/include/csi2.0/msm_csid_hwreg.h b/drivers/media/platform/msm/camera_v1/csi/include/csi2.0/msm_csid_hwreg.h
similarity index 100%
rename from drivers/media/video/msm/csi/include/csi2.0/msm_csid_hwreg.h
rename to drivers/media/platform/msm/camera_v1/csi/include/csi2.0/msm_csid_hwreg.h
diff --git a/drivers/media/video/msm/csi/include/csi2.0/msm_csiphy_hwreg.h b/drivers/media/platform/msm/camera_v1/csi/include/csi2.0/msm_csiphy_hwreg.h
similarity index 100%
rename from drivers/media/video/msm/csi/include/csi2.0/msm_csiphy_hwreg.h
rename to drivers/media/platform/msm/camera_v1/csi/include/csi2.0/msm_csiphy_hwreg.h
diff --git a/drivers/media/video/msm/csi/include/csi2.0/msm_ispif_hwreg.h b/drivers/media/platform/msm/camera_v1/csi/include/csi2.0/msm_ispif_hwreg.h
similarity index 100%
rename from drivers/media/video/msm/csi/include/csi2.0/msm_ispif_hwreg.h
rename to drivers/media/platform/msm/camera_v1/csi/include/csi2.0/msm_ispif_hwreg.h
diff --git a/drivers/media/video/msm/csi/include/csi3.0/msm_csid_hwreg.h b/drivers/media/platform/msm/camera_v1/csi/include/csi3.0/msm_csid_hwreg.h
similarity index 100%
rename from drivers/media/video/msm/csi/include/csi3.0/msm_csid_hwreg.h
rename to drivers/media/platform/msm/camera_v1/csi/include/csi3.0/msm_csid_hwreg.h
diff --git a/drivers/media/video/msm/csi/include/csi3.0/msm_csiphy_hwreg.h b/drivers/media/platform/msm/camera_v1/csi/include/csi3.0/msm_csiphy_hwreg.h
similarity index 100%
rename from drivers/media/video/msm/csi/include/csi3.0/msm_csiphy_hwreg.h
rename to drivers/media/platform/msm/camera_v1/csi/include/csi3.0/msm_csiphy_hwreg.h
diff --git a/drivers/media/video/msm/csi/include/csi3.0/msm_ispif_hwreg.h b/drivers/media/platform/msm/camera_v1/csi/include/csi3.0/msm_ispif_hwreg.h
similarity index 100%
rename from drivers/media/video/msm/csi/include/csi3.0/msm_ispif_hwreg.h
rename to drivers/media/platform/msm/camera_v1/csi/include/csi3.0/msm_ispif_hwreg.h
diff --git a/drivers/media/video/msm/csi/msm_csi2_register.c b/drivers/media/platform/msm/camera_v1/csi/msm_csi2_register.c
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csi2_register.c
rename to drivers/media/platform/msm/camera_v1/csi/msm_csi2_register.c
diff --git a/drivers/media/video/msm/csi/msm_csi_register.h b/drivers/media/platform/msm/camera_v1/csi/msm_csi_register.h
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csi_register.h
rename to drivers/media/platform/msm/camera_v1/csi/msm_csi_register.h
diff --git a/drivers/media/video/msm/csi/msm_csic.c b/drivers/media/platform/msm/camera_v1/csi/msm_csic.c
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csic.c
rename to drivers/media/platform/msm/camera_v1/csi/msm_csic.c
diff --git a/drivers/media/video/msm/csi/msm_csic.h b/drivers/media/platform/msm/camera_v1/csi/msm_csic.h
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csic.h
rename to drivers/media/platform/msm/camera_v1/csi/msm_csic.h
diff --git a/drivers/media/video/msm/csi/msm_csic_register.c b/drivers/media/platform/msm/camera_v1/csi/msm_csic_register.c
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csic_register.c
rename to drivers/media/platform/msm/camera_v1/csi/msm_csic_register.c
diff --git a/drivers/media/video/msm/csi/msm_csid.c b/drivers/media/platform/msm/camera_v1/csi/msm_csid.c
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csid.c
rename to drivers/media/platform/msm/camera_v1/csi/msm_csid.c
diff --git a/drivers/media/video/msm/csi/msm_csid.h b/drivers/media/platform/msm/camera_v1/csi/msm_csid.h
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csid.h
rename to drivers/media/platform/msm/camera_v1/csi/msm_csid.h
diff --git a/drivers/media/video/msm/csi/msm_csiphy.c b/drivers/media/platform/msm/camera_v1/csi/msm_csiphy.c
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csiphy.c
rename to drivers/media/platform/msm/camera_v1/csi/msm_csiphy.c
diff --git a/drivers/media/video/msm/csi/msm_csiphy.h b/drivers/media/platform/msm/camera_v1/csi/msm_csiphy.h
similarity index 100%
rename from drivers/media/video/msm/csi/msm_csiphy.h
rename to drivers/media/platform/msm/camera_v1/csi/msm_csiphy.h
diff --git a/drivers/media/video/msm/csi/msm_ispif.c b/drivers/media/platform/msm/camera_v1/csi/msm_ispif.c
similarity index 100%
rename from drivers/media/video/msm/csi/msm_ispif.c
rename to drivers/media/platform/msm/camera_v1/csi/msm_ispif.c
diff --git a/drivers/media/video/msm/csi/msm_ispif.h b/drivers/media/platform/msm/camera_v1/csi/msm_ispif.h
similarity index 100%
rename from drivers/media/video/msm/csi/msm_ispif.h
rename to drivers/media/platform/msm/camera_v1/csi/msm_ispif.h
diff --git a/drivers/media/video/msm/eeprom/Makefile b/drivers/media/platform/msm/camera_v1/eeprom/Makefile
similarity index 100%
rename from drivers/media/video/msm/eeprom/Makefile
rename to drivers/media/platform/msm/camera_v1/eeprom/Makefile
diff --git a/drivers/media/video/msm/eeprom/imx074_eeprom.c b/drivers/media/platform/msm/camera_v1/eeprom/imx074_eeprom.c
similarity index 100%
rename from drivers/media/video/msm/eeprom/imx074_eeprom.c
rename to drivers/media/platform/msm/camera_v1/eeprom/imx074_eeprom.c
diff --git a/drivers/media/video/msm/eeprom/imx091_eeprom.c b/drivers/media/platform/msm/camera_v1/eeprom/imx091_eeprom.c
similarity index 100%
rename from drivers/media/video/msm/eeprom/imx091_eeprom.c
rename to drivers/media/platform/msm/camera_v1/eeprom/imx091_eeprom.c
diff --git a/drivers/media/video/msm/eeprom/msm_camera_eeprom.c b/drivers/media/platform/msm/camera_v1/eeprom/msm_camera_eeprom.c
similarity index 100%
rename from drivers/media/video/msm/eeprom/msm_camera_eeprom.c
rename to drivers/media/platform/msm/camera_v1/eeprom/msm_camera_eeprom.c
diff --git a/drivers/media/video/msm/eeprom/msm_camera_eeprom.h b/drivers/media/platform/msm/camera_v1/eeprom/msm_camera_eeprom.h
similarity index 100%
rename from drivers/media/video/msm/eeprom/msm_camera_eeprom.h
rename to drivers/media/platform/msm/camera_v1/eeprom/msm_camera_eeprom.h
diff --git a/drivers/media/video/msm/flash.c b/drivers/media/platform/msm/camera_v1/flash.c
similarity index 100%
rename from drivers/media/video/msm/flash.c
rename to drivers/media/platform/msm/camera_v1/flash.c
diff --git a/drivers/media/video/msm/flash_lm3559.c b/drivers/media/platform/msm/camera_v1/flash_lm3559.c
similarity index 100%
rename from drivers/media/video/msm/flash_lm3559.c
rename to drivers/media/platform/msm/camera_v1/flash_lm3559.c
diff --git a/drivers/media/video/msm/gemini/Makefile b/drivers/media/platform/msm/camera_v1/gemini/Makefile
similarity index 100%
rename from drivers/media/video/msm/gemini/Makefile
rename to drivers/media/platform/msm/camera_v1/gemini/Makefile
diff --git a/drivers/media/video/msm/gemini/msm_gemini_common.h b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_common.h
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_common.h
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_common.h
diff --git a/drivers/media/video/msm/gemini/msm_gemini_core.c b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_core.c
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_core.c
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_core.c
diff --git a/drivers/media/video/msm/gemini/msm_gemini_core.h b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_core.h
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_core.h
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_core.h
diff --git a/drivers/media/video/msm/gemini/msm_gemini_dev.c b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_dev.c
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_dev.c
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_dev.c
diff --git a/drivers/media/video/msm/gemini/msm_gemini_hw.c b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_hw.c
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_hw.c
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_hw.c
diff --git a/drivers/media/video/msm/gemini/msm_gemini_hw.h b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_hw.h
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_hw.h
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_hw.h
diff --git a/drivers/media/video/msm/gemini/msm_gemini_hw_reg.h b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_hw_reg.h
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_hw_reg.h
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_hw_reg.h
diff --git a/drivers/media/video/msm/gemini/msm_gemini_platform.c b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_platform.c
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_platform.c
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_platform.c
diff --git a/drivers/media/video/msm/gemini/msm_gemini_platform.h b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_platform.h
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_platform.h
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_platform.h
diff --git a/drivers/media/video/msm/gemini/msm_gemini_sync.c b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_sync.c
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_sync.c
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_sync.c
diff --git a/drivers/media/video/msm/gemini/msm_gemini_sync.h b/drivers/media/platform/msm/camera_v1/gemini/msm_gemini_sync.h
similarity index 100%
rename from drivers/media/video/msm/gemini/msm_gemini_sync.h
rename to drivers/media/platform/msm/camera_v1/gemini/msm_gemini_sync.h
diff --git a/drivers/media/video/msm/imx072.c b/drivers/media/platform/msm/camera_v1/imx072.c
similarity index 100%
rename from drivers/media/video/msm/imx072.c
rename to drivers/media/platform/msm/camera_v1/imx072.c
diff --git a/drivers/media/video/msm/imx072.h b/drivers/media/platform/msm/camera_v1/imx072.h
similarity index 100%
rename from drivers/media/video/msm/imx072.h
rename to drivers/media/platform/msm/camera_v1/imx072.h
diff --git a/drivers/media/video/msm/imx072_reg.c b/drivers/media/platform/msm/camera_v1/imx072_reg.c
similarity index 100%
rename from drivers/media/video/msm/imx072_reg.c
rename to drivers/media/platform/msm/camera_v1/imx072_reg.c
diff --git a/drivers/media/video/msm/imx074.c b/drivers/media/platform/msm/camera_v1/imx074.c
similarity index 100%
rename from drivers/media/video/msm/imx074.c
rename to drivers/media/platform/msm/camera_v1/imx074.c
diff --git a/drivers/media/video/msm/imx074.h b/drivers/media/platform/msm/camera_v1/imx074.h
similarity index 100%
rename from drivers/media/video/msm/imx074.h
rename to drivers/media/platform/msm/camera_v1/imx074.h
diff --git a/drivers/media/video/msm/imx074_reg.c b/drivers/media/platform/msm/camera_v1/imx074_reg.c
similarity index 100%
rename from drivers/media/video/msm/imx074_reg.c
rename to drivers/media/platform/msm/camera_v1/imx074_reg.c
diff --git a/drivers/media/video/msm/io/Makefile b/drivers/media/platform/msm/camera_v1/io/Makefile
similarity index 100%
rename from drivers/media/video/msm/io/Makefile
rename to drivers/media/platform/msm/camera_v1/io/Makefile
diff --git a/drivers/media/video/msm/io/msm_camera_i2c.c b/drivers/media/platform/msm/camera_v1/io/msm_camera_i2c.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_camera_i2c.c
rename to drivers/media/platform/msm/camera_v1/io/msm_camera_i2c.c
diff --git a/drivers/media/video/msm/io/msm_camera_i2c.h b/drivers/media/platform/msm/camera_v1/io/msm_camera_i2c.h
similarity index 100%
rename from drivers/media/video/msm/io/msm_camera_i2c.h
rename to drivers/media/platform/msm/camera_v1/io/msm_camera_i2c.h
diff --git a/drivers/media/video/msm/io/msm_camera_i2c_mux.c b/drivers/media/platform/msm/camera_v1/io/msm_camera_i2c_mux.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_camera_i2c_mux.c
rename to drivers/media/platform/msm/camera_v1/io/msm_camera_i2c_mux.c
diff --git a/drivers/media/video/msm/io/msm_camera_i2c_mux.h b/drivers/media/platform/msm/camera_v1/io/msm_camera_i2c_mux.h
similarity index 100%
rename from drivers/media/video/msm/io/msm_camera_i2c_mux.h
rename to drivers/media/platform/msm/camera_v1/io/msm_camera_i2c_mux.h
diff --git a/drivers/media/video/msm/io/msm_camera_io_util.c b/drivers/media/platform/msm/camera_v1/io/msm_camera_io_util.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_camera_io_util.c
rename to drivers/media/platform/msm/camera_v1/io/msm_camera_io_util.c
diff --git a/drivers/media/video/msm/io/msm_io7x.c b/drivers/media/platform/msm/camera_v1/io/msm_io7x.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io7x.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io7x.c
diff --git a/drivers/media/video/msm/io/msm_io8x.c b/drivers/media/platform/msm/camera_v1/io/msm_io8x.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io8x.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io8x.c
diff --git a/drivers/media/video/msm/io/msm_io_7x27a.c b/drivers/media/platform/msm/camera_v1/io/msm_io_7x27a.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io_7x27a.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io_7x27a.c
diff --git a/drivers/media/video/msm/io/msm_io_7x27a_v4l2.c b/drivers/media/platform/msm/camera_v1/io/msm_io_7x27a_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io_7x27a_v4l2.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io_7x27a_v4l2.c
diff --git a/drivers/media/video/msm/io/msm_io_8960.c b/drivers/media/platform/msm/camera_v1/io/msm_io_8960.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io_8960.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io_8960.c
diff --git a/drivers/media/video/msm/io/msm_io_8x60.c b/drivers/media/platform/msm/camera_v1/io/msm_io_8x60.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io_8x60.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io_8x60.c
diff --git a/drivers/media/video/msm/io/msm_io_vfe31.c b/drivers/media/platform/msm/camera_v1/io/msm_io_vfe31.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io_vfe31.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io_vfe31.c
diff --git a/drivers/media/video/msm/io/msm_io_vfe31_v4l2.c b/drivers/media/platform/msm/camera_v1/io/msm_io_vfe31_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/io/msm_io_vfe31_v4l2.c
rename to drivers/media/platform/msm/camera_v1/io/msm_io_vfe31_v4l2.c
diff --git a/drivers/media/video/msm/mercury/Makefile b/drivers/media/platform/msm/camera_v1/mercury/Makefile
similarity index 100%
rename from drivers/media/video/msm/mercury/Makefile
rename to drivers/media/platform/msm/camera_v1/mercury/Makefile
diff --git a/drivers/media/video/msm/mercury/msm_mercury_common.h b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_common.h
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_common.h
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_common.h
diff --git a/drivers/media/video/msm/mercury/msm_mercury_core.c b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_core.c
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_core.c
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_core.c
diff --git a/drivers/media/video/msm/mercury/msm_mercury_core.h b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_core.h
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_core.h
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_core.h
diff --git a/drivers/media/video/msm/mercury/msm_mercury_dev.c b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_dev.c
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_dev.c
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_dev.c
diff --git a/drivers/media/video/msm/mercury/msm_mercury_hw.c b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_hw.c
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_hw.c
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_hw.c
diff --git a/drivers/media/video/msm/mercury/msm_mercury_hw.h b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_hw.h
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_hw.h
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_hw.h
diff --git a/drivers/media/video/msm/mercury/msm_mercury_hw_reg.h b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_hw_reg.h
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_hw_reg.h
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_hw_reg.h
diff --git a/drivers/media/video/msm/mercury/msm_mercury_macros.h b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_macros.h
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_macros.h
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_macros.h
diff --git a/drivers/media/video/msm/mercury/msm_mercury_platform.c b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_platform.c
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_platform.c
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_platform.c
diff --git a/drivers/media/video/msm/mercury/msm_mercury_platform.h b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_platform.h
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_platform.h
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_platform.h
diff --git a/drivers/media/video/msm/mercury/msm_mercury_sync.c b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_sync.c
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_sync.c
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_sync.c
diff --git a/drivers/media/video/msm/mercury/msm_mercury_sync.h b/drivers/media/platform/msm/camera_v1/mercury/msm_mercury_sync.h
similarity index 100%
rename from drivers/media/video/msm/mercury/msm_mercury_sync.h
rename to drivers/media/platform/msm/camera_v1/mercury/msm_mercury_sync.h
diff --git a/drivers/media/video/msm/msm.c b/drivers/media/platform/msm/camera_v1/msm.c
similarity index 100%
rename from drivers/media/video/msm/msm.c
rename to drivers/media/platform/msm/camera_v1/msm.c
diff --git a/drivers/media/video/msm/msm.h b/drivers/media/platform/msm/camera_v1/msm.h
similarity index 100%
rename from drivers/media/video/msm/msm.h
rename to drivers/media/platform/msm/camera_v1/msm.h
diff --git a/drivers/media/video/msm/msm_axi_qos.c b/drivers/media/platform/msm/camera_v1/msm_axi_qos.c
similarity index 100%
rename from drivers/media/video/msm/msm_axi_qos.c
rename to drivers/media/platform/msm/camera_v1/msm_axi_qos.c
diff --git a/drivers/media/video/msm/msm_camera.c b/drivers/media/platform/msm/camera_v1/msm_camera.c
similarity index 100%
rename from drivers/media/video/msm/msm_camera.c
rename to drivers/media/platform/msm/camera_v1/msm_camera.c
diff --git a/drivers/media/video/msm/msm_camirq_router.c b/drivers/media/platform/msm/camera_v1/msm_camirq_router.c
similarity index 100%
rename from drivers/media/video/msm/msm_camirq_router.c
rename to drivers/media/platform/msm/camera_v1/msm_camirq_router.c
diff --git a/drivers/media/video/msm/msm_camirq_router.h b/drivers/media/platform/msm/camera_v1/msm_camirq_router.h
similarity index 100%
rename from drivers/media/video/msm/msm_camirq_router.h
rename to drivers/media/platform/msm/camera_v1/msm_camirq_router.h
diff --git a/drivers/media/video/msm/msm_gesture.c b/drivers/media/platform/msm/camera_v1/msm_gesture.c
similarity index 100%
rename from drivers/media/video/msm/msm_gesture.c
rename to drivers/media/platform/msm/camera_v1/msm_gesture.c
diff --git a/drivers/media/video/msm/msm_isp.c b/drivers/media/platform/msm/camera_v1/msm_isp.c
similarity index 100%
rename from drivers/media/video/msm/msm_isp.c
rename to drivers/media/platform/msm/camera_v1/msm_isp.c
diff --git a/drivers/media/video/msm/msm_mctl.c b/drivers/media/platform/msm/camera_v1/msm_mctl.c
similarity index 100%
rename from drivers/media/video/msm/msm_mctl.c
rename to drivers/media/platform/msm/camera_v1/msm_mctl.c
diff --git a/drivers/media/video/msm/msm_mctl_buf.c b/drivers/media/platform/msm/camera_v1/msm_mctl_buf.c
similarity index 100%
rename from drivers/media/video/msm/msm_mctl_buf.c
rename to drivers/media/platform/msm/camera_v1/msm_mctl_buf.c
diff --git a/drivers/media/video/msm/msm_mctl_pp.c b/drivers/media/platform/msm/camera_v1/msm_mctl_pp.c
similarity index 100%
rename from drivers/media/video/msm/msm_mctl_pp.c
rename to drivers/media/platform/msm/camera_v1/msm_mctl_pp.c
diff --git a/drivers/media/video/msm/msm_mem.c b/drivers/media/platform/msm/camera_v1/msm_mem.c
similarity index 100%
rename from drivers/media/video/msm/msm_mem.c
rename to drivers/media/platform/msm/camera_v1/msm_mem.c
diff --git a/drivers/media/video/msm/msm_v4l2_video.c b/drivers/media/platform/msm/camera_v1/msm_v4l2_video.c
similarity index 100%
rename from drivers/media/video/msm/msm_v4l2_video.c
rename to drivers/media/platform/msm/camera_v1/msm_v4l2_video.c
diff --git a/drivers/media/video/msm/msm_v4l2_video.h b/drivers/media/platform/msm/camera_v1/msm_v4l2_video.h
similarity index 100%
rename from drivers/media/video/msm/msm_v4l2_video.h
rename to drivers/media/platform/msm/camera_v1/msm_v4l2_video.h
diff --git a/drivers/media/video/msm/msm_vpe.c b/drivers/media/platform/msm/camera_v1/msm_vpe.c
similarity index 100%
rename from drivers/media/video/msm/msm_vpe.c
rename to drivers/media/platform/msm/camera_v1/msm_vpe.c
diff --git a/drivers/media/video/msm/msm_vpe.h b/drivers/media/platform/msm/camera_v1/msm_vpe.h
similarity index 100%
rename from drivers/media/video/msm/msm_vpe.h
rename to drivers/media/platform/msm/camera_v1/msm_vpe.h
diff --git a/drivers/media/video/msm/msm_vpe1.c b/drivers/media/platform/msm/camera_v1/msm_vpe1.c
similarity index 100%
rename from drivers/media/video/msm/msm_vpe1.c
rename to drivers/media/platform/msm/camera_v1/msm_vpe1.c
diff --git a/drivers/media/video/msm/msm_vpe1.h b/drivers/media/platform/msm/camera_v1/msm_vpe1.h
similarity index 100%
rename from drivers/media/video/msm/msm_vpe1.h
rename to drivers/media/platform/msm/camera_v1/msm_vpe1.h
diff --git a/drivers/media/video/msm/mt9d112.c b/drivers/media/platform/msm/camera_v1/mt9d112.c
similarity index 100%
rename from drivers/media/video/msm/mt9d112.c
rename to drivers/media/platform/msm/camera_v1/mt9d112.c
diff --git a/drivers/media/video/msm/mt9d112.h b/drivers/media/platform/msm/camera_v1/mt9d112.h
similarity index 100%
rename from drivers/media/video/msm/mt9d112.h
rename to drivers/media/platform/msm/camera_v1/mt9d112.h
diff --git a/drivers/media/video/msm/mt9d112_reg.c b/drivers/media/platform/msm/camera_v1/mt9d112_reg.c
similarity index 100%
rename from drivers/media/video/msm/mt9d112_reg.c
rename to drivers/media/platform/msm/camera_v1/mt9d112_reg.c
diff --git a/drivers/media/video/msm/mt9d113.c b/drivers/media/platform/msm/camera_v1/mt9d113.c
similarity index 100%
rename from drivers/media/video/msm/mt9d113.c
rename to drivers/media/platform/msm/camera_v1/mt9d113.c
diff --git a/drivers/media/video/msm/mt9d113.h b/drivers/media/platform/msm/camera_v1/mt9d113.h
similarity index 100%
rename from drivers/media/video/msm/mt9d113.h
rename to drivers/media/platform/msm/camera_v1/mt9d113.h
diff --git a/drivers/media/video/msm/mt9d113_reg.c b/drivers/media/platform/msm/camera_v1/mt9d113_reg.c
similarity index 100%
rename from drivers/media/video/msm/mt9d113_reg.c
rename to drivers/media/platform/msm/camera_v1/mt9d113_reg.c
diff --git a/drivers/media/video/msm/mt9e013.c b/drivers/media/platform/msm/camera_v1/mt9e013.c
similarity index 100%
rename from drivers/media/video/msm/mt9e013.c
rename to drivers/media/platform/msm/camera_v1/mt9e013.c
diff --git a/drivers/media/video/msm/mt9e013.h b/drivers/media/platform/msm/camera_v1/mt9e013.h
similarity index 100%
rename from drivers/media/video/msm/mt9e013.h
rename to drivers/media/platform/msm/camera_v1/mt9e013.h
diff --git a/drivers/media/video/msm/mt9e013_reg.c b/drivers/media/platform/msm/camera_v1/mt9e013_reg.c
similarity index 100%
rename from drivers/media/video/msm/mt9e013_reg.c
rename to drivers/media/platform/msm/camera_v1/mt9e013_reg.c
diff --git a/drivers/media/video/msm/mt9p012.h b/drivers/media/platform/msm/camera_v1/mt9p012.h
similarity index 100%
rename from drivers/media/video/msm/mt9p012.h
rename to drivers/media/platform/msm/camera_v1/mt9p012.h
diff --git a/drivers/media/video/msm/mt9p012_bam.c b/drivers/media/platform/msm/camera_v1/mt9p012_bam.c
similarity index 100%
rename from drivers/media/video/msm/mt9p012_bam.c
rename to drivers/media/platform/msm/camera_v1/mt9p012_bam.c
diff --git a/drivers/media/video/msm/mt9p012_fox.c b/drivers/media/platform/msm/camera_v1/mt9p012_fox.c
similarity index 100%
rename from drivers/media/video/msm/mt9p012_fox.c
rename to drivers/media/platform/msm/camera_v1/mt9p012_fox.c
diff --git a/drivers/media/video/msm/mt9p012_km.c b/drivers/media/platform/msm/camera_v1/mt9p012_km.c
similarity index 100%
rename from drivers/media/video/msm/mt9p012_km.c
rename to drivers/media/platform/msm/camera_v1/mt9p012_km.c
diff --git a/drivers/media/video/msm/mt9p012_km.h b/drivers/media/platform/msm/camera_v1/mt9p012_km.h
similarity index 100%
rename from drivers/media/video/msm/mt9p012_km.h
rename to drivers/media/platform/msm/camera_v1/mt9p012_km.h
diff --git a/drivers/media/video/msm/mt9p012_km_reg.c b/drivers/media/platform/msm/camera_v1/mt9p012_km_reg.c
similarity index 100%
rename from drivers/media/video/msm/mt9p012_km_reg.c
rename to drivers/media/platform/msm/camera_v1/mt9p012_km_reg.c
diff --git a/drivers/media/video/msm/mt9p012_reg.c b/drivers/media/platform/msm/camera_v1/mt9p012_reg.c
similarity index 100%
rename from drivers/media/video/msm/mt9p012_reg.c
rename to drivers/media/platform/msm/camera_v1/mt9p012_reg.c
diff --git a/drivers/media/video/msm/mt9t013.c b/drivers/media/platform/msm/camera_v1/mt9t013.c
similarity index 100%
rename from drivers/media/video/msm/mt9t013.c
rename to drivers/media/platform/msm/camera_v1/mt9t013.c
diff --git a/drivers/media/video/msm/mt9t013.h b/drivers/media/platform/msm/camera_v1/mt9t013.h
similarity index 100%
rename from drivers/media/video/msm/mt9t013.h
rename to drivers/media/platform/msm/camera_v1/mt9t013.h
diff --git a/drivers/media/video/msm/mt9t013_reg.c b/drivers/media/platform/msm/camera_v1/mt9t013_reg.c
similarity index 100%
rename from drivers/media/video/msm/mt9t013_reg.c
rename to drivers/media/platform/msm/camera_v1/mt9t013_reg.c
diff --git a/drivers/media/video/msm/ov5640.c b/drivers/media/platform/msm/camera_v1/ov5640.c
similarity index 100%
rename from drivers/media/video/msm/ov5640.c
rename to drivers/media/platform/msm/camera_v1/ov5640.c
diff --git a/drivers/media/video/msm/ov5640.h b/drivers/media/platform/msm/camera_v1/ov5640.h
similarity index 100%
rename from drivers/media/video/msm/ov5640.h
rename to drivers/media/platform/msm/camera_v1/ov5640.h
diff --git a/drivers/media/video/msm/ov5647.c b/drivers/media/platform/msm/camera_v1/ov5647.c
similarity index 100%
rename from drivers/media/video/msm/ov5647.c
rename to drivers/media/platform/msm/camera_v1/ov5647.c
diff --git a/drivers/media/video/msm/ov5647.h b/drivers/media/platform/msm/camera_v1/ov5647.h
similarity index 100%
rename from drivers/media/video/msm/ov5647.h
rename to drivers/media/platform/msm/camera_v1/ov5647.h
diff --git a/drivers/media/video/msm/ov5647_reg.c b/drivers/media/platform/msm/camera_v1/ov5647_reg.c
similarity index 100%
rename from drivers/media/video/msm/ov5647_reg.c
rename to drivers/media/platform/msm/camera_v1/ov5647_reg.c
diff --git a/drivers/media/video/msm/ov7692.c b/drivers/media/platform/msm/camera_v1/ov7692.c
similarity index 100%
rename from drivers/media/video/msm/ov7692.c
rename to drivers/media/platform/msm/camera_v1/ov7692.c
diff --git a/drivers/media/video/msm/ov7692.h b/drivers/media/platform/msm/camera_v1/ov7692.h
similarity index 100%
rename from drivers/media/video/msm/ov7692.h
rename to drivers/media/platform/msm/camera_v1/ov7692.h
diff --git a/drivers/media/video/msm/ov7692_qrd.c b/drivers/media/platform/msm/camera_v1/ov7692_qrd.c
similarity index 100%
rename from drivers/media/video/msm/ov7692_qrd.c
rename to drivers/media/platform/msm/camera_v1/ov7692_qrd.c
diff --git a/drivers/media/video/msm/ov9726.c b/drivers/media/platform/msm/camera_v1/ov9726.c
similarity index 100%
rename from drivers/media/video/msm/ov9726.c
rename to drivers/media/platform/msm/camera_v1/ov9726.c
diff --git a/drivers/media/video/msm/ov9726.h b/drivers/media/platform/msm/camera_v1/ov9726.h
similarity index 100%
rename from drivers/media/video/msm/ov9726.h
rename to drivers/media/platform/msm/camera_v1/ov9726.h
diff --git a/drivers/media/video/msm/ov9726_reg.c b/drivers/media/platform/msm/camera_v1/ov9726_reg.c
similarity index 100%
rename from drivers/media/video/msm/ov9726_reg.c
rename to drivers/media/platform/msm/camera_v1/ov9726_reg.c
diff --git a/drivers/media/video/msm/qs_s5k4e1.c b/drivers/media/platform/msm/camera_v1/qs_s5k4e1.c
similarity index 100%
rename from drivers/media/video/msm/qs_s5k4e1.c
rename to drivers/media/platform/msm/camera_v1/qs_s5k4e1.c
diff --git a/drivers/media/video/msm/qs_s5k4e1.h b/drivers/media/platform/msm/camera_v1/qs_s5k4e1.h
similarity index 100%
rename from drivers/media/video/msm/qs_s5k4e1.h
rename to drivers/media/platform/msm/camera_v1/qs_s5k4e1.h
diff --git a/drivers/media/video/msm/qs_s5k4e1_reg.c b/drivers/media/platform/msm/camera_v1/qs_s5k4e1_reg.c
similarity index 100%
rename from drivers/media/video/msm/qs_s5k4e1_reg.c
rename to drivers/media/platform/msm/camera_v1/qs_s5k4e1_reg.c
diff --git a/drivers/media/video/msm/s5k3e2fx.c b/drivers/media/platform/msm/camera_v1/s5k3e2fx.c
similarity index 100%
rename from drivers/media/video/msm/s5k3e2fx.c
rename to drivers/media/platform/msm/camera_v1/s5k3e2fx.c
diff --git a/drivers/media/video/msm/s5k3e2fx.h b/drivers/media/platform/msm/camera_v1/s5k3e2fx.h
similarity index 100%
rename from drivers/media/video/msm/s5k3e2fx.h
rename to drivers/media/platform/msm/camera_v1/s5k3e2fx.h
diff --git a/drivers/media/video/msm/s5k4e1.c b/drivers/media/platform/msm/camera_v1/s5k4e1.c
similarity index 100%
rename from drivers/media/video/msm/s5k4e1.c
rename to drivers/media/platform/msm/camera_v1/s5k4e1.c
diff --git a/drivers/media/video/msm/s5k4e1.h b/drivers/media/platform/msm/camera_v1/s5k4e1.h
similarity index 100%
rename from drivers/media/video/msm/s5k4e1.h
rename to drivers/media/platform/msm/camera_v1/s5k4e1.h
diff --git a/drivers/media/video/msm/s5k4e1_reg.c b/drivers/media/platform/msm/camera_v1/s5k4e1_reg.c
similarity index 100%
rename from drivers/media/video/msm/s5k4e1_reg.c
rename to drivers/media/platform/msm/camera_v1/s5k4e1_reg.c
diff --git a/drivers/media/video/msm/sensors/Makefile b/drivers/media/platform/msm/camera_v1/sensors/Makefile
similarity index 100%
rename from drivers/media/video/msm/sensors/Makefile
rename to drivers/media/platform/msm/camera_v1/sensors/Makefile
diff --git a/drivers/media/video/msm/sensors/imx074_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/imx074_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/imx074_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/imx074_v4l2.c
diff --git a/drivers/media/video/msm/sensors/imx091.c b/drivers/media/platform/msm/camera_v1/sensors/imx091.c
similarity index 100%
rename from drivers/media/video/msm/sensors/imx091.c
rename to drivers/media/platform/msm/camera_v1/sensors/imx091.c
diff --git a/drivers/media/video/msm/sensors/imx111.c b/drivers/media/platform/msm/camera_v1/sensors/imx111.c
similarity index 100%
rename from drivers/media/video/msm/sensors/imx111.c
rename to drivers/media/platform/msm/camera_v1/sensors/imx111.c
diff --git a/drivers/media/video/msm/sensors/imx119_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/imx119_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/imx119_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/imx119_v4l2.c
diff --git a/drivers/media/video/msm/sensors/msm_sensor.c b/drivers/media/platform/msm/camera_v1/sensors/msm_sensor.c
similarity index 100%
rename from drivers/media/video/msm/sensors/msm_sensor.c
rename to drivers/media/platform/msm/camera_v1/sensors/msm_sensor.c
diff --git a/drivers/media/video/msm/sensors/msm_sensor.h b/drivers/media/platform/msm/camera_v1/sensors/msm_sensor.h
similarity index 100%
rename from drivers/media/video/msm/sensors/msm_sensor.h
rename to drivers/media/platform/msm/camera_v1/sensors/msm_sensor.h
diff --git a/drivers/media/video/msm/sensors/mt9e013_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/mt9e013_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/mt9e013_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/mt9e013_v4l2.c
diff --git a/drivers/media/video/msm/sensors/mt9m114_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/mt9m114_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/mt9m114_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/mt9m114_v4l2.c
diff --git a/drivers/media/video/msm/sensors/ov2720.c b/drivers/media/platform/msm/camera_v1/sensors/ov2720.c
similarity index 100%
rename from drivers/media/video/msm/sensors/ov2720.c
rename to drivers/media/platform/msm/camera_v1/sensors/ov2720.c
diff --git a/drivers/media/video/msm/sensors/ov2720.h b/drivers/media/platform/msm/camera_v1/sensors/ov2720.h
similarity index 100%
rename from drivers/media/video/msm/sensors/ov2720.h
rename to drivers/media/platform/msm/camera_v1/sensors/ov2720.h
diff --git a/drivers/media/video/msm/sensors/ov5647_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/ov5647_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/ov5647_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/ov5647_v4l2.c
diff --git a/drivers/media/video/msm/sensors/ov7692_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/ov7692_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/ov7692_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/ov7692_v4l2.c
diff --git a/drivers/media/video/msm/sensors/ov8825_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/ov8825_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/ov8825_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/ov8825_v4l2.c
diff --git a/drivers/media/video/msm/sensors/ov9726_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/ov9726_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/ov9726_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/ov9726_v4l2.c
diff --git a/drivers/media/video/msm/sensors/s5k3l1yx.c b/drivers/media/platform/msm/camera_v1/sensors/s5k3l1yx.c
similarity index 100%
rename from drivers/media/video/msm/sensors/s5k3l1yx.c
rename to drivers/media/platform/msm/camera_v1/sensors/s5k3l1yx.c
diff --git a/drivers/media/video/msm/sensors/s5k4e1_v4l2.c b/drivers/media/platform/msm/camera_v1/sensors/s5k4e1_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/sensors/s5k4e1_v4l2.c
rename to drivers/media/platform/msm/camera_v1/sensors/s5k4e1_v4l2.c
diff --git a/drivers/media/video/msm/sensors/vx6953.c b/drivers/media/platform/msm/camera_v1/sensors/vx6953.c
similarity index 100%
rename from drivers/media/video/msm/sensors/vx6953.c
rename to drivers/media/platform/msm/camera_v1/sensors/vx6953.c
diff --git a/drivers/media/video/msm/sensors/vx6953.h b/drivers/media/platform/msm/camera_v1/sensors/vx6953.h
similarity index 100%
rename from drivers/media/video/msm/sensors/vx6953.h
rename to drivers/media/platform/msm/camera_v1/sensors/vx6953.h
diff --git a/drivers/media/video/msm/sensors/vx6953_reg.h b/drivers/media/platform/msm/camera_v1/sensors/vx6953_reg.h
similarity index 100%
rename from drivers/media/video/msm/sensors/vx6953_reg.h
rename to drivers/media/platform/msm/camera_v1/sensors/vx6953_reg.h
diff --git a/drivers/media/video/msm/server/Makefile b/drivers/media/platform/msm/camera_v1/server/Makefile
similarity index 100%
rename from drivers/media/video/msm/server/Makefile
rename to drivers/media/platform/msm/camera_v1/server/Makefile
diff --git a/drivers/media/video/msm/server/msm_cam_server.c b/drivers/media/platform/msm/camera_v1/server/msm_cam_server.c
similarity index 100%
rename from drivers/media/video/msm/server/msm_cam_server.c
rename to drivers/media/platform/msm/camera_v1/server/msm_cam_server.c
diff --git a/drivers/media/video/msm/server/msm_cam_server.h b/drivers/media/platform/msm/camera_v1/server/msm_cam_server.h
similarity index 100%
rename from drivers/media/video/msm/server/msm_cam_server.h
rename to drivers/media/platform/msm/camera_v1/server/msm_cam_server.h
diff --git a/drivers/media/video/msm/sn12m0pz.c b/drivers/media/platform/msm/camera_v1/sn12m0pz.c
similarity index 100%
rename from drivers/media/video/msm/sn12m0pz.c
rename to drivers/media/platform/msm/camera_v1/sn12m0pz.c
diff --git a/drivers/media/video/msm/sn12m0pz.h b/drivers/media/platform/msm/camera_v1/sn12m0pz.h
similarity index 100%
rename from drivers/media/video/msm/sn12m0pz.h
rename to drivers/media/platform/msm/camera_v1/sn12m0pz.h
diff --git a/drivers/media/video/msm/sn12m0pz_reg.c b/drivers/media/platform/msm/camera_v1/sn12m0pz_reg.c
similarity index 100%
rename from drivers/media/video/msm/sn12m0pz_reg.c
rename to drivers/media/platform/msm/camera_v1/sn12m0pz_reg.c
diff --git a/drivers/media/video/msm/vb6801.c b/drivers/media/platform/msm/camera_v1/vb6801.c
similarity index 100%
rename from drivers/media/video/msm/vb6801.c
rename to drivers/media/platform/msm/camera_v1/vb6801.c
diff --git a/drivers/media/video/msm/vb6801.h b/drivers/media/platform/msm/camera_v1/vb6801.h
similarity index 100%
rename from drivers/media/video/msm/vb6801.h
rename to drivers/media/platform/msm/camera_v1/vb6801.h
diff --git a/drivers/media/video/msm/vfe/Makefile b/drivers/media/platform/msm/camera_v1/vfe/Makefile
similarity index 100%
rename from drivers/media/video/msm/vfe/Makefile
rename to drivers/media/platform/msm/camera_v1/vfe/Makefile
diff --git a/drivers/media/video/msm/vfe/msm_vfe31.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe31.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe31.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe31.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe31.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe31.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe31.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe31.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe31_v4l2.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe31_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe31_v4l2.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe31_v4l2.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe31_v4l2.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe31_v4l2.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe31_v4l2.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe31_v4l2.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe32.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe32.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe32.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe32.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe32.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe32.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe32.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe32.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe40.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe40.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe40.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe40.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe40.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe40.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe40.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe40.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe40_axi.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe40_axi.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe40_axi.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe40_axi.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe7x.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe7x.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe7x.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe7x.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe7x27a.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe7x27a.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe7x27a.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe7x27a.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe7x27a_v4l2.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe7x27a_v4l2.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a_v4l2.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe7x27a_v4l2.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a_v4l2.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe7x27a_v4l2.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe7x27a_v4l2.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe8x.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe8x.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe8x.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe8x.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe8x_proc.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x_proc.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe8x_proc.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x_proc.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe8x_proc.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x_proc.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe8x_proc.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe8x_proc.h
diff --git a/drivers/media/video/msm/vfe/msm_vfe_stats_buf.c b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe_stats_buf.c
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe_stats_buf.c
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe_stats_buf.c
diff --git a/drivers/media/video/msm/vfe/msm_vfe_stats_buf.h b/drivers/media/platform/msm/camera_v1/vfe/msm_vfe_stats_buf.h
similarity index 100%
rename from drivers/media/video/msm/vfe/msm_vfe_stats_buf.h
rename to drivers/media/platform/msm/camera_v1/vfe/msm_vfe_stats_buf.h
diff --git a/drivers/media/video/msm/vx6953.c b/drivers/media/platform/msm/camera_v1/vx6953.c
similarity index 100%
rename from drivers/media/video/msm/vx6953.c
rename to drivers/media/platform/msm/camera_v1/vx6953.c
diff --git a/drivers/media/video/msm/vx6953.h b/drivers/media/platform/msm/camera_v1/vx6953.h
similarity index 100%
rename from drivers/media/video/msm/vx6953.h
rename to drivers/media/platform/msm/camera_v1/vx6953.h
diff --git a/drivers/media/video/msm/vx6953_reg.c b/drivers/media/platform/msm/camera_v1/vx6953_reg.c
similarity index 100%
rename from drivers/media/video/msm/vx6953_reg.c
rename to drivers/media/platform/msm/camera_v1/vx6953_reg.c
diff --git a/drivers/media/video/msm/vx6953_reg_v4l2.c b/drivers/media/platform/msm/camera_v1/vx6953_reg_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/vx6953_reg_v4l2.c
rename to drivers/media/platform/msm/camera_v1/vx6953_reg_v4l2.c
diff --git a/drivers/media/video/msm/vx6953_v4l2.c b/drivers/media/platform/msm/camera_v1/vx6953_v4l2.c
similarity index 100%
rename from drivers/media/video/msm/vx6953_v4l2.c
rename to drivers/media/platform/msm/camera_v1/vx6953_v4l2.c
diff --git a/drivers/media/video/msm/vx6953_v4l2.h b/drivers/media/platform/msm/camera_v1/vx6953_v4l2.h
similarity index 100%
rename from drivers/media/video/msm/vx6953_v4l2.h
rename to drivers/media/platform/msm/camera_v1/vx6953_v4l2.h
diff --git a/drivers/media/video/msmb/Kconfig b/drivers/media/platform/msm/camera_v2/Kconfig
similarity index 100%
rename from drivers/media/video/msmb/Kconfig
rename to drivers/media/platform/msm/camera_v2/Kconfig
diff --git a/drivers/media/platform/msm/camera_v2/Makefile b/drivers/media/platform/msm/camera_v2/Makefile
new file mode 100644
index 000000000000..51588c408c83
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/Makefile
@@ -0,0 +1,15 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/codecs
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/isps
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/pps
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/msm_vb2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/camera
+
+obj-$(CONFIG_MSMB_CAMERA) += msm.o
+obj-$(CONFIG_MSMB_CAMERA) += camera/
+obj-$(CONFIG_MSMB_CAMERA) += msm_vb2/
+obj-$(CONFIG_MSMB_CAMERA) += sensor/
+obj-$(CONFIG_MSMB_CAMERA) += isp/
+obj-$(CONFIG_MSMB_CAMERA) += ispif/
+obj-$(CONFIG_MSMB_CAMERA) += msm_buf_mgr/
diff --git a/drivers/media/platform/msm/camera_v2/camera/Makefile b/drivers/media/platform/msm/camera_v2/camera/Makefile
new file mode 100644
index 000000000000..bd707509d50e
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/camera/Makefile
@@ -0,0 +1,3 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/msm_vb2
+obj-$(CONFIG_MSMB_CAMERA) += camera.o
diff --git a/drivers/media/video/msmb/camera/camera.c b/drivers/media/platform/msm/camera_v2/camera/camera.c
similarity index 100%
rename from drivers/media/video/msmb/camera/camera.c
rename to drivers/media/platform/msm/camera_v2/camera/camera.c
diff --git a/drivers/media/video/msmb/camera/camera.h b/drivers/media/platform/msm/camera_v2/camera/camera.h
similarity index 100%
rename from drivers/media/video/msmb/camera/camera.h
rename to drivers/media/platform/msm/camera_v2/camera/camera.h
diff --git a/drivers/media/video/msmb/isp/Makefile b/drivers/media/platform/msm/camera_v2/isp/Makefile
similarity index 58%
rename from drivers/media/video/msmb/isp/Makefile
rename to drivers/media/platform/msm/camera_v2/isp/Makefile
index 67a342e17c91..f6e7cc4a0795 100644
--- a/drivers/media/video/msmb/isp/Makefile
+++ b/drivers/media/platform/msm/camera_v2/isp/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/sensor/io
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
 obj-$(CONFIG_MSMB_CAMERA) += msm_isp.o msm_buf_mgr.o msm_isp_util.o msm_isp_axi_util.o msm_isp_stats_util.o
 obj-$(CONFIG_MSMB_CAMERA) += msm_isp40.o msm_isp32.o
diff --git a/drivers/media/video/msmb/isp/msm_buf_mgr.c b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_buf_mgr.c
rename to drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
diff --git a/drivers/media/video/msmb/isp/msm_buf_mgr.h b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.h
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_buf_mgr.h
rename to drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.h
diff --git a/drivers/media/video/msmb/isp/msm_isp.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp.c
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp.c
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp.c
diff --git a/drivers/media/video/msmb/isp/msm_isp.h b/drivers/media/platform/msm/camera_v2/isp/msm_isp.h
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp.h
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp.h
diff --git a/drivers/media/video/msmb/isp/msm_isp32.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp32.c
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
diff --git a/drivers/media/video/msmb/isp/msm_isp32.h b/drivers/media/platform/msm/camera_v2/isp/msm_isp32.h
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp32.h
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp32.h
diff --git a/drivers/media/video/msmb/isp/msm_isp40.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp40.c
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
diff --git a/drivers/media/video/msmb/isp/msm_isp40.h b/drivers/media/platform/msm/camera_v2/isp/msm_isp40.h
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp40.h
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp40.h
diff --git a/drivers/media/video/msmb/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp_axi_util.c
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
diff --git a/drivers/media/video/msmb/isp/msm_isp_axi_util.h b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.h
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp_axi_util.h
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.h
diff --git a/drivers/media/video/msmb/isp/msm_isp_stats_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp_stats_util.c
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
diff --git a/drivers/media/video/msmb/isp/msm_isp_stats_util.h b/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.h
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp_stats_util.h
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.h
diff --git a/drivers/media/video/msmb/isp/msm_isp_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp_util.c
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
diff --git a/drivers/media/video/msmb/isp/msm_isp_util.h b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.h
similarity index 100%
rename from drivers/media/video/msmb/isp/msm_isp_util.h
rename to drivers/media/platform/msm/camera_v2/isp/msm_isp_util.h
diff --git a/drivers/media/platform/msm/camera_v2/ispif/Makefile b/drivers/media/platform/msm/camera_v2/ispif/Makefile
new file mode 100644
index 000000000000..443911f3bccc
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/ispif/Makefile
@@ -0,0 +1,3 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
+obj-$(CONFIG_MSM_CSID) += msm_ispif.o
diff --git a/drivers/media/video/msmb/ispif/msm_ispif.c b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
similarity index 100%
rename from drivers/media/video/msmb/ispif/msm_ispif.c
rename to drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
diff --git a/drivers/media/video/msmb/ispif/msm_ispif.h b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.h
similarity index 100%
rename from drivers/media/video/msmb/ispif/msm_ispif.h
rename to drivers/media/platform/msm/camera_v2/ispif/msm_ispif.h
diff --git a/drivers/media/video/msmb/ispif/msm_ispif_hwreg_v1.h b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif_hwreg_v1.h
similarity index 100%
rename from drivers/media/video/msmb/ispif/msm_ispif_hwreg_v1.h
rename to drivers/media/platform/msm/camera_v2/ispif/msm_ispif_hwreg_v1.h
diff --git a/drivers/media/video/msmb/ispif/msm_ispif_hwreg_v2.h b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif_hwreg_v2.h
similarity index 100%
rename from drivers/media/video/msmb/ispif/msm_ispif_hwreg_v2.h
rename to drivers/media/platform/msm/camera_v2/ispif/msm_ispif_hwreg_v2.h
diff --git a/drivers/media/video/msmb/msm.c b/drivers/media/platform/msm/camera_v2/msm.c
similarity index 100%
rename from drivers/media/video/msmb/msm.c
rename to drivers/media/platform/msm/camera_v2/msm.c
diff --git a/drivers/media/video/msmb/msm.h b/drivers/media/platform/msm/camera_v2/msm.h
similarity index 100%
rename from drivers/media/video/msmb/msm.h
rename to drivers/media/platform/msm/camera_v2/msm.h
diff --git a/drivers/media/platform/msm/camera_v2/msm_buf_mgr/Makefile b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/Makefile
new file mode 100644
index 000000000000..8832457f4cf5
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/Makefile
@@ -0,0 +1,2 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+obj-$(CONFIG_MSMB_CAMERA) += msm_generic_buf_mgr.o
diff --git a/drivers/media/video/msmb/msm_buf_mgr/msm_generic_buf_mgr.c b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c
similarity index 100%
rename from drivers/media/video/msmb/msm_buf_mgr/msm_generic_buf_mgr.c
rename to drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c
diff --git a/drivers/media/video/msmb/msm_buf_mgr/msm_generic_buf_mgr.h b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.h
similarity index 100%
rename from drivers/media/video/msmb/msm_buf_mgr/msm_generic_buf_mgr.h
rename to drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.h
diff --git a/drivers/media/video/msmb/msm_sd.h b/drivers/media/platform/msm/camera_v2/msm_sd.h
similarity index 100%
rename from drivers/media/video/msmb/msm_sd.h
rename to drivers/media/platform/msm/camera_v2/msm_sd.h
diff --git a/drivers/media/platform/msm/camera_v2/msm_vb2/Makefile b/drivers/media/platform/msm/camera_v2/msm_vb2/Makefile
new file mode 100644
index 000000000000..2673bdd3eeb6
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/msm_vb2/Makefile
@@ -0,0 +1,3 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/msm_vb2
+obj-$(CONFIG_MSMB_CAMERA) += msm_vb2.o
diff --git a/drivers/media/video/msmb/msm_vb2/msm_vb2.c b/drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c
similarity index 100%
rename from drivers/media/video/msmb/msm_vb2/msm_vb2.c
rename to drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c
diff --git a/drivers/media/video/msmb/msm_vb2/msm_vb2.h b/drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.h
similarity index 100%
rename from drivers/media/video/msmb/msm_vb2/msm_vb2.h
rename to drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.h
diff --git a/drivers/media/platform/msm/camera_v2/sensor/Makefile b/drivers/media/platform/msm/camera_v2/sensor/Makefile
new file mode 100644
index 000000000000..28e4e3506d8a
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/sensor/Makefile
@@ -0,0 +1,10 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/msm_vb2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/camera
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci
+obj-$(CONFIG_MSMB_CAMERA) += cci/ io/ csiphy/ csid/ actuator/
+obj-$(CONFIG_MSM_CAMERA_SENSOR) += msm_sensor.o
+obj-$(CONFIG_S5K3L1YX) += s5k3l1yx.o
+obj-$(CONFIG_IMX111) += imx111.o
+obj-$(CONFIG_IMX119) += imx119.o
diff --git a/drivers/media/platform/msm/camera_v2/sensor/actuator/Makefile b/drivers/media/platform/msm/camera_v2/sensor/actuator/Makefile
new file mode 100644
index 000000000000..c0d607f731ba
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/sensor/actuator/Makefile
@@ -0,0 +1,4 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci
+obj-$(CONFIG_MSMB_CAMERA) += msm_actuator.o
diff --git a/drivers/media/video/msmb/sensor/actuator/msm_actuator.c b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/actuator/msm_actuator.c
rename to drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
diff --git a/drivers/media/video/msmb/sensor/actuator/msm_actuator.h b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/actuator/msm_actuator.h
rename to drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
diff --git a/drivers/media/platform/msm/camera_v2/sensor/cci/Makefile b/drivers/media/platform/msm/camera_v2/sensor/cci/Makefile
new file mode 100644
index 000000000000..b814392c9c68
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/sensor/cci/Makefile
@@ -0,0 +1,3 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
+obj-$(CONFIG_MSM_CCI) += msm_cci.o
diff --git a/drivers/media/video/msmb/sensor/cci/msm_cam_cci_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cam_cci_hwreg.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/cci/msm_cam_cci_hwreg.h
rename to drivers/media/platform/msm/camera_v2/sensor/cci/msm_cam_cci_hwreg.h
diff --git a/drivers/media/video/msmb/sensor/cci/msm_cci.c b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/cci/msm_cci.c
rename to drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
diff --git a/drivers/media/video/msmb/sensor/cci/msm_cci.h b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/cci/msm_cci.h
rename to drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.h
diff --git a/drivers/media/platform/msm/camera_v2/sensor/csid/Makefile b/drivers/media/platform/msm/camera_v2/sensor/csid/Makefile
new file mode 100644
index 000000000000..572e722fe2d8
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/sensor/csid/Makefile
@@ -0,0 +1,8 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
+ifeq ($(CONFIG_MSM_CSI20_HEADER),y)
+  ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/csid/include/csi2.0
+else ifeq ($(CONFIG_MSM_CSI30_HEADER),y)
+  ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/csid/include/csi3.0
+endif
+obj-$(CONFIG_MSM_CSID) += msm_csid.o
diff --git a/drivers/media/video/msmb/sensor/csid/include/csi2.0/msm_csid_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/csid/include/csi2.0/msm_csid_hwreg.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/csid/include/csi2.0/msm_csid_hwreg.h
rename to drivers/media/platform/msm/camera_v2/sensor/csid/include/csi2.0/msm_csid_hwreg.h
diff --git a/drivers/media/video/msmb/sensor/csid/include/csi3.0/msm_csid_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/csid/include/csi3.0/msm_csid_hwreg.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/csid/include/csi3.0/msm_csid_hwreg.h
rename to drivers/media/platform/msm/camera_v2/sensor/csid/include/csi3.0/msm_csid_hwreg.h
diff --git a/drivers/media/video/msmb/sensor/csid/msm_csid.c b/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/csid/msm_csid.c
rename to drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
diff --git a/drivers/media/video/msmb/sensor/csid/msm_csid.h b/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/csid/msm_csid.h
rename to drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.h
diff --git a/drivers/media/platform/msm/camera_v2/sensor/csiphy/Makefile b/drivers/media/platform/msm/camera_v2/sensor/csiphy/Makefile
new file mode 100644
index 000000000000..eab1f6f6e60c
--- /dev/null
+++ b/drivers/media/platform/msm/camera_v2/sensor/csiphy/Makefile
@@ -0,0 +1,8 @@
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
+ifeq ($(CONFIG_MSM_CSI20_HEADER),y)
+  ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/csiphy/include/csi2.0
+else ifeq ($(CONFIG_MSM_CSI30_HEADER),y)
+  ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/csiphy/include/csi3.0
+endif
+obj-$(CONFIG_MSM_CSIPHY) += msm_csiphy.o
diff --git a/drivers/media/video/msmb/sensor/csiphy/include/csi2.0/msm_csiphy_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/csi2.0/msm_csiphy_hwreg.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/csiphy/include/csi2.0/msm_csiphy_hwreg.h
rename to drivers/media/platform/msm/camera_v2/sensor/csiphy/include/csi2.0/msm_csiphy_hwreg.h
diff --git a/drivers/media/video/msmb/sensor/csiphy/include/csi3.0/msm_csiphy_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/csi3.0/msm_csiphy_hwreg.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/csiphy/include/csi3.0/msm_csiphy_hwreg.h
rename to drivers/media/platform/msm/camera_v2/sensor/csiphy/include/csi3.0/msm_csiphy_hwreg.h
diff --git a/drivers/media/video/msmb/sensor/csiphy/msm_csiphy.c b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/csiphy/msm_csiphy.c
rename to drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
diff --git a/drivers/media/video/msmb/sensor/csiphy/msm_csiphy.h b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/csiphy/msm_csiphy.h
rename to drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h
diff --git a/drivers/media/video/msmb/sensor/flash/msm_led_flash.c b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/flash/msm_led_flash.c
rename to drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.c
diff --git a/drivers/media/video/msmb/sensor/flash/msm_led_flash.h b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/flash/msm_led_flash.h
rename to drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.h
diff --git a/drivers/media/video/msmb/sensor/flash/msm_led_trigger.c b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_trigger.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/flash/msm_led_trigger.c
rename to drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_trigger.c
diff --git a/drivers/media/video/msmb/sensor/imx111.c b/drivers/media/platform/msm/camera_v2/sensor/imx111.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/imx111.c
rename to drivers/media/platform/msm/camera_v2/sensor/imx111.c
diff --git a/drivers/media/video/msmb/sensor/imx119.c b/drivers/media/platform/msm/camera_v2/sensor/imx119.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/imx119.c
rename to drivers/media/platform/msm/camera_v2/sensor/imx119.c
diff --git a/drivers/media/video/msmb/sensor/io/Makefile b/drivers/media/platform/msm/camera_v2/sensor/io/Makefile
similarity index 50%
rename from drivers/media/video/msmb/sensor/io/Makefile
rename to drivers/media/platform/msm/camera_v2/sensor/io/Makefile
index ec1faa59b4bf..c10dfa325394 100644
--- a/drivers/media/video/msmb/sensor/io/Makefile
+++ b/drivers/media/platform/msm/camera_v2/sensor/io/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -Idrivers/media/video/msmb/
-ccflags-y += -Idrivers/media/video/msmb/sensor/cci
+ccflags-y += -Idrivers/media/platform/msm/camera_v2
+ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci
 obj-$(CONFIG_MSMB_CAMERA)   += msm_camera_io_util.o msm_camera_cci_i2c.o msm_camera_qup_i2c.o msm_camera_i2c_mux.o
diff --git a/drivers/media/video/msmb/sensor/io/msm_camera_cci_i2c.c b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/io/msm_camera_cci_i2c.c
rename to drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c
diff --git a/drivers/media/video/msmb/sensor/io/msm_camera_i2c.h b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/io/msm_camera_i2c.h
rename to drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c.h
diff --git a/drivers/media/video/msmb/sensor/io/msm_camera_i2c_mux.c b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c_mux.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/io/msm_camera_i2c_mux.c
rename to drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c_mux.c
diff --git a/drivers/media/video/msmb/sensor/io/msm_camera_i2c_mux.h b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c_mux.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/io/msm_camera_i2c_mux.h
rename to drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c_mux.h
diff --git a/drivers/media/video/msmb/sensor/io/msm_camera_io_util.c b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/io/msm_camera_io_util.c
rename to drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.c
diff --git a/drivers/media/video/msmb/sensor/io/msm_camera_io_util.h b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/io/msm_camera_io_util.h
rename to drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.h
diff --git a/drivers/media/video/msmb/sensor/io/msm_camera_qup_i2c.c b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/io/msm_camera_qup_i2c.c
rename to drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c
diff --git a/drivers/media/video/msmb/sensor/msm_sensor.c b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/msm_sensor.c
rename to drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
diff --git a/drivers/media/video/msmb/sensor/msm_sensor.h b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
similarity index 100%
rename from drivers/media/video/msmb/sensor/msm_sensor.h
rename to drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
diff --git a/drivers/media/video/msmb/sensor/s5k3l1yx.c b/drivers/media/platform/msm/camera_v2/sensor/s5k3l1yx.c
similarity index 100%
rename from drivers/media/video/msmb/sensor/s5k3l1yx.c
rename to drivers/media/platform/msm/camera_v2/sensor/s5k3l1yx.c
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 830ba810626f..7776a5bac42a 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -1174,50 +1174,6 @@ config VIDEO_S5P_MIPI_CSIS
 
 source "drivers/media/video/s5p-tv/Kconfig"
 
-#
-# MSM camera configuration
-#
-
-comment "Qualcomm MSM Camera And Video"
-
-menuconfig MSM_CAMERA
-	bool "Qualcomm MSM camera and video capture support"
-	depends on ARCH_MSM && VIDEO_V4L2 && I2C
-	default y
-	help
-	  Say Y here to enable selecting the video adapters for
-	  Qualcomm msm camera and video encoding
-
-config MSM_CAMERA_DEBUG
-	bool "Qualcomm MSM camera debugging with printk"
-	depends on MSM_CAMERA
-	default n
-	help
-	  Enable printk() debug for msm camera
-
-if MSM_CAMERA
-source "drivers/media/video/msm/Kconfig"
-endif # MSM_CAMERA
-
-menuconfig MSMB_CAMERA
-	bool "Qualcomm MSM camera and video capture 2.0 support"
-	depends on ARCH_MSM && VIDEO_V4L2 && I2C
-	---help---
-	  Say Y here to enable selecting the video adapters for
-	  Qualcomm msm camera and video capture 2.0, enabling this
-	  adds support for the camera driver stack including sensor, isp
-	  and postprocessing drivers.
-
-config MSMB_CAMERA_DEBUG
-	bool "Qualcomm MSM camera 2.0 debugging with printk"
-	depends on MSMB_CAMERA
-	---help---
-	  Enable printk() debug for msm camera 2.0
-
-if MSMB_CAMERA
-source "drivers/media/video/msmb/Kconfig"
-endif # MSMB_CAMERA
-
 endif # V4L_PLATFORM_DRIVERS
 endif # VIDEO_CAPTURE_DRIVERS
 
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index e73277385ffd..1e836deca12a 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -212,8 +212,6 @@ obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 
 obj-y	+= davinci/
 
-obj-$(CONFIG_MSM_CAMERA) += msm/
-obj-$(CONFIG_MSMB_CAMERA) += msmb/
 obj-$(CONFIG_ARCH_OMAP)	+= omap/
 obj-$(CONFIG_MSM_VIDC_V4L2) += msm_vidc/
 obj-$(CONFIG_MSM_WFD) += msm_wfd/
diff --git a/drivers/media/video/msmb/Makefile b/drivers/media/video/msmb/Makefile
deleted file mode 100644
index 9bbcf17a85ad..000000000000
--- a/drivers/media/video/msmb/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/sensor
-ccflags-y += -Idrivers/media/video/msmb/codecs
-ccflags-y += -Idrivers/media/video/msmb/isps
-ccflags-y += -Idrivers/media/video/msmb/pps
-ccflags-y += -Idrivers/media/video/msmb/msm_vb2
-ccflags-y += -Idrivers/media/video/msmb/camera
-
-obj-$(CONFIG_MSMB_CAMERA) += msm.o
-obj-$(CONFIG_MSMB_CAMERA) += camera/
-obj-$(CONFIG_MSMB_CAMERA) += msm_vb2/
-obj-$(CONFIG_MSMB_CAMERA) += sensor/
-obj-$(CONFIG_MSMB_CAMERA) += isp/
-obj-$(CONFIG_MSMB_CAMERA) += ispif/
-obj-$(CONFIG_MSMB_CAMERA) += msm_buf_mgr/
diff --git a/drivers/media/video/msmb/camera/Makefile b/drivers/media/video/msmb/camera/Makefile
deleted file mode 100644
index 89ff16713dab..000000000000
--- a/drivers/media/video/msmb/camera/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/msm_vb2
-obj-$(CONFIG_MSMB_CAMERA) += camera.o
diff --git a/drivers/media/video/msmb/ispif/Makefile b/drivers/media/video/msmb/ispif/Makefile
deleted file mode 100644
index 908cc28561a9..000000000000
--- a/drivers/media/video/msmb/ispif/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/sensor/io
-obj-$(CONFIG_MSM_CSID) += msm_ispif.o
diff --git a/drivers/media/video/msmb/msm_buf_mgr/Makefile b/drivers/media/video/msmb/msm_buf_mgr/Makefile
deleted file mode 100644
index 2a51f0f25226..000000000000
--- a/drivers/media/video/msmb/msm_buf_mgr/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-obj-$(CONFIG_MSMB_CAMERA) += msm_generic_buf_mgr.o
diff --git a/drivers/media/video/msmb/msm_vb2/Makefile b/drivers/media/video/msmb/msm_vb2/Makefile
deleted file mode 100644
index 9f61289a94ac..000000000000
--- a/drivers/media/video/msmb/msm_vb2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/msm_vb2
-obj-$(CONFIG_MSMB_CAMERA) += msm_vb2.o
diff --git a/drivers/media/video/msmb/sensor/Makefile b/drivers/media/video/msmb/sensor/Makefile
deleted file mode 100644
index a04b18284c82..000000000000
--- a/drivers/media/video/msmb/sensor/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/msm_vb2
-ccflags-y += -Idrivers/media/video/msmb/camera
-ccflags-y += -Idrivers/media/video/msmb/sensor/io
-ccflags-y += -Idrivers/media/video/msmb/sensor/cci
-obj-$(CONFIG_MSMB_CAMERA) += cci/ io/ csiphy/ csid/ actuator/
-obj-$(CONFIG_MSM_CAMERA_SENSOR) += msm_sensor.o
-obj-$(CONFIG_S5K3L1YX) += s5k3l1yx.o
-obj-$(CONFIG_IMX111) += imx111.o
-obj-$(CONFIG_IMX119) += imx119.o
diff --git a/drivers/media/video/msmb/sensor/actuator/Makefile b/drivers/media/video/msmb/sensor/actuator/Makefile
deleted file mode 100644
index 22dc426bbac5..000000000000
--- a/drivers/media/video/msmb/sensor/actuator/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/sensor/io
-ccflags-y += -Idrivers/media/video/msmb/sensor/cci
-obj-$(CONFIG_MSMB_CAMERA) += msm_actuator.o
diff --git a/drivers/media/video/msmb/sensor/cci/Makefile b/drivers/media/video/msmb/sensor/cci/Makefile
deleted file mode 100644
index 8eef3fc6003d..000000000000
--- a/drivers/media/video/msmb/sensor/cci/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb/
-ccflags-y += -Idrivers/media/video/msmb/sensor/io
-obj-$(CONFIG_MSM_CCI) += msm_cci.o
diff --git a/drivers/media/video/msmb/sensor/csid/Makefile b/drivers/media/video/msmb/sensor/csid/Makefile
deleted file mode 100644
index 44d7726b1c22..000000000000
--- a/drivers/media/video/msmb/sensor/csid/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/sensor/io
-ifeq ($(CONFIG_MSM_CSI20_HEADER),y)
-  ccflags-y += -Idrivers/media/video/msmb/sensor/csid/include/csi2.0
-else ifeq ($(CONFIG_MSM_CSI30_HEADER),y)
-  ccflags-y += -Idrivers/media/video/msmb/sensor/csid/include/csi3.0
-endif
-obj-$(CONFIG_MSM_CSID) += msm_csid.o
diff --git a/drivers/media/video/msmb/sensor/csiphy/Makefile b/drivers/media/video/msmb/sensor/csiphy/Makefile
deleted file mode 100644
index 11e352c80167..000000000000
--- a/drivers/media/video/msmb/sensor/csiphy/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-ccflags-y += -Idrivers/media/video/msmb
-ccflags-y += -Idrivers/media/video/msmb/sensor/io
-ifeq ($(CONFIG_MSM_CSI20_HEADER),y)
-  ccflags-y += -Idrivers/media/video/msmb/sensor/csiphy/include/csi2.0
-else ifeq ($(CONFIG_MSM_CSI30_HEADER),y)
-  ccflags-y += -Idrivers/media/video/msmb/sensor/csiphy/include/csi3.0
-endif
-obj-$(CONFIG_MSM_CSIPHY) += msm_csiphy.o
-- 
GitLab