From ecbc34d82a7c7d34a2221d890bf74e76c124a585 Mon Sep 17 00:00:00 2001 From: Rohith M Date: Mon, 27 Jun 2022 15:22:06 +0530 Subject: [PATCH 1/3] ARM: dts: msm: Added TOF sensor node for Yupik Added TOF sensor entry for Yupik target. CRs-Fixed: 3236430 Change-Id: Ib4eed5d3500ab7423585f6347cadd39061f8c1bd --- yupik-camera-sensor-idp.dtsi | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/yupik-camera-sensor-idp.dtsi b/yupik-camera-sensor-idp.dtsi index 18489203834a..974040c858ca 100644 --- a/yupik-camera-sensor-idp.dtsi +++ b/yupik-camera-sensor-idp.dtsi @@ -218,6 +218,46 @@ clock-cntl-level = "nominal"; clock-rates = <24000000>; }; + + /* TOF */ + qcom,cam-sensor5 { + cell-index = <7>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&L3J>; + cam_vana-supply = <&L3I>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2904000 0>; + rgltr-max-voltage = <1800000 3000000 0>; + rgltr-load-current = <2000 20000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_active_rst1>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_suspend_rst1>; + gpios = <&tlmm 65 0>, + <&tlmm 21 0>, + <&tlmm 0 0>; + gpio-reset = <1>; + gpio-custom1 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET1", + "CUSTOM_GPIO1"; + cci-master = <1>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; &cam_cci1 { From e2865835a7e0d1f9e08bfaba4db72b31c924f20e Mon Sep 17 00:00:00 2001 From: Rohith M Date: Fri, 4 Nov 2022 11:24:45 +0530 Subject: [PATCH 2/3] ARM: dts: msm: Added eeprom node for TOF sensor Added EEPROM node for TOF sensor node. CRs-Fixed: 3236430 Change-Id: I7f276a0b6e8c78ae6b13b21e7207fef8d8edb4d7 --- yupik-camera-sensor-idp.dtsi | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/yupik-camera-sensor-idp.dtsi b/yupik-camera-sensor-idp.dtsi index 974040c858ca..1690045702aa 100644 --- a/yupik-camera-sensor-idp.dtsi +++ b/yupik-camera-sensor-idp.dtsi @@ -219,6 +219,38 @@ clock-rates = <24000000>; }; + eeprom_tof: qcom,eeprom4 { + cell-index = <7>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L3J>; + cam_vana-supply = <&L3I>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2904000 0>; + rgltr-max-voltage = <1800000 3000000 0>; + rgltr-load-current = <2000 20000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_active_rst1>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_suspend_rst1>; + gpios = <&tlmm 65 0>, + <&tlmm 21 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET1"; + cci-master = <1>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /* TOF */ qcom,cam-sensor5 { cell-index = <7>; @@ -227,6 +259,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_tof>; cam_vio-supply = <&L3J>; cam_vana-supply = <&L3I>; cam_clk-supply = <&cam_cc_titan_top_gdsc>; From 0613a2c0e714b492b24e2c1e576c95c19e38053a Mon Sep 17 00:00:00 2001 From: Yuxin Feng Date: Mon, 13 Feb 2023 08:45:27 +0530 Subject: [PATCH 3/3] ARM: dts: msm: Add camera odk dtsi for QCS6490 Add camera odk dtsi for QCS6490. CRs-Fixed: 3411884 Change-Id: I0c8919b1f14342343af75d8a33eeb685f53fcdc3 --- yupik-camera-sensor-odk.dtsi | 380 +++++++++++++++++++++++++++++++++++ 1 file changed, 380 insertions(+) create mode 100644 yupik-camera-sensor-odk.dtsi diff --git a/yupik-camera-sensor-odk.dtsi b/yupik-camera-sensor-odk.dtsi new file mode 100644 index 000000000000..f0923615af89 --- /dev/null +++ b/yupik-camera-sensor-odk.dtsi @@ -0,0 +1,380 @@ +#include + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + //cam0 on dk csi0 + camera0_vana_ldo: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x09 0x00>; + regulator-name = "camera0_vana_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 42 0>; + }; + + camera0_vdig_ldo: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x0a 0x00>; + regulator-name = "camera0_vdig_ldo"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 107 0>; + }; + + camera0_vio_ldo: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x0b 0x00>; + regulator-name = "camera0_vio_ldo"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 108 0>; + }; + + camera0_vaf_ldo: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x0c 0x00>; + regulator-name = "camera0_vaf_ldo"; + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + regulator-enable-ramp-delay = <135>; + enable-active-high; + gpio = <&tca64_22 20 0>; + }; + + //cam1 on dk csi2 + camera1_vana_ldo: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x06 0x00>; + regulator-name = "camera1_vana_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 5 0>; + }; + + camera1_vdig_ldo: gpio-regulator@5 { + compatible = "regulator-fixed"; + reg = <0x07 0x00>; + regulator-name = "camera1_vdig_ldo"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 7 0>; + }; + + camera1_vio_ldo: gpio-regulator@6 { + compatible = "regulator-fixed"; + reg = <0x08 0x00>; + regulator-name = "camera1_vio_ldo"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 6 0>; + }; + + camera2_vana_ldo: gpio-regulator@7 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera0_vana_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 9 0>; + }; + + camera2_vdig_ldo: gpio-regulator@8 { + compatible = "regulator-fixed"; + reg = <0x01 0x00>; + regulator-name = "camera0_vdig_ldo"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 11 0>; + }; + + camera2_vio_ldo: gpio-regulator@9 { + compatible = "regulator-fixed"; + reg = <0x02 0x00>; + regulator-name = "camera0_vio_ldo"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 10 0>; + }; + + camera3_vana_ldo: gpio-regulator@10 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "camera3_vana_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 13 0>; + }; + + camera3_vdig_ldo: gpio-regulator@11 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera3_vdig_ldo"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 15 0>; + }; + + camera3_vio_ldo: gpio-regulator@12 { + compatible = "regulator-fixed"; + reg = <0x05 0x00>; + regulator-name = "camera3_vio_ldo"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 14 0>; + }; + + camera4_vana_ldo: gpio-regulator@13 { + compatible = "regulator-fixed"; + reg = <0x0d 0x00>; + regulator-name = "camera4_vana_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 17 0>; + }; + + camera4_vdig_ldo: gpio-regulator@14 { + compatible = "regulator-fixed"; + reg = <0x0e 0x00>; + regulator-name = "camera4_vdig_ldo"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 19 0>; + }; + + camera4_vio_ldo: gpio-regulator@15 { + compatible = "regulator-fixed"; + reg = <0x0f 0x00>; + regulator-name = "camera4_vio_ldo"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tca64_22 18 0>; + }; +}; + +&cam_cci0 { + //cam0 on dk csi0 + qcom,cam-sensor0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera0_vio_ldo>; + cam_vana-supply = <&camera0_vana_ldo>; + cam_vdig-supply = <&camera0_vdig_ldo>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana","cam_vdig","cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1800000 2800000 1050000 0>; + rgltr-load-current = <120000 80000 1200000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_active_rst0>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_suspend_rst0>; + gpios = <&tlmm 64 0>, + <&tlmm 20 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; + cci-master = <0>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + }; + + //cam1 on dk csi2 + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera1_vio_ldo>; + cam_vana-supply = <&camera1_vana_ldo>; + cam_vdig-supply = <&camera1_vdig_ldo>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana","cam_vdig","cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1800000 2800000 1050000 0>; + rgltr-load-current = <120000 80000 1200000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_active_rst2>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_suspend_rst2>; + gpios = <&tlmm 66 0>, + <&tlmm 77 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + }; + + //cam2 on dk csi1 + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera2_vio_ldo>; + cam_vana-supply = <&camera2_vana_ldo>; + cam_vdig-supply = <&camera2_vdig_ldo>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana","cam_vdig","cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1800000 2800000 1050000 0>; + rgltr-load-current = <120000 80000 1200000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_active_rst1>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_suspend_rst1>; + gpios = <&tlmm 65 0>, + <&tlmm 21 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET1"; + cci-master = <1>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + // cam3 + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera3_vio_ldo>; + cam_vana-supply = <&camera3_vana_ldo>; + cam_vdig-supply = <&camera3_vdig_ldo>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1800000 2800000 1050000 0>; + rgltr-load-current = <120000 80000 1200000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_active_rst3>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_suspend_rst3>; + gpios = <&tlmm 67 0>, + <&tlmm 78 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + }; + + // cam4 + qcom,cam-sensor4 { + cell-index = <4>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <4>; + sensor-position-roll = <0>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_vio-supply = <&camera4_vio_ldo>; + cam_vana-supply = <&camera4_vana_ldo>; + cam_vdig-supply = <&camera4_vdig_ldo>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1800000 2800000 1050000 0>; + rgltr-load-current = <120000 80000 1200000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk4_active + &cam_sensor_active_rst4>; + pinctrl-1 = <&cam_sensor_mclk4_suspend + &cam_sensor_suspend_rst4>; + gpios = <&tlmm 68 0>, + <&tlmm 90 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK4", + "CAM_RESET4"; + cci-master = <1>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK4_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + }; +};