/android_kernel_oneplus_msm8974 forked from CyanogenMod/android_kernel_oneplus_msm8974

Permalink
Browse files

Import camera from Cyanogenmod and stock over device-tree 

This imports camera_oppo_v2 from Cyanogenmod and modifies device-tree to respect these changes

Change-Id: I03dee52184d21c03d601c80484564fb2be7a296b
  • Loading branch information...
1 parent 5e9b300 commit c903444688b9bdfb56139e720652e1339e4dc11b @mariogrip mariogrip committed Sep 17, 2017
Unified Split
Showing with 3,383 additions and 2,539 deletions.
  1. +0 −527 arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi
  2. +0 −289 arch/arm/boot/dts/msm8974-camera-sensor-dragonboard.dtsi
  3. +0 −294 arch/arm/boot/dts/msm8974-camera-sensor-fluid.dtsi
  4. +0 −31 arch/arm/boot/dts/msm8974pro-pma8084-mtp.dtsi
  5. +152 −35 arch/arm/boot/dts/project/14001/msm8974-14001-camera.dtsi
  6. +6 −1 arch/arm/boot/dts/project/14001/msm8974-14001.dtsi
  7. +23 −0 arch/arm/boot/dts/project/14001/msm8974-a0001-camera-sensor.dtsi
  8. +6 −4 .../{msm8974-x9007/msm8974-x9007-camera-sensor.dtsi → project/14001/msm8974-oppo-camera-sensor.dtsi}
  9. +39 −0 arch/arm/boot/dts/project/14001/msm8974-oppo-camera.dtsi
  10. +65 −16 arch/arm/configs/bacon_defconfig
  11. +18 −12 arch/arm/mach-msm/clock-8974.c
  12. +9 −2 drivers/media/platform/msm/Kconfig
  13. +1 −1 drivers/media/platform/msm/Makefile
  14. +15 −1 drivers/media/platform/msm/camera_oppo_v2/Kconfig
  15. +3 −6 drivers/media/platform/msm/camera_oppo_v2/camera/camera.c
  16. +1 −1 drivers/media/platform/msm/camera_oppo_v2/isp/msm_buf_mgr.c
  17. +1 −1 drivers/media/platform/msm/camera_oppo_v2/isp/msm_isp32.c
  18. +12 −11 drivers/media/platform/msm/camera_oppo_v2/isp/msm_isp40.c
  19. +19 −6 drivers/media/platform/msm/camera_oppo_v2/isp/msm_isp_axi_util.c
  20. +1 −1 drivers/media/platform/msm/camera_oppo_v2/isp/msm_isp_stats_util.c
  21. +145 −73 drivers/media/platform/msm/camera_oppo_v2/isp/msm_isp_util.c
  22. +3 −3 drivers/media/platform/msm/camera_oppo_v2/ispif/msm_ispif.c
  23. +5 −1 drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_platform.c
  24. +10 −13 drivers/media/platform/msm/camera_oppo_v2/msm.c
  25. +2 −1 drivers/media/platform/msm/camera_oppo_v2/msm.h
  26. +4 −0 drivers/media/platform/msm/camera_oppo_v2/msm_vb2/msm_vb2.c
  27. +155 −50 drivers/media/platform/msm/camera_oppo_v2/pproc/cpp/msm_cpp.c
  28. +2 −0 drivers/media/platform/msm/camera_oppo_v2/pproc/cpp/msm_cpp.h
  29. +2 −0 drivers/media/platform/msm/camera_oppo_v2/sensor/Makefile
  30. +72 −18 drivers/media/platform/msm/camera_oppo_v2/sensor/actuator/msm_actuator.c
  31. +1 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/actuator/msm_actuator.h
  32. +30 −17 drivers/media/platform/msm/camera_oppo_v2/sensor/cci/msm_cci.c
  33. +4 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/cci/msm_cci.h
  34. +8 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/csid/msm_csid.c
  35. +3 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/csid/msm_csid.h
  36. +2 −2 drivers/media/platform/msm/camera_oppo_v2/sensor/csiphy/msm_csiphy.h
  37. +1 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/flash/Makefile
  38. +135 −40 drivers/media/platform/msm/camera_oppo_v2/sensor/flash/msm_led_cci.c
  39. +3 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/flash/msm_led_cci.h
  40. +2 −2 drivers/media/platform/msm/camera_oppo_v2/sensor/flash/msm_led_trigger.c
  41. +1 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/io/msm_camera_cci_i2c.c
  42. +11 −0 drivers/media/platform/msm/camera_oppo_v2/sensor/io/msm_camera_io_util.c
  43. +2 −0 drivers/media/platform/msm/camera_oppo_v2/sensor/io/msm_camera_io_util.h
  44. +1 −1 drivers/media/platform/msm/camera_oppo_v2/sensor/io/msm_camera_qup_i2c.c
  45. +127 −6 drivers/media/platform/msm/camera_oppo_v2/sensor/msm_sensor.c
  46. +44 −0 drivers/media/platform/msm/camera_v2/Kconfig
  47. +6 −13 drivers/media/platform/msm/camera_v2/camera/camera.c
  48. +2 −5 drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
  49. +7 −0 drivers/media/platform/msm/camera_v2/isp/msm_isp.h
  50. +8 −12 drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
  51. +41 −118 drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
  52. +106 −149 drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
  53. +0 −8 drivers/media/platform/msm/camera_v2/isp/msm_isp_util.h
  54. +12 −29 drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
  55. +2 −2 drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c
  56. +2 −2 drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
  57. +2 −6 drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c
  58. +0 −4 drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c
  59. +73 −92 drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
  60. +2 −2 drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.h
  61. +1 −3 drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
  62. +1 −1 drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.h
  63. +8 −0 drivers/media/platform/msm/camera_v2/sensor/Makefile
  64. +6 −63 drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
  65. +0 −5 drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
  66. +7 −85 drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
  67. +0 −10 drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.h
  68. +5 −3 drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
  69. +6 −0 drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
  70. +3 −0 drivers/media/platform/msm/camera_v2/sensor/flash/Makefile
  71. +1,087 −0 drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_cci.c
  72. +97 −0 drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_cci.h
  73. +1 −17 drivers/media/platform/msm/camera_v2/sensor/gc0339.c
  74. +0 −17 drivers/media/platform/msm/camera_v2/sensor/hi256.c
  75. +185 −0 drivers/media/platform/msm/camera_v2/sensor/imx214.c
  76. +5 −0 drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c
  77. +0 −11 drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.c
  78. +0 −2 drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.h
  79. +1 −1 drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c
  80. +2 −4 drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
  81. +1 −13 drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
  82. +1 −18 drivers/media/platform/msm/camera_v2/sensor/mt9m114.c
  83. +175 −0 drivers/media/platform/msm/camera_v2/sensor/ov5648_oppo.c
  84. +0 −17 drivers/media/platform/msm/camera_v2/sensor/sp1628.c
  85. +34 −65 drivers/media/platform/msm/dvb/demux/mpq_sdmx.c
  86. +2 −1 drivers/media/platform/msm/vidc/hfi_response_handler.c
  87. +1 −1 drivers/media/platform/msm/vidc/msm_smem.c
  88. +2 −2 drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
  89. +0 −3 drivers/media/platform/msm/vidc/msm_venc.c
  90. +40 −85 drivers/media/platform/msm/vidc/msm_vidc_common.c
  91. +61 −41 drivers/media/platform/msm/vidc/msm_vidc_debug.c
  92. +1 −0 drivers/media/platform/msm/vidc/msm_vidc_debug.h
  93. +23 −0 drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
  94. 0 drivers/media/platform/msm/vidc/q6_hfi.c
  95. +173 −121 drivers/media/platform/msm/vidc/venus_hfi.c
  96. +9 −10 drivers/media/platform/msm/vidc/vidc_hfi_api.h
  97. +2 −0 drivers/media/platform/msm/wfd/enc-venus-subdev.c
  98. +4 −2 drivers/media/platform/msm/wfd/wfd-ioctl.c
  99. +26 −23 drivers/media/platform/msm/wfd/wfd-util.c
  100. +4 −0 include/media/msm_cam_sensor_oppo.h
View
527 arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi

Large diffs are not rendered by default.

Oops, something went wrong.
View
289 arch/arm/boot/dts/msm8974-camera-sensor-dragonboard.dtsi
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-&cci {
-
- actuator0: qcom,actuator@18 {
- cell-index = <0>;
- reg = <0x18>;
- compatible = "qcom,actuator";
- qcom,cci-master = <0>;
- };
-
- actuator1: qcom,actuator@36 {
- cell-index = <1>;
- reg = <0x36>;
- compatible = "qcom,actuator";
- qcom,cci-master = <0>;
- };
-
- qcom,camera@6e {
- compatible = "qcom,s5k3l1yx";
- reg = <0x6e>;
- qcom,slave-id = <0x6e 0x0 0x3121>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,mount-angle = <0>;
- qcom,actuator-src = <&actuator0>;
- qcom,sensor-name = "s5k3l1yx";
- qcom,vdd-cx-supply = <&pm8841_s2>;
- qcom,vdd-cx-name = "qcom,vdd-cx";
- cam_vdig-supply = <&pm8941_l3>;
- cam_vana-supply = <&pm8941_l17>;
- cam_vio-supply = <&pm8941_lvs3>;
- cam_vaf-supply = <&pm8941_l23>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-max-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-op-mode = <105000 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 15 0>,
- <&msmgpio 90 0>,
- <&msmgpio 89 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 30000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1F>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-
- qcom,camera@20 {
- compatible = "qcom,imx135";
- reg = <0x20>;
- qcom,slave-id = <0x20 0x0016 0x0135>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,mount-angle = <0>;
- qcom,sensor-name = "imx135";
- qcom,vdd-cx-supply = <&pm8841_s2>;
- qcom,vdd-cx-name = "qcom,vdd-cx";
- qcom,actuator-src = <&actuator1>;
- cam_vdig-supply = <&pm8941_l3>;
- cam_vana-supply = <&pm8941_l17>;
- cam_vio-supply = <&pm8941_lvs3>;
- cam_vaf-supply = <&pm8941_l23>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-max-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-op-mode = <105000 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 15 0>,
- <&msmgpio 90 0>,
- <&msmgpio 89 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 30000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1F>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-
- qcom,camera@6c {
- compatible = "qcom,ov2720";
- reg = <0x6c>;
- qcom,slave-id = <0x6c 0x300A 0x2720>;
- qcom,csiphy-sd-index = <2>;
- qcom,csid-sd-index = <0>;
- qcom,mount-angle = <180>;
- qcom,sensor-name = "ov2720";
- qcom,vdd-cx-supply = <&pm8841_s2>;
- qcom,vdd-cx-name = "qcom,vdd-cx";
- cam_vdig-supply = <&pm8941_l3>;
- cam_vana-supply = <&pm8941_l17>;
- cam_vio-supply = <&pm8941_lvs3>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vana", "cam_vio";
- qcom,cam-vreg-type = <0 0 1>;
- qcom,cam-vreg-min-voltage = <1225000 2850000 0>;
- qcom,cam-vreg-max-voltage = <1225000 2850000 0>;
- qcom,cam-vreg-op-mode = <105000 80000 0>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 17 0>,
- <&msmgpio 18 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-req-tbl-num = <0 1>;
- qcom,gpio-req-tbl-flags = <1 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 4000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x7>;
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-
- qcom,camera@90 {
- compatible = "qcom,mt9m114";
- reg = <0x90>;
- qcom,slave-id = <0x90 0x0 0x2481>;
- qcom,csiphy-sd-index = <1>;
- qcom,csid-sd-index = <0>;
- qcom,mount-angle = <0>;
- qcom,sensor-name = "mt9m114";
- qcom,vdd-cx-supply = <&pm8841_s2>;
- qcom,vdd-cx-name = "qcom,vdd-cx";
- cam_vdig-supply = <&pm8941_l3>;
- cam_vana-supply = <&pm8941_l17>;
- cam_vio-supply = <&pm8941_lvs3>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vana", "cam_vio";
- qcom,cam-vreg-type = <0 0 1>;
- qcom,cam-vreg-min-voltage = <1225000 2850000 0>;
- qcom,cam-vreg-max-voltage = <1225000 2850000 0>;
- qcom,cam-vreg-op-mode = <105000 80000 0>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 16 0>,
- <&msmgpio 94 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-req-tbl-num = <0 1>;
- qcom,gpio-req-tbl-flags = <1 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 4000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x3>;
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- };
- qcom,camera@0 {
- cell-index = <0>;
- compatible = "qcom,camera";
- reg = <0x0>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,mount-angle = <0>;
- qcom,actuator-src = <&actuator0>;
- qcom,vdd-cx-supply = <&pm8841_s2>;
- qcom,vdd-cx-name = "qcom,vdd-cx";
- cam_vana-supply = <&pm8941_l17>;
- cam_vio-supply = <&pm8941_lvs3>;
- cam_vaf-supply = <&pm8941_l23>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-max-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-op-mode = <105000 0 80000 100000>;
- gpios = <&msmgpio 15 0>,
- <&msmgpio 90 0>,
- <&msmgpio 89 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,cci-master = <0>;
- status = "ok";
- };
-
- qcom,camera@1 {
- cell-index = <1>;
- compatible = "qcom,camera";
- reg = <0x1>;
- qcom,csiphy-sd-index = <1>;
- qcom,csid-sd-index = <1>;
- qcom,mount-angle = <180>;
- qcom,vdd-cx-supply = <&pm8841_s2>;
- qcom,vdd-cx-name = "qcom,vdd-cx";
- cam_vdig-supply = <&pm8941_l3>;
- cam_vana-supply = <&pm8941_l17>;
- cam_vio-supply = <&pm8941_lvs3>;
- cam_vaf-supply = <&pm8941_l23>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-max-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-op-mode = <105000 0 80000 100000>;
- gpios = <&msmgpio 16 0>,
- <&msmgpio 92 0>,
- <&msmgpio 91 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <0>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-
- qcom,camera@2 {
- cell-index = <2>;
- compatible = "qcom,camera";
- reg = <0x2>;
- qcom,csiphy-sd-index = <2>;
- qcom,csid-sd-index = <2>;
- qcom,mount-angle = <180>;
- qcom,vdd-cx-supply = <&pm8841_s2>;
- qcom,vdd-cx-name = "qcom,vdd-cx";
- cam_vdig-supply = <&pm8941_l3>;
- cam_vana-supply = <&pm8941_l17>;
- cam_vio-supply = <&pm8941_lvs3>;
- cam_vaf-supply = <&pm8941_l23>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-max-voltage = <1225000 0 2850000 3000000>;
- qcom,cam-vreg-op-mode = <105000 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 17 0>,
- <&msmgpio 18 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1";
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <0>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-};
Oops, something went wrong.

0 comments on commit c903444

Please sign in to comment.