From a255ce3460fc1f447d56c8724783f5ae730f5867 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Mon, 21 Sep 2020 14:25:37 +0800 Subject: [PATCH 001/183] denver: add camera dts [detail] add camera dts. Change-Id: Ia6afa45f6c99c00f11b9ddc07b242aa284974b8a Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1755495 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: Qinghong Yang (cherry picked from commit 7b6af4cf1ec5921ddce9bbb5321cbfbcf31adc50) Reviewed-on: https://gerrit.mot.com/1763249 Reviewed-by: Dawei Wang --- holi-camera-sensor-mot-denver-overlay.dtsi | 250 +++++++++++++++++++++ 1 file changed, 250 insertions(+) create mode 100644 holi-camera-sensor-mot-denver-overlay.dtsi diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi new file mode 100644 index 000000000000..bb96316db022 --- /dev/null +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -0,0 +1,250 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; +}; + +&cam_cci0 { + qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + //eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-load-current = <2500 50000 140000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + qcom,cam-sensor@4 { + cell-index = <4>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-load-current = <0 80000 105000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET4"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From c237aa17e02da20b5d59640e47dc0ea3ca957c86 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Sun, 27 Sep 2020 19:03:32 +0800 Subject: [PATCH 002/183] denver: modify camera dts - remove cci3 pinctrl config. - set rgltr-load-current to 120000. Change-Id: I52b97154564225782d479148eb9e7c9d2690d9a8 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1761214 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: Qinghong Yang (cherry picked from commit 8afc51c5947e36cab62d198796377f7a4a74e997) Reviewed-on: https://gerrit.mot.com/1763752 Reviewed-by: Dawei Wang --- holi-camera-sensor-mot-denver-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index bb96316db022..a3a6194facf0 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -226,7 +226,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <0 80000 105000 0>; + rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active From dea25b8328722615b79c8db5bf2fe7f378b6e82c Mon Sep 17 00:00:00 2001 From: wangshuo18 Date: Wed, 23 Sep 2020 10:14:49 +0800 Subject: [PATCH 003/183] denver: add camera dtsi main depth wide -add dtsi -main,depth,wide Change-Id: I406ebedde55b22548bdf38f0c8c4aa0e608d5d3c Signed-off-by: wangshuo18 Reviewed-on: https://gerrit.mot.com/1757177 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: Wang Liu (cherry picked from commit 61a2bad06cf39604e3093931bc45bcf87cf86d05) Reviewed-on: https://gerrit.mot.com/1763744 Reviewed-by: Dawei Wang --- holi-camera-sensor-mot-denver-overlay.dtsi | 333 +++++++++++++++++++++ 1 file changed, 333 insertions(+) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index a3a6194facf0..c3d82b9f23a0 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -105,6 +105,33 @@ }; }; + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { mux { pins = "gpio34"; @@ -132,6 +159,60 @@ }; }; + cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { mux { pins = "gpio37"; @@ -165,9 +246,114 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + + led_flash_main: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; + + led_flash_front: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash1>; + torch-source = <&pm6150l_torch1>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; }; &cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <1>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + 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>; + //actuator-src = <&actuator_main>; + //led-flash-src = <&led_flash_main>; + //eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <3000 105000>; + cci-master = <0>; + status = "ok"; + }; + qcom,cam-sensor@1 { cell-index = <1>; compatible = "qcom,cam-sensor"; @@ -175,6 +361,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; + //led-flash-src = <&led_flash_front>; //eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; @@ -209,6 +396,151 @@ }; &cam_cci1 { + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //eeprom-src = <&eeprom_depth>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_depth: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <0 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //led-flash-src = <&led_flash_wide>; + //eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom3 { + cell-index = <3>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-load-current = <0 80000 105000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + qcom,cam-sensor@4 { cell-index = <4>; compatible = "qcom,cam-sensor"; @@ -216,6 +548,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + //led-flash-src = <&led_flash_macro>; //eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; From c95c2e4bb655894508c2d0ca4021e56ff1250f18 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Sat, 3 Oct 2020 11:43:35 +0800 Subject: [PATCH 004/183] arm64/dt: denver: add ov16a1q eeprom dts [detail] add ov16a1q eeprom dts. Change-Id: I49eccc2c5e41b7ef7939e282935b35909ab228db Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1766534 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhenxin Xi Reviewed-by: Dawei Wang Reviewed-by: Long Cheng Reviewed-by: Jian Zhang Submit-Approved: Jira Key --- holi-camera-sensor-mot-denver-overlay.dtsi | 24 +++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index c3d82b9f23a0..2c48663cfcd4 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -354,6 +354,20 @@ status = "ok"; }; + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + qcom,cam-sensor@1 { cell-index = <1>; compatible = "qcom,cam-sensor"; @@ -362,7 +376,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <0>; //led-flash-src = <&led_flash_front>; - //eeprom-src = <&eeprom_front>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; cam_vdig-supply = <&cam_ldo2>; @@ -488,9 +502,9 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_macro_reset_active>; + &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 36 0>; gpio-reset = <1>; @@ -523,9 +537,9 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_macro_reset_active>; + &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 36 0>; gpio-reset = <1>; From 06f5cd253b90f4f5bf2d5566140809fd1012786c Mon Sep 17 00:00:00 2001 From: wangshuo18 Date: Fri, 9 Oct 2020 17:22:54 +0800 Subject: [PATCH 005/183] arm/dt: denver: add flash actuator dts -add main front wide macro flash dts -add main actuator dts Change-Id: I1b7bf94d078bbcca622a981a9ed5a8803191f02c Signed-off-by: wangshuo18 Reviewed-on: https://gerrit.mot.com/1770276 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-denver-overlay.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index 2c48663cfcd4..893c41191d18 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -305,8 +305,8 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //actuator-src = <&actuator_main>; - //led-flash-src = <&led_flash_main>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_main>; //eeprom-src = <&eeprom_main>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo3>; @@ -375,7 +375,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - //led-flash-src = <&led_flash_front>; + led-flash-src = <&led_flash_front>; eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; @@ -487,7 +487,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_wide>; + led-flash-src = <&led_flash_wide>; //eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; @@ -562,7 +562,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_macro>; + led-flash-src = <&led_flash_macro>; //eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; From ace6fd7533fb86825f06e0b21d5ccbac08e4ecf9 Mon Sep 17 00:00:00 2001 From: jixj Date: Sun, 11 Oct 2020 10:25:29 +0800 Subject: [PATCH 006/183] ibiza: add camera dtsi ibiza main dts has included it, copy from denver to fix build error. Change-Id: I5959662158719d5e0f521eeb6bf6a36c864dd9be Reviewed-on: https://gerrit.mot.com/1771403 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Huosheng Liao Tested-by: Jira Key Submit-Approved: Jira Key --- holi-camera-sensor-mot-ibiza-overlay.dtsi | 583 ++++++++++++++++++++++ 1 file changed, 583 insertions(+) create mode 100644 holi-camera-sensor-mot-ibiza-overlay.dtsi diff --git a/holi-camera-sensor-mot-ibiza-overlay.dtsi b/holi-camera-sensor-mot-ibiza-overlay.dtsi new file mode 100644 index 000000000000..c3d82b9f23a0 --- /dev/null +++ b/holi-camera-sensor-mot-ibiza-overlay.dtsi @@ -0,0 +1,583 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + led_flash_main: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; + + led_flash_front: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash1>; + torch-source = <&pm6150l_torch1>; + switch-source = <&pm6150l_switch2>; + status = "ok"; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <1>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + 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>; + //actuator-src = <&actuator_main>; + //led-flash-src = <&led_flash_main>; + //eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <3000 105000>; + cci-master = <0>; + status = "ok"; + }; + + qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + //led-flash-src = <&led_flash_front>; + //eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-load-current = <2500 50000 140000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //eeprom-src = <&eeprom_depth>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_depth: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <0 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //led-flash-src = <&led_flash_wide>; + //eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom3 { + cell-index = <3>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-load-current = <0 80000 105000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor@4 { + cell-index = <4>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //led-flash-src = <&led_flash_macro>; + //eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET4"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 77be1c3426d3cdfeec4d75495032fd7c0dec55e8 Mon Sep 17 00:00:00 2001 From: wangshuo18 Date: Sat, 10 Oct 2020 15:48:04 +0800 Subject: [PATCH 007/183] arm/dt: denver: add eeprom dts [detail] -add main wide macro eeprom dts Change-Id: Ia3ef39ecd24b45b4d9b34bc5a817f616d84a35e6 Signed-off-by: wangshuo18 Reviewed-on: https://gerrit.mot.com/1771123 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Wang Liu Reviewed-by: Jian Zhang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-denver-overlay.dtsi | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index 893c41191d18..e226a370e868 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -307,7 +307,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_main>; led-flash-src = <&led_flash_main>; - //eeprom-src = <&eeprom_main>; + eeprom-src = <&eeprom_main>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo3>; cam_vdig-supply = <&cam_ldo1>; @@ -343,14 +343,14 @@ cell-index = <0>; reg = <0x0>; compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; cam_vaf-supply = <&cam_ldo5>; - regulator-names = "cam_vio", "cam_vaf"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000>; - rgltr-max-voltage = <1800000 2800000>; - rgltr-load-current = <3000 105000>; - cci-master = <0>; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <1>; status = "ok"; }; @@ -417,7 +417,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //eeprom-src = <&eeprom_depth>; + eeprom-src = <&eeprom_depth>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; cam_clk-supply = <&gcc_camss_top_gdsc>; @@ -458,7 +458,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <0 80000 0>; + rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -488,7 +488,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; led-flash-src = <&led_flash_wide>; - //eeprom-src = <&eeprom_wide>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; cam_vdig-supply = <&cam_ldo2>; @@ -522,7 +522,7 @@ eeprom_wide: qcom,eeprom3 { cell-index = <3>; - reg = <0x2>; + reg = <0x3>; compatible = "qcom,eeprom"; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; @@ -533,7 +533,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <0 80000 105000 0>; + rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active From 5b064eb7b7186ac55d7f3a0257a52662ca873a5a Mon Sep 17 00:00:00 2001 From: wangshuo18 Date: Thu, 15 Oct 2020 16:10:41 +0800 Subject: [PATCH 008/183] denver: correct flash switch-source [detail] correct flash switch-source Change-Id: Ic23b37495df3258188ce78ca92d00275c1ca9a8e Signed-off-by: wangshuo18 Reviewed-on: https://gerrit.mot.com/1774968 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-denver-overlay.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index e226a370e868..fe774da8591e 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -252,7 +252,7 @@ compatible = "qcom,camera-flash"; flash-source = <&pm6150l_flash0>; torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch2>; + switch-source = <&pm6150l_switch0>; status = "ok"; }; @@ -261,7 +261,7 @@ compatible = "qcom,camera-flash"; flash-source = <&pm6150l_flash0>; torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch2>; + switch-source = <&pm6150l_switch0>; status = "ok"; }; @@ -270,7 +270,7 @@ compatible = "qcom,camera-flash"; flash-source = <&pm6150l_flash0>; torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch2>; + switch-source = <&pm6150l_switch0>; status = "ok"; }; @@ -279,7 +279,7 @@ compatible = "qcom,camera-flash"; flash-source = <&pm6150l_flash1>; torch-source = <&pm6150l_torch1>; - switch-source = <&pm6150l_switch2>; + switch-source = <&pm6150l_switch1>; status = "ok"; }; }; From 50a1253d8e93e7810ba64a91d7c92c61defa4106 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Thu, 15 Oct 2020 13:54:33 +0800 Subject: [PATCH 009/183] arm64/dt: ibiza: add camera dts add main, front, depth, macro camera dts for ibizai project. Change-Id: If1f04a265ad837db20541d53d27dbbab755c0a75 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1774812 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Dawei Wang Reviewed-by: Xu Ji Reviewed-by: Jian Zhang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key Reviewed-by: Zhichao Chen --- holi-camera-sensor-mot-ibiza-overlay.dtsi | 170 +++++++++++----------- 1 file changed, 88 insertions(+), 82 deletions(-) diff --git a/holi-camera-sensor-mot-ibiza-overlay.dtsi b/holi-camera-sensor-mot-ibiza-overlay.dtsi index c3d82b9f23a0..b0e410395df7 100644 --- a/holi-camera-sensor-mot-ibiza-overlay.dtsi +++ b/holi-camera-sensor-mot-ibiza-overlay.dtsi @@ -252,7 +252,7 @@ compatible = "qcom,camera-flash"; flash-source = <&pm6150l_flash0>; torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch2>; + switch-source = <&pm6150l_switch0>; status = "ok"; }; @@ -261,7 +261,7 @@ compatible = "qcom,camera-flash"; flash-source = <&pm6150l_flash0>; torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch2>; + switch-source = <&pm6150l_switch0>; status = "ok"; }; @@ -270,16 +270,7 @@ compatible = "qcom,camera-flash"; flash-source = <&pm6150l_flash0>; torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch2>; - status = "ok"; - }; - - led_flash_front: qcom,camera-flash@3 { - cell-index = <3>; - compatible = "qcom,camera-flash"; - flash-source = <&pm6150l_flash1>; - torch-source = <&pm6150l_torch1>; - switch-source = <&pm6150l_switch2>; + switch-source = <&pm6150l_switch0>; status = "ok"; }; }; @@ -288,7 +279,7 @@ actuator_main: qcom,actuator0 { cell-index = <0>; compatible = "qcom,actuator"; - cci-master = <1>; + cci-master = <0>; cam_vaf-supply = <&cam_ldo5>; regulator-names = "cam_vaf"; rgltr-cntrl-support; @@ -298,6 +289,21 @@ status = "ok"; }; + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vaf-supply = <&cam_ldo5>; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <0>; + status = "ok"; + }; + qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -305,9 +311,9 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //actuator-src = <&actuator_main>; - //led-flash-src = <&led_flash_main>; - //eeprom-src = <&eeprom_main>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_main>; + eeprom-src = <&eeprom_main>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo3>; cam_vdig-supply = <&cam_ldo1>; @@ -331,7 +337,7 @@ gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK0", "CAM_RESET0"; - cci-master = <1>; + cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; @@ -339,17 +345,16 @@ clock-rates = <24000000>; }; - eeprom_main: qcom,eeprom0 { - cell-index = <0>; - reg = <0x0>; + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; compatible = "qcom,eeprom"; cam_vio-supply = <&cam_ldo7>; - cam_vaf-supply = <&cam_ldo5>; - regulator-names = "cam_vio", "cam_vaf"; + regulator-names = "cam_vio"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000>; - rgltr-max-voltage = <1800000 2800000>; - rgltr-load-current = <3000 105000>; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; cci-master = <0>; status = "ok"; }; @@ -361,18 +366,17 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - //led-flash-src = <&led_flash_front>; //eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_vdig-supply = <&cam_ldo2>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <2500 50000 140000 0>; + 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 @@ -393,17 +397,57 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + + qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + //eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 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 = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; &cam_cci1 { qcom,cam-sensor2 { cell-index = <2>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <3>; + csiphy-sd-index = <2>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //eeprom-src = <&eeprom_depth>; + eeprom-src = <&eeprom_depth>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; cam_clk-supply = <&gcc_camss_top_gdsc>; @@ -444,7 +488,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <0 80000 0>; + rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -466,6 +510,7 @@ clock-rates = <24000000>; }; +/* qcom,cam-sensor3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -473,8 +518,8 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_wide>; - //eeprom-src = <&eeprom_wide>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; cam_vdig-supply = <&cam_ldo2>; @@ -488,9 +533,9 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_macro_reset_active>; + &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 36 0>; gpio-reset = <1>; @@ -508,7 +553,7 @@ eeprom_wide: qcom,eeprom3 { cell-index = <3>; - reg = <0x2>; + reg = <0x3>; compatible = "qcom,eeprom"; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; @@ -519,13 +564,13 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <0 80000 105000 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_macro_reset_active>; + &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 36 0>; gpio-reset = <1>; @@ -540,44 +585,5 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - qcom,cam-sensor@4 { - cell-index = <4>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <3>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_macro>; - //eeprom-src = <&eeprom_macro>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_vdig-supply = <&cam_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RESET4"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; +*/ }; From 25403a75e3027bb56be7bb7a81e97268196f8718 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Mon, 19 Oct 2020 17:02:14 +0800 Subject: [PATCH 010/183] arm64/dt: ibiza: add s5k3l6 eeprom dts [detail] add s5k3l6 eeprom dts. Change-Id: Ic0f29f638d02c55fcde532cfc93f4840cf309266 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1778568 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Shuo Wang Reviewed-by: Zilong Zhang Reviewed-by: Jian Zhang Reviewed-by: Bolei Shang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-ibiza-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-ibiza-overlay.dtsi b/holi-camera-sensor-mot-ibiza-overlay.dtsi index b0e410395df7..345ddca885e4 100644 --- a/holi-camera-sensor-mot-ibiza-overlay.dtsi +++ b/holi-camera-sensor-mot-ibiza-overlay.dtsi @@ -366,7 +366,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - //eeprom-src = <&eeprom_front>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo3>; cam_vdig-supply = <&cam_ldo1>; From fe2bdce1ae03ba60909dee195d4ad175c0d3b37b Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Mon, 9 Nov 2020 16:25:47 +0800 Subject: [PATCH 011/183] arm64/dts: denver/ibiza: add 5e9 eeprom [detail] add 5e9 eeprom dts. Change-Id: I3bbef45da8469b997cbb502eff8f2ad027173b78 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1797384 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Darong Huang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key Reviewed-by: Shuo Wang --- holi-camera-sensor-mot-denver-overlay.dtsi | 37 +++++++++++++++++++++- holi-camera-sensor-mot-ibiza-overlay.dtsi | 37 +++++++++++++++++++++- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index fe774da8591e..b3b98ec0f70e 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -555,6 +555,41 @@ clock-rates = <24000000>; }; + eeprom_macro: qcom,eeprom4 { + cell-index = <4>; + reg = <0x4>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET4"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + qcom,cam-sensor@4 { cell-index = <4>; compatible = "qcom,cam-sensor"; @@ -563,7 +598,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; led-flash-src = <&led_flash_macro>; - //eeprom-src = <&eeprom_macro>; + eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; cam_vdig-supply = <&cam_ldo2>; diff --git a/holi-camera-sensor-mot-ibiza-overlay.dtsi b/holi-camera-sensor-mot-ibiza-overlay.dtsi index 345ddca885e4..78a30fd0b884 100644 --- a/holi-camera-sensor-mot-ibiza-overlay.dtsi +++ b/holi-camera-sensor-mot-ibiza-overlay.dtsi @@ -398,6 +398,41 @@ clock-rates = <24000000>; }; + eeprom_macro: qcom,eeprom3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 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 = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -406,7 +441,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; led-flash-src = <&led_flash_macro>; - //eeprom-src = <&eeprom_macro>; + eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; cam_vdig-supply = <&cam_ldo2>; From e046178890f41832696567107174c0eff5428774 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Wed, 2 Dec 2020 12:25:00 +0800 Subject: [PATCH 012/183] arm64/dts: denver: update all sensors mclk current to 6mA [detail] As hw's requirements, modify all sensors mclk current to 6 mA Change-Id: I852ada90ddec1dad6cdb342774fbcc08a165386d Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1815754 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-denver-overlay.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index b3b98ec0f70e..a1851b0a623c 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -10,7 +10,7 @@ config { pins = "gpio29"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; @@ -23,7 +23,7 @@ config { pins = "gpio29"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; @@ -36,7 +36,7 @@ config { pins = "gpio30"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; @@ -49,7 +49,7 @@ config { pins = "gpio30"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; @@ -62,7 +62,7 @@ config { pins = "gpio31"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; @@ -75,7 +75,7 @@ config { pins = "gpio31"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; @@ -88,7 +88,7 @@ config { pins = "gpio32"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; @@ -101,7 +101,7 @@ config { pins = "gpio32"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <6>; }; }; From 8c9557f292439e016cd8fb728d75594e1b5b25a0 Mon Sep 17 00:00:00 2001 From: wangshuo18 Date: Thu, 3 Dec 2020 17:16:36 +0800 Subject: [PATCH 013/183] ibiza: bringup 64M+8M rear camera -bringup ov64B s5k4h7 for ibiza. -ov64B gm1st 3l6 share the same DVDD LDO. ov64B type value is 1.1v,gm1st type value is 1.05V, change rear main DVDD to 1.1 to be compatiable with both cameras. Change-Id: If7d129b60a0b913efd00f1bb74a24eb58de9e086 Signed-off-by: wangshuo18 Reviewed-on: https://gerrit.mot.com/1818065 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Shuo Wang Reviewed-by: Zhenxin Xi Reviewed-by: Wang Liu Submit-Approved: Jira Key --- holi-camera-sensor-mot-ibiza-overlay.dtsi | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/holi-camera-sensor-mot-ibiza-overlay.dtsi b/holi-camera-sensor-mot-ibiza-overlay.dtsi index 78a30fd0b884..3afce1f502d7 100644 --- a/holi-camera-sensor-mot-ibiza-overlay.dtsi +++ b/holi-camera-sensor-mot-ibiza-overlay.dtsi @@ -321,8 +321,8 @@ 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-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1100000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -545,11 +545,10 @@ clock-rates = <24000000>; }; -/* - qcom,cam-sensor3 { - cell-index = <3>; + qcom,cam-sensor4 { + cell-index = <4>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; + csiphy-sd-index = <3>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; @@ -577,7 +576,7 @@ gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3"; + "CAM_RESET4"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; @@ -586,9 +585,9 @@ clock-rates = <24000000>; }; - eeprom_wide: qcom,eeprom3 { - cell-index = <3>; - reg = <0x3>; + eeprom_wide: qcom,eeprom4 { + cell-index = <4>; + reg = <0x4>; compatible = "qcom,eeprom"; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; @@ -612,7 +611,7 @@ gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3"; + "CAM_RESET4"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; @@ -620,5 +619,4 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; -*/ }; From 4ee830461da791a13e80234be5bb87a51ef950e3 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Tue, 1 Dec 2020 16:49:24 +0800 Subject: [PATCH 014/183] ibiza: modify 2M and 13M MCLK current As hw's requirements, modify MCLK1 and MCLK2 current to 4 mA. Change-Id: I5c9389488d968413403480c13a9360b8327ae103 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1814839 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-ibiza-overlay.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/holi-camera-sensor-mot-ibiza-overlay.dtsi b/holi-camera-sensor-mot-ibiza-overlay.dtsi index 3afce1f502d7..c3c8452e0df3 100644 --- a/holi-camera-sensor-mot-ibiza-overlay.dtsi +++ b/holi-camera-sensor-mot-ibiza-overlay.dtsi @@ -36,7 +36,7 @@ config { pins = "gpio30"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; }; }; @@ -49,7 +49,7 @@ config { pins = "gpio30"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; }; }; @@ -62,7 +62,7 @@ config { pins = "gpio31"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; }; }; @@ -75,7 +75,7 @@ config { pins = "gpio31"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; }; }; From 89ab81832e9361a6b401540f28862b8a31bcc73e Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Fri, 8 Jan 2021 16:57:35 +0800 Subject: [PATCH 015/183] denver: config shared MCLK1 for depth and wide When open multicam, main+depth+wide will all power on. But depth+wide shared MCLK1, which caused MCLK1(GPIO30) will do gpio_request_one()/pinctrl_select_state() twice. Add shared MCLK1 config in cam-res-mgr to avoid this. Change-Id: I29e859a7872d04a3ec5208892eacfd98e8cfba47 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1846872 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Jian Zhang Reviewed-by: Darong Huang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key Reviewed-by: Long Cheng Reviewed-by: Dawei Wang --- holi-camera-sensor-mot-denver-overlay.dtsi | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/holi-camera-sensor-mot-denver-overlay.dtsi b/holi-camera-sensor-mot-denver-overlay.dtsi index a1851b0a623c..b6a511c11d41 100644 --- a/holi-camera-sensor-mot-denver-overlay.dtsi +++ b/holi-camera-sensor-mot-denver-overlay.dtsi @@ -244,6 +244,12 @@ &soc { qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; + gpios-shared = <385>; /* shared MCLK1 30+355 */ + gpios-shared-pinctrl = <385>; + shared-pctrl-gpio-names = "mclk1"; + pinctrl-names = "mclk1_active", "mclk1_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend>; status = "ok"; }; @@ -428,10 +434,8 @@ rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>; + pinctrl-0 = <&cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_depth_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 49 0>; gpio-reset = <1>; @@ -461,10 +465,8 @@ rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>; + pinctrl-0 = <&cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_depth_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 49 0>; gpio-reset = <1>; @@ -501,10 +503,8 @@ 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_wide_reset_suspend>; + pinctrl-0 = <&cam_sensor_wide_reset_active>; + pinctrl-1 = <&cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 36 0>; gpio-reset = <1>; @@ -536,10 +536,8 @@ 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_wide_reset_suspend>; + pinctrl-0 = <&cam_sensor_wide_reset_active>; + pinctrl-1 = <&cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 36 0>; gpio-reset = <1>; From b735e8152e4cca9379b258cde70692a179885fbc Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Mon, 11 Jan 2021 20:41:18 +0800 Subject: [PATCH 016/183] Ibiza/Ibiza-premium: Supported front&main camera open simultaneously Faceunlock open front camera, quick capture twice open main camera. Main and front camera will open simultaneously. DVDD voltage range: OV64B40: [1.05, 1.18] S5kGM1ST: [0.95, 1.15] s5k3l6: [0.95, 1.15] Set DVDD regulator voltage to [1.05, 1.15] Change-Id: I730c1f921d30c849ae44daece0138db64c65f95d Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1848527 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Shuo Wang Reviewed-by: Jian Zhang Reviewed-by: Long Cheng Reviewed-by: Zhenxin Xi Reviewed-by: Dawei Wang Submit-Approved: Jira Key --- holi-camera-sensor-mot-ibiza-overlay.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/holi-camera-sensor-mot-ibiza-overlay.dtsi b/holi-camera-sensor-mot-ibiza-overlay.dtsi index c3c8452e0df3..cdd07c073ce2 100644 --- a/holi-camera-sensor-mot-ibiza-overlay.dtsi +++ b/holi-camera-sensor-mot-ibiza-overlay.dtsi @@ -321,8 +321,8 @@ regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1100000 0>; - rgltr-max-voltage = <1800000 2800000 1100000 0>; + rgltr-min-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1800000 2800000 1150000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -375,7 +375,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1800000 2800000 1150000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; From dc1ddc7018b671805d58e994d783a618d2fdc95b Mon Sep 17 00:00:00 2001 From: jixu Date: Mon, 22 Mar 2021 17:02:27 +0800 Subject: [PATCH 017/183] corfup: camera dtsi init project config init project config follow ibiza Change-Id: I7baf24d18d5527bc5d56bdb68c72252f21f33ca3 Signed-off-by: jixu Reviewed-on: https://gerrit.mot.com/1906852 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Long Cheng Reviewed-by: Jian Zhang Reviewed-by: Zhilong Wang Reviewed-by: Bolei Shang Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 622 +++++++++++++++++++++ 1 file changed, 622 insertions(+) create mode 100644 holi-camera-sensor-mot-corfup-overlay.dtsi diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi new file mode 100644 index 000000000000..cdd07c073ce2 --- /dev/null +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -0,0 +1,622 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + led_flash_main: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch0>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch0>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch0>; + status = "ok"; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vaf-supply = <&cam_ldo5>; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <0>; + status = "ok"; + }; + + 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>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_main>; + eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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 1150000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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 1150000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_macro: qcom,eeprom3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 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 = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 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 = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_depth>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_depth: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor4 { + cell-index = <4>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET4"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom4 { + cell-index = <4>; + reg = <0x4>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET4"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 238bdf19b952ec64aeb1edca553d366f133ae429 Mon Sep 17 00:00:00 2001 From: jixu Date: Thu, 1 Apr 2021 15:55:23 +0800 Subject: [PATCH 018/183] arm/dt: Config corfup camera dtsi corfup Config camera dtsi Change-Id: I461e329d65f56a49c9a16da8327dc1910cbfe60c Signed-off-by: jixu Reviewed-on: https://gerrit.mot.com/1914996 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Jian Zhang Reviewed-by: Darong Huang Reviewed-by: Zhuoran Xu Reviewed-by: Bolei Shang Reviewed-by: Zhichao Chen Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 269 +++++---------------- 1 file changed, 55 insertions(+), 214 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index cdd07c073ce2..2c145bccc4ac 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -10,7 +10,7 @@ config { pins = "gpio29"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 2 MA */ }; }; @@ -23,7 +23,7 @@ config { pins = "gpio29"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 2 MA */ }; }; @@ -88,7 +88,7 @@ config { pins = "gpio32"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 2 MA */ }; }; @@ -101,7 +101,7 @@ config { pins = "gpio32"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 2 MA */ }; }; @@ -159,7 +159,7 @@ }; }; - cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + cam_sensor_macro_depth_reset_active: cam_sensor_macro_depth_reset_active { mux { pins = "gpio49"; function = "gpio"; @@ -172,7 +172,7 @@ }; }; - cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + cam_sensor_macro_depth_reset_suspend: cam_sensor_macro_depth_reset_suspend { mux { pins = "gpio49"; function = "gpio"; @@ -273,37 +273,24 @@ switch-source = <&pm6150l_switch0>; status = "ok"; }; + }; &cam_cci0 { + // ROW/PRC: OV64B(OIS); JP: S5KGN1 actuator_main: qcom,actuator0 { cell-index = <0>; compatible = "qcom,actuator"; - cci-master = <0>; - cam_vaf-supply = <&cam_ldo5>; - regulator-names = "cam_vaf"; + cam_vaf-supply = <&cam_pmic2_ldo4_avdd2>;//For ROW/PRC rear main AF + cam_v_custom1-supply = <&cam_pmic1_ldo5_vddaf>;//For JP rear main AF + regulator-names = "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; + rgltr-min-voltage = <2800000 2800000>; + rgltr-max-voltage = <2800000 2800000>; + rgltr-load-current = <100000 100000>; + cci-master = <1>; status = "ok"; }; - - eeprom_main: qcom,eeprom0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,eeprom"; - cam_vaf-supply = <&cam_ldo5>; - cam_vio-supply = <&cam_ldo7>; - regulator-names = "cam_vaf", "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000 1800000>; - rgltr-max-voltage = <2800000 1800000>; - rgltr-load-current = <100000 120000>; - cci-master = <0>; - status = "ok"; - }; - qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -313,16 +300,15 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_main>; led-flash-src = <&led_flash_main>; - eeprom-src = <&eeprom_main>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo3>; - cam_vdig-supply = <&cam_ldo1>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo6_vddois>; + cam_vdig-supply = <&cam_pmic2_ldo2_dvdd2>; cam_clk-supply = <&gcc_camss_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 1150000 0>; + rgltr-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1100000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -336,46 +322,31 @@ gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK0", - "CAM_RESET0"; - cci-master = <0>; + "CAM_RM_RST"; + cci-master = <1>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - eeprom_front: qcom,eeprom@1 { - cell-index = <1>; - reg = <0x1>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; - cci-master = <0>; - status = "ok"; - }; - + // HI-1336 qcom,cam-sensor@1 { cell-index = <1>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; + csiphy-sd-index = <3>; sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - eeprom-src = <&eeprom_front>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo3>; - cam_vdig-supply = <&cam_ldo1>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; + cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; cam_clk-supply = <&gcc_camss_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 1150000 0>; + rgltr-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1100000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -389,7 +360,7 @@ gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET1"; + "CAM_FW_RST"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; @@ -397,84 +368,10 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - eeprom_macro: qcom,eeprom3 { - cell-index = <3>; - reg = <0x3>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo6>; - cam_vdig-supply = <&cam_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 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 = <1>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - qcom,cam-sensor@3 { - cell-index = <3>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_macro>; - eeprom-src = <&eeprom_macro>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo6>; - cam_vdig-supply = <&cam_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 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 = <1>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; }; &cam_cci1 { + // ROW/PRC: macro OV02B10; JP: depth OV02B1B qcom,cam-sensor2 { cell-index = <2>; compatible = "qcom,cam-sensor"; @@ -482,9 +379,9 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - eeprom-src = <&eeprom_depth>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; + led-flash-src = <&led_flash_macro>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; @@ -494,16 +391,16 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; + &cam_sensor_macro_depth_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>; + &cam_sensor_macro_depth_reset_suspend>; gpios = <&tlmm 30 0>, <&tlmm 49 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2"; + "CAM_RD_RST"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; @@ -511,52 +408,31 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - eeprom_depth: qcom,eeprom2 { - cell-index = <2>; - reg = <0x2>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; + // ROW/PRC: S5K4H7(FF); JP: S5K4H7(AF) + actuator_wide: qcom,actuator3 { + cell-index = <3>; + compatible = "qcom,actuator"; + cam_vaf-supply = <&cam_pmic2_ldo4_avdd2>;//For JP wide AF + regulator-names = "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 49 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2"; - cci-master = <0>; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + cci-master = <1>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; }; - - qcom,cam-sensor4 { - cell-index = <4>; + qcom,cam-sensor3 { + cell-index = <3>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <3>; + csiphy-sd-index = <1>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + actuator-src = <&actuator_wide>; led-flash-src = <&led_flash_wide>; - eeprom-src = <&eeprom_wide>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_vdig-supply = <&cam_ldo2>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; @@ -576,42 +452,7 @@ gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET4"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - eeprom_wide: qcom,eeprom4 { - cell-index = <4>; - reg = <0x4>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_vdig-supply = <&cam_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 36 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET4"; + "CAM_RW_RST"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; From 0bf68ec52c4cfa126aac101e7681cb50d9f461e1 Mon Sep 17 00:00:00 2001 From: wangdw10 Date: Mon, 19 Apr 2021 10:41:46 +0800 Subject: [PATCH 019/183] arm64/dts: corfup: update rear main vdig to 1.104v wl2866d regulator ldo2 supply for vdig, it init voltage is 0.6v with step 0.006v, so 1.104v is the correct voltage, this change fix set voltage fail when the value is 1.1v Change-Id: I46f6b5bfc28e3eb15c5efdf505b7fdee5f1de873 Signed-off-by: wangdw10 Reviewed-on: https://gerrit.mot.com/1926745 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Xingyun Fu Reviewed-by: Darong Huang Reviewed-by: Zilong Zhang Reviewed-by: Zhuoran Xu Reviewed-by: Long Cheng Reviewed-by: Jian Zhang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 2c145bccc4ac..f7ec3d9b4add 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -307,8 +307,8 @@ regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1100000 0>; - rgltr-max-voltage = <1800000 2800000 1100000 0>; + rgltr-min-voltage = <1800000 2800000 1104000 0>; + rgltr-max-voltage = <1800000 2800000 1104000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; From c18a85634502610aee7210e856354a5119a53dd5 Mon Sep 17 00:00:00 2001 From: wangdw10 Date: Tue, 20 Apr 2021 18:04:40 +0800 Subject: [PATCH 020/183] arm64/dts: corfup: add aw36518 flash node remove pmic flash node and add aw36518 I2C flash support for rear main camera Change-Id: I9c027a333361a0bcc0eb58edfa48c6ce91cd2b27 Signed-off-by: wangdw10 Reviewed-on: https://gerrit.mot.com/1928110 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xu Ji Reviewed-by: Dawei Wang Reviewed-by: Zhuoran Xu Reviewed-by: Shuo Wang Reviewed-by: Xingyun Fu Reviewed-by: Long Cheng Reviewed-by: Jian Zhang Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 47 ++++++++-------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index f7ec3d9b4add..2a15ebe9fe00 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -246,34 +246,6 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; - - led_flash_main: qcom,camera-flash@0 { - cell-index = <0>; - compatible = "qcom,camera-flash"; - flash-source = <&pm6150l_flash0>; - torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch0>; - status = "ok"; - }; - - led_flash_wide: qcom,camera-flash@1 { - cell-index = <1>; - compatible = "qcom,camera-flash"; - flash-source = <&pm6150l_flash0>; - torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch0>; - status = "ok"; - }; - - led_flash_macro: qcom,camera-flash@2 { - cell-index = <2>; - compatible = "qcom,camera-flash"; - flash-source = <&pm6150l_flash0>; - torch-source = <&pm6150l_torch0>; - switch-source = <&pm6150l_switch0>; - status = "ok"; - }; - }; &cam_cci0 { @@ -291,6 +263,21 @@ cci-master = <1>; status = "ok"; }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + cci-master = <0>; + status = "ok"; + }; + qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -299,7 +286,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_main>; - led-flash-src = <&led_flash_main>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo6_vddois>; cam_vdig-supply = <&cam_pmic2_ldo2_dvdd2>; @@ -379,7 +366,6 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - led-flash-src = <&led_flash_macro>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; cam_clk-supply = <&gcc_camss_top_gdsc>; @@ -429,7 +415,6 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_wide>; - led-flash-src = <&led_flash_wide>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; From dcfb96a735406dc25cc121266b11bb342c8ce03b Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Wed, 2 Jun 2021 17:27:43 +0800 Subject: [PATCH 021/183] corfup: bringup ov64 eeprom 1.set ov64b eeprom power config 2.set ov64b vcm power config Change-Id: I785a1034f8fdbcaf31309f343b007572db13d389 Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/1967384 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Xingyun Fu Reviewed-by: Quanlin Zhu Reviewed-by: Zhuoran Xu Reviewed-by: Long Cheng Reviewed-by: Shuo Wang Reviewed-by: Zhichao Chen Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 2a15ebe9fe00..081787c01969 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -249,17 +249,15 @@ }; &cam_cci0 { - // ROW/PRC: OV64B(OIS); JP: S5KGN1 - actuator_main: qcom,actuator0 { + actuator_main: qcom,actuator@0 { cell-index = <0>; compatible = "qcom,actuator"; - cam_vaf-supply = <&cam_pmic2_ldo4_avdd2>;//For ROW/PRC rear main AF - cam_v_custom1-supply = <&cam_pmic1_ldo5_vddaf>;//For JP rear main AF - regulator-names = "cam_vaf", "cam_v_custom1"; + cam_vaf-supply = <&cam_pmic2_ldo4_avdd2>; + regulator-names = "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <2800000 2800000>; - rgltr-max-voltage = <2800000 2800000>; - rgltr-load-current = <100000 100000>; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; cci-master = <1>; status = "ok"; }; @@ -278,7 +276,21 @@ status = "ok"; }; - qcom,cam-sensor0 { + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <0>; @@ -287,6 +299,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_main>; led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo6_vddois>; cam_vdig-supply = <&cam_pmic2_ldo2_dvdd2>; @@ -359,7 +372,7 @@ &cam_cci1 { // ROW/PRC: macro OV02B10; JP: depth OV02B1B - qcom,cam-sensor2 { + qcom,cam-sensor@2 { cell-index = <2>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <2>; @@ -394,27 +407,14 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - // ROW/PRC: S5K4H7(FF); JP: S5K4H7(AF) - actuator_wide: qcom,actuator3 { - cell-index = <3>; - compatible = "qcom,actuator"; - cam_vaf-supply = <&cam_pmic2_ldo4_avdd2>;//For JP wide AF - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - cci-master = <1>; - status = "ok"; - }; - qcom,cam-sensor3 { + + qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <1>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - actuator-src = <&actuator_wide>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; From 08f23a74ad2ec2d5e2e7f22f42cf5b4ccb118d13 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Thu, 3 Jun 2021 17:13:10 +0800 Subject: [PATCH 022/183] corfu5g: add gc02m1 eeprom add gc02m1 eeprom this eeprom just include WB info Change-Id: I8572856ab27b47c2a2e2f5020fcc623fd0d8557a Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/1968921 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Zhilong Wang Reviewed-by: Qiang Guo Reviewed-by: Zhuoran Xu Reviewed-by: Xingyun Fu Reviewed-by: Zhichao Chen Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 37 ++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 081787c01969..24e29d35dc41 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -371,14 +371,47 @@ }; &cam_cci1 { - // ROW/PRC: macro OV02B10; JP: depth OV02B1B - qcom,cam-sensor@2 { + // ROW/PRC: macro OV02B10; JP: depth OV02B1B;5G: macro GC02M1 + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + qcom,cam-sensor2 { cell-index = <2>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <2>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; cam_clk-supply = <&gcc_camss_top_gdsc>; From 6b832a9d8c57aae4129fe09c2c7e37028bdc1330 Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Tue, 8 Jun 2021 19:55:48 +0800 Subject: [PATCH 023/183] corfup: 50M camera bringup corfup set vdig to 1.05v Change-Id: Id7bdbc8f9ab462accc8f5bb3a7fb9eb281a9db48 Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/1973631 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Bolei Shang Reviewed-by: XiaoFeng Wang Reviewed-by: Long Cheng Reviewed-by: Shuo Wang Reviewed-by: Jian Zhang Reviewed-by: Zhichao Chen Reviewed-by: Zhuoran Xu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 24e29d35dc41..724267dd3d5e 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -307,8 +307,8 @@ regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1104000 0>; - rgltr-max-voltage = <1800000 2800000 1104000 0>; + 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"; From 1dcde48e40a394ce8d56fdac2e270ca630bbcca6 Mon Sep 17 00:00:00 2001 From: Tinno_Zhaozq Date: Tue, 8 Jun 2021 19:57:35 +0800 Subject: [PATCH 024/183] cypfg: add s5k3l6 camera driver add dtsi for front camera add front camera bring up code Change-Id: I5d64e6ec5eb2767902434da36c69d9773f3700ac Reviewed-on: https://gerrit.mot.com/1973640 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Qiang Guo Reviewed-by: Shuo Wang Reviewed-by: Jian Zhang Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 630 ++++++++++++++++++++++ 1 file changed, 630 insertions(+) create mode 100644 holi-camera-sensor-mot-cypfg-overlay.dtsi diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi new file mode 100644 index 000000000000..aa29d08dde54 --- /dev/null +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -0,0 +1,630 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + led_flash_main: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch0>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch0>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-source = <&pm6150l_flash0>; + torch-source = <&pm6150l_torch0>; + switch-source = <&pm6150l_switch0>; + status = "ok"; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vaf-supply = <&cam_ldo5>; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <0>; + status = "ok"; + }; + + 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>; + /*actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_main>; + eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_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 1150000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>;*/ + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + /*cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>;*/ + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET4"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + /*//led-flash-src = <&led_flash_wide>; + //eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + //cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>;*/ + gpios = <&tlmm 30 0>, + <&tlmm 49 0>, + <&tlmm 12 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_RESET2", + "CAM_VDIG"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor4 { + cell-index = <4>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //eeprom-src = <&eeprom_depth>; + cam_vio-supply = <&cam_ldo7>; + //cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 0>; + rgltr-max-voltage = <1800000 0>; + rgltr-load-current = <120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>, + <&tlmm 51 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_RESET4", + "CAM_VANA"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_depth: qcom,eeprom4 { + cell-index = <4>; + reg = <0x4>; + compatible = "qcom,eeprom"; + /*cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>;*/ + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_front: qcom,eeprom1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + //eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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 120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_macro: qcom,eeprom3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + /*cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>;*/ + gpios = <&tlmm 32 0>, + <&tlmm 37 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 = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //led-flash-src = <&led_flash_macro>; + //eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + //cam_vana-supply = <&cam_ldo6>; + //cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 0>; + rgltr-max-voltage = <1800000 0>; + rgltr-load-current = <120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>, + <&tlmm 51 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_MCLK2", + "CAM_RESET3", + "CAM_VANA"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; \ No newline at end of file From 814dc13559a30d85506d93e6374039de90d2e5df Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Tue, 8 Jun 2021 17:01:51 +0800 Subject: [PATCH 025/183] corfu5g: add front and wide eeprom detail: add front ov16a1q eeprom and wide s5k4h7 otp settings Change-Id: I0dbbdb16c35d79e0580bbd3d5ecadcaa405ebb1e Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/1973389 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Zhichao Chen Reviewed-by: Zhuoran Xu Reviewed-by: Shuo Wang Reviewed-by: Wang Liu Reviewed-by: Qiang Guo Tested-by: Jira Key Reviewed-by: Xingyun Fu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 54 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 724267dd3d5e..91cd9a75c13a 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -330,7 +330,20 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - // HI-1336 + // front camera + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; qcom,cam-sensor@1 { cell-index = <1>; compatible = "qcom,cam-sensor"; @@ -338,6 +351,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; @@ -404,7 +418,7 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - qcom,cam-sensor2 { + qcom,cam-sensor@2 { cell-index = <2>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <2>; @@ -440,7 +454,40 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -448,6 +495,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; From 19082acadf173c4df8885f751c7a8ffa79184235 Mon Sep 17 00:00:00 2001 From: Tinno_Haolb Date: Wed, 9 Jun 2021 19:03:39 +0800 Subject: [PATCH 026/183] cypfg: add camera sensor dtsi config add camera sensor dtsi config camera sensor bring up config Change-Id: I2269ca36a3c2027c45f10fd6ecb3b8926ec97080 Reviewed-on: https://gerrit.mot.com/1974870 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: XiaoFeng Wang Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index aa29d08dde54..7f9644ad4019 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -311,7 +311,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - /*actuator-src = <&actuator_main>; + actuator-src = <&actuator_main>; led-flash-src = <&led_flash_main>; eeprom-src = <&eeprom_main>; cam_vio-supply = <&cam_ldo7>; @@ -329,7 +329,7 @@ pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_main_reset_active>; pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_main_reset_suspend>;*/ + &cam_sensor_main_reset_suspend>; gpios = <&tlmm 29 0>, <&tlmm 35 0>; gpio-reset = <1>; @@ -387,7 +387,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - /*//led-flash-src = <&led_flash_wide>; + //led-flash-src = <&led_flash_wide>; //eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; @@ -401,23 +401,23 @@ rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_wide_reset_suspend>;*/ - gpios = <&tlmm 30 0>, + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 49 0>, <&tlmm 12 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", + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET2", "CAM_VDIG"; cci-master = <1>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; @@ -596,8 +596,6 @@ //led-flash-src = <&led_flash_macro>; //eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; - //cam_vana-supply = <&cam_ldo6>; - //cam_vdig-supply = <&cam_ldo2>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_clk"; rgltr-cntrl-support; @@ -627,4 +625,4 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; -}; \ No newline at end of file +}; From bd8176017578430310ddad2e7b25e2b24e6858c7 Mon Sep 17 00:00:00 2001 From: Tinno_Zhaozq Date: Fri, 11 Jun 2021 17:23:31 +0800 Subject: [PATCH 027/183] cypfg: add front camera eeprom driver - add s5k3l6 eeprom driver - modify dts for front camera Change-Id: Ic70fab4c0156a9eb088b2026d1980b35a206edcf Reviewed-on: https://gerrit.mot.com/1977633 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Qiang Guo Reviewed-by: Jian Zhang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index 7f9644ad4019..077456773d2a 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -519,7 +519,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - //eeprom-src = <&eeprom_front>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo3>; cam_vdig-supply = <&cam_ldo1>; From 2e5440713d0646fd775244c3f42fd07bead878cc Mon Sep 17 00:00:00 2001 From: Tinno_Niefx Date: Tue, 15 Jun 2021 12:44:33 +0800 Subject: [PATCH 028/183] cypfg: modift s5k4h7 and gc02m1 camera driver modify dtsi for front camera on evt modify 2m and 8m camera bring up code Change-Id: I9c12e28c5b39b8d658867b53afc2ac18d9857e06 Reviewed-on: https://gerrit.mot.com/1979524 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Wang Liu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 30 +++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index 077456773d2a..d43b654f3f38 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -401,23 +401,23 @@ rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active + pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 31 0>, + gpios = <&tlmm 30 0>, <&tlmm 49 0>, <&tlmm 12 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_MCLK2", + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET2", "CAM_VDIG"; cci-master = <1>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; @@ -596,12 +596,13 @@ //led-flash-src = <&led_flash_macro>; //eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_clk"; + regulator-names = "cam_vio","cam_vana", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 0>; - rgltr-max-voltage = <1800000 0>; - rgltr-load-current = <120000 0>; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk2_active @@ -609,15 +610,12 @@ pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_macro_reset_suspend>; gpios = <&tlmm 31 0>, - <&tlmm 37 0>, - <&tlmm 51 0>; + <&tlmm 37 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET3", - "CAM_VANA"; + "CAM_RESET3"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; From 5803c489b96ac070667e62f1cde36b28c5b846ce Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Wed, 23 Jun 2021 16:13:47 +0800 Subject: [PATCH 029/183] corfup: add i2c flash type corfup Baseline upgrade imports Flash type check Change-Id: I2d5326e952ce72919f0c49852a45d27cf5c0c3b7 Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/1989232 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: Ying Xu --- holi-camera-sensor-mot-corfup-overlay.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 91cd9a75c13a..e14614fb2955 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -272,6 +272,7 @@ rgltr-min-voltage = <1800000>; rgltr-max-voltage = <1800000>; rgltr-load-current = <100000>; + flash-type = <1>; cci-master = <0>; status = "ok"; }; From 0814e909d7f5eb3c9d590a7e9857caf76f01c1f5 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Fri, 11 Jun 2021 17:17:19 +0800 Subject: [PATCH 030/183] corfu5g: modify macro AVDD and wide macro flash 1.modify macro camera AVDD for DVT1 2.add wide and macro camera flash Change-Id: I45462115e98bdde510e13b73504b70b4ec16d249 Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/1977624 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Qiang Guo Reviewed-by: Wang Liu Reviewed-by: Shuo Wang Reviewed-by: Xingyun Fu Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- ...camera-sensor-mot-corfup-dvt1-overlay.dtsi | 19 ++++++ holi-camera-sensor-mot-corfup-overlay.dtsi | 62 +++++++++++++++++-- 2 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 holi-camera-sensor-mot-corfup-dvt1-overlay.dtsi diff --git a/holi-camera-sensor-mot-corfup-dvt1-overlay.dtsi b/holi-camera-sensor-mot-corfup-dvt1-overlay.dtsi new file mode 100644 index 000000000000..eede79e513d4 --- /dev/null +++ b/holi-camera-sensor-mot-corfup-dvt1-overlay.dtsi @@ -0,0 +1,19 @@ +/* Copyright (c) 2021, 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. + */ + +&eeprom_macro{ + cam_vana-supply = <&cam_macro_avdd>; +}; + +&sensor_macro{ + cam_vana-supply = <&cam_macro_avdd>; +}; diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index e14614fb2955..faf795037c32 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -239,6 +239,19 @@ output-low; }; }; + cam_macro_avdd_en_default: cam_macro_avdd_en_default { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; }; &soc { @@ -246,6 +259,19 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + cam_macro_avdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_macro_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_macro_avdd_en_default>; + vin-supply = <&BOB>; + }; }; &cam_cci0 { @@ -291,7 +317,7 @@ status = "ok"; }; - qcom,cam-sensor@0 { + sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <0>; @@ -345,7 +371,7 @@ cci-master = <0>; status = "ok"; }; - qcom,cam-sensor@1 { + sensor_front: qcom,cam-sensor@1 { cell-index = <1>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <3>; @@ -387,6 +413,19 @@ &cam_cci1 { // ROW/PRC: macro OV02B10; JP: depth OV02B1B;5G: macro GC02M1 + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + cci-master = <0>; + status = "ok"; + }; eeprom_macro: qcom,eeprom@2 { cell-index = <2>; reg = <0x2>; @@ -419,13 +458,14 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - qcom,cam-sensor@2 { + sensor_macro: qcom,cam-sensor@2 { cell-index = <2>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <2>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; @@ -455,6 +495,19 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + cci-master = <0>; + status = "ok"; + }; eeprom_wide: qcom,eeprom@3 { cell-index = <3>; reg = <0x3>; @@ -489,13 +542,14 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - qcom,cam-sensor@3 { + sensor_wide: qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <1>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; From e04da0a7beeee1ecca89d481c566c702460819a8 Mon Sep 17 00:00:00 2001 From: Tinno_Haolb Date: Thu, 17 Jun 2021 15:29:08 +0800 Subject: [PATCH 031/183] cypfg: 2M marco open flash function 1.marco yaml add flash xml 2.marco yaml add flash dtsi power Change-Id: I9e32c2dbde7c59576e72a95b44db266dc5eba9ef Reviewed-on: https://gerrit.mot.com/1982351 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Reviewed-by: Long Cheng Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index d43b654f3f38..b86fb3fdeef1 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -593,7 +593,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_macro>; + led-flash-src = <&led_flash_macro>; //eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; From 4f862a2f8dde498e72ee7a28bfe005b5ff294fcf Mon Sep 17 00:00:00 2001 From: Tinno_Niefx Date: Thu, 17 Jun 2021 22:50:14 +0800 Subject: [PATCH 032/183] cypfg: add s5k4h7 camera otp driver dtsi add otp driver dtsi for s5k4h7 eeprom is mot_cypfg_s5k4h7_otp Change-Id: Icd2b2ed801f70d83e4636815405a624a993f03b4 Reviewed-on: https://gerrit.mot.com/1982929 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Zhuoran Xu Reviewed-by: Long Cheng Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 30 ++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index b86fb3fdeef1..d5b6efe8eeb4 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -350,29 +350,31 @@ reg = <0x2>; compatible = "qcom,eeprom"; cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_vdig-supply = <&cam_ldo2>; - /*cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_wide_reset_suspend>;*/ + &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 36 0>; + <&tlmm 49 0>, + <&tlmm 12 0>; gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; + gpio-custom1 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET4"; - cci-master = <0>; + "CAM_RESET2", + "CAM_VDIG"; + cci-master = <1>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; clock-names = "cam_clk"; @@ -388,7 +390,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; //led-flash-src = <&led_flash_wide>; - //eeprom-src = <&eeprom_wide>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; //cam_vdig-supply = <&cam_ldo2>; From ad9c0438c66657d49456781473e8dcfa2c9bd5ec Mon Sep 17 00:00:00 2001 From: Tinno_Zhaozq Date: Mon, 21 Jun 2021 10:33:36 +0800 Subject: [PATCH 033/183] cypfg: compatible s5k3l6 and ov16a1q DVDD in dtsi config cyprus add front compatibility ov16a1q s5k3l6 DVDD voltage range is 0.95~1.15 ov16a1q DVDD voltage range is 1.14~1.26 Change-Id: I69e3ce5567eb422554321d739a71db609ea82070 Reviewed-on: https://gerrit.mot.com/1985432 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Jian Zhang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index d5b6efe8eeb4..00efef04a4f7 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -529,9 +529,9 @@ 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 120000 120000 0>; + rgltr-min-voltage = <1800000 2800000 1150000 0>; + rgltr-max-voltage = <1800000 2800000 1150000 0>; + rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active From 11f69f31a103cbaa7d9b4df5485e04e77b4c8cdc Mon Sep 17 00:00:00 2001 From: Tinno_Niefx Date: Sat, 19 Jun 2021 15:47:15 +0800 Subject: [PATCH 034/183] cypfg: add gc02m1 camera otp driver dtsi add otp driver dtsi for gc02m1 eeprom is mot_cypfg_gc02m1_otp Change-Id: I72cd8a7758ecf52782f78ef808335e1561e99224 Reviewed-on: https://gerrit.mot.com/1984740 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Jian Zhang Reviewed-by: Qiang Guo Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 26 +++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index 00efef04a4f7..212445c247ed 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -557,32 +557,30 @@ cell-index = <3>; reg = <0x3>; compatible = "qcom,eeprom"; - /*cam_vio-supply = <&cam_ldo7>; + cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; - cam_vdig-supply = <&cam_ldo2>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + regulator-names = "cam_vio","cam_vana", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk3_active + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>;*/ - gpios = <&tlmm 32 0>, + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 37 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; @@ -596,7 +594,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; led-flash-src = <&led_flash_macro>; - //eeprom-src = <&eeprom_macro>; + eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; cam_clk-supply = <&gcc_camss_top_gdsc>; From c82883fdc7ca83af6143eae48511fab0588fffac Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Tue, 22 Jun 2021 17:38:12 +0800 Subject: [PATCH 035/183] corfup: modify actuator power supply corfup: modify actuator power supply Change-Id: Ibaa8b901bdc5733a35fe14b66bb81efdaa4353fb Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/1987842 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Shuo Wang Reviewed-by: Wang Liu Reviewed-by: Xingyun Fu Reviewed-by: XiaoFeng Wang Reviewed-by: Zhuoran Xu Reviewed-by: Quanlin Zhu Reviewed-by: Bolei Shang Reviewed-by: Long Cheng Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index faf795037c32..c1717f4b288a 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -278,7 +278,7 @@ actuator_main: qcom,actuator@0 { cell-index = <0>; compatible = "qcom,actuator"; - cam_vaf-supply = <&cam_pmic2_ldo4_avdd2>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; regulator-names = "cam_vaf"; rgltr-cntrl-support; rgltr-min-voltage = <2800000>; From ae79efcdd6acf24bdc3c4bd748f130b1e9dfcfad Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Wed, 23 Jun 2021 17:49:16 +0800 Subject: [PATCH 036/183] corfu5g: resolve CQA rear2 and rear3 torch not work modify macro and ultrawide camera flash config. flash i2c use CCI 0. Change-Id: I64e0b29218de4f08388f35f62218458dcb9ea9da Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/1989420 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Quanlin Zhu Reviewed-by: Wang Liu Reviewed-by: Bolei Shang Reviewed-by: Qiang Guo Reviewed-by: Zhuoran Xu Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 81 +++++++++++----------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index c1717f4b288a..420800f7c7b3 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -272,6 +272,46 @@ pinctrl-0 = <&cam_macro_avdd_en_default>; vin-supply = <&BOB>; }; + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + cci-master = <0>; + status = "ok"; + }; + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + cci-master = <0>; + status = "ok"; + }; + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; }; &cam_cci0 { @@ -288,21 +328,6 @@ status = "ok"; }; - led_flash_rear: qcom,camera-flash@0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - flash-type = <1>; - cci-master = <0>; - status = "ok"; - }; - eeprom_main: qcom,eeprom@0 { cell-index = <0>; reg = <0x0>; @@ -413,19 +438,6 @@ &cam_cci1 { // ROW/PRC: macro OV02B10; JP: depth OV02B1B;5G: macro GC02M1 - led_flash_macro: qcom,camera-flash@2 { - cell-index = <2>; - reg = <0x2>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - cci-master = <0>; - status = "ok"; - }; eeprom_macro: qcom,eeprom@2 { cell-index = <2>; reg = <0x2>; @@ -495,19 +507,6 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - led_flash_wide: qcom,camera-flash@3 { - cell-index = <3>; - reg = <0x3>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - cci-master = <0>; - status = "ok"; - }; eeprom_wide: qcom,eeprom@3 { cell-index = <3>; reg = <0x3>; From 1723263b5ad64c6f01645fffd5c427556644efbd Mon Sep 17 00:00:00 2001 From: Tinno_Zhaozq Date: Thu, 24 Jun 2021 17:23:19 +0800 Subject: [PATCH 037/183] cypfg: cancel compatible modification of dtsi file remove depth sensor related configuration modify the front camera 3l6 dvdd voltage to a typical value s5k3l6 DVDD voltage range is 0.95~1.15 (typical value is 1.05) Change-Id: Icccb5b2362cba0e33c3b78ff23bce585c205ca25 Reviewed-on: https://gerrit.mot.com/1990794 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Shuo Wang Reviewed-by: Zhenxin Xi Reviewed-by: Jian Zhang Reviewed-by: Qiang Guo Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 104 +--------------------- 1 file changed, 2 insertions(+), 102 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index 212445c247ed..55289af6257a 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -159,33 +159,6 @@ }; }; - cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { - mux { - pins = "gpio36"; - function = "gpio"; - }; - - config { - pins = "gpio36"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { - mux { - pins = "gpio36"; - function = "gpio"; - }; - - config { - pins = "gpio36"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { mux { pins = "gpio49"; @@ -424,79 +397,6 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - qcom,cam-sensor4 { - cell-index = <4>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - //eeprom-src = <&eeprom_depth>; - cam_vio-supply = <&cam_ldo7>; - //cam_vana-supply = <&cam_ldo4>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 0>; - rgltr-max-voltage = <1800000 0>; - rgltr-load-current = <120000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 36 0>, - <&tlmm 51 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_RESET4", - "CAM_VANA"; - cci-master = <1>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - eeprom_depth: qcom,eeprom4 { - cell-index = <4>; - reg = <0x4>; - compatible = "qcom,eeprom"; - /*cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>;*/ - gpios = <&tlmm 30 0>, - <&tlmm 49 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; }; &cam_cci1 { @@ -529,8 +429,8 @@ regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1150000 0>; - rgltr-max-voltage = <1800000 2800000 1150000 0>; + 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"; From a5ec1e9431621a8355e981333ff9bb1e420a27a6 Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Mon, 28 Jun 2021 13:02:10 +0800 Subject: [PATCH 038/183] corfup: cannot boot up successfully corfup macro & wide add flash type support Change-Id: I007b464d966398e85a9faf47bee3f906cbbc0e9e Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/1993608 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Ying Xu Reviewed-by: Zhuoran Xu Reviewed-by: Shanghui Zhang Reviewed-by: gaoyx9 Submit-Approved: gaoyx9 Tested-by: gaoyx9 Reviewed-by: Wang Liu Reviewed-by: Ji Zhao Reviewed-by: Bolei Shang Reviewed-by: Guobin Zhang Reviewed-by: Darong Huang --- holi-camera-sensor-mot-corfup-overlay.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 420800f7c7b3..01ad3570c6b6 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -282,6 +282,7 @@ rgltr-min-voltage = <1800000>; rgltr-max-voltage = <1800000>; rgltr-load-current = <100000>; + flash-type = <1>; cci-master = <0>; status = "ok"; }; @@ -295,6 +296,7 @@ rgltr-min-voltage = <1800000>; rgltr-max-voltage = <1800000>; rgltr-load-current = <100000>; + flash-type = <1>; cci-master = <0>; status = "ok"; }; From 62c7755e8ffb3a09b4aff1033678c3fe66967b48 Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Wed, 7 Jul 2021 09:49:26 +0800 Subject: [PATCH 039/183] corfup: dvt1a camera not work corfup: dvt1a pmic use pm6125, ldo supply change Change-Id: Ifa90d300eb92e29f9b1f852e974ca2286bcedf73 Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/2004151 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Bolei Shang Reviewed-by: Qiang Guo Reviewed-by: Ji Zhao Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 01ad3570c6b6..0bd237d216cd 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -270,7 +270,6 @@ gpio = <&tlmm 38 0>; pinctrl-names = "default"; pinctrl-0 = <&cam_macro_avdd_en_default>; - vin-supply = <&BOB>; }; led_flash_rear: qcom,camera-flash@0 { cell-index = <0>; From 4c737fb70eabfc36ce511f4141d2a342b17d8552 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Wed, 7 Jul 2021 11:02:10 +0800 Subject: [PATCH 040/183] arm/dt: cypfg: modify s5k4h7 power [detail] modify gpio custom to DVDD, use regulator-fixed driver. Change-Id: I2cd3593f881861fbc7dac7950aeff487a1504178 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2004293 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Qiang Guo Reviewed-by: XiaoFeng Wang Reviewed-by: Shuo Wang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key Reviewed-by: Long Cheng --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 71 +++++++++++++++-------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index 55289af6257a..56a011b2a517 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -212,6 +212,20 @@ output-low; }; }; + + cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { + mux { + pins = "gpio12"; + function = "gpio"; + }; + + config { + pins = "gpio12"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; }; &soc { @@ -246,6 +260,20 @@ switch-source = <&pm6150l_switch0>; status = "ok"; }; + + cam_wide_dvdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_wide_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 12 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_dvdd_en_default>; + vin-supply = <&S2A>; + }; }; &cam_cci0 { @@ -295,7 +323,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1150000 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"; @@ -324,13 +352,14 @@ compatible = "qcom,eeprom"; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -338,15 +367,12 @@ pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 49 0>, - <&tlmm 12 0>; + <&tlmm 49 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2", - "CAM_VDIG"; + "CAM_RESET2"; cci-master = <1>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; @@ -366,14 +392,14 @@ eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; - //cam_vdig-supply = <&cam_ldo2>; + cam_vdig-supply = <&cam_wide_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -381,15 +407,12 @@ pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 49 0>, - <&tlmm 12 0>; + <&tlmm 49 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2", - "CAM_VDIG"; + "CAM_RESET2"; cci-master = <1>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; From 7033de6eecefea954f5bf63f3af601312a464f8b Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Wed, 7 Jul 2021 10:16:57 +0800 Subject: [PATCH 041/183] arm/dt: cypfq: add camera dts [detail] add camera dts Change-Id: Ibe3d89534f38ea12be10081e452eb3fe2ca6cff4 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2004236 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Qiang Guo Reviewed-by: XiaoFeng Wang Reviewed-by: Shuo Wang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfq-overlay.dtsi | 523 ++++++++++++++++++++++ 1 file changed, 523 insertions(+) create mode 100644 holi-camera-sensor-mot-cypfq-overlay.dtsi diff --git a/holi-camera-sensor-mot-cypfq-overlay.dtsi b/holi-camera-sensor-mot-cypfq-overlay.dtsi new file mode 100644 index 000000000000..25f05b995ba2 --- /dev/null +++ b/holi-camera-sensor-mot-cypfq-overlay.dtsi @@ -0,0 +1,523 @@ +#include +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { + mux { + pins = "gpio12"; + function = "gpio"; + }; + + config { + pins = "gpio12"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + cam_wide_dvdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_wide_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 12 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_dvdd_en_default>; + vin-supply = <&S6A>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vaf-supply = <&cam_ldo5>; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <0>; + status = "ok"; + }; + + 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>; + actuator-src = <&actuator_main>; + //led-flash-src = <&led_flash_main>; + eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_front: qcom,eeprom1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_macro: qcom,eeprom3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 57b548f9d4b90cf1bb54d91c4c1e6a24d6bf4652 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Thu, 8 Jul 2021 16:27:04 +0800 Subject: [PATCH 042/183] arm/dt: cypfg: UW sensor add pmic flash [detail] UW sensor add pmic flash Change-Id: Id7495c1ad36937107f3604ddb109877b572cdcdf Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2006687 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Qiang Guo Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index 56a011b2a517..fb79dbf6baac 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -388,7 +388,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_wide>; + led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; From 75e4825818410a1bcbd43b4493ed1f5f18f7ec76 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Tue, 6 Jul 2021 14:09:05 +0800 Subject: [PATCH 043/183] arm/dt: cypfg/cypfq: modify camera dts - add mot,actuator device - add multi-user-support property - add af power in sensor node Change-Id: Ie3dfcc378412ec2b494a8490b6cd31ae998ee04c Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2003220 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: XiaoFeng Wang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfg-overlay.dtsi | 15 +++++++++++---- holi-camera-sensor-mot-cypfq-overlay.dtsi | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/holi-camera-sensor-mot-cypfg-overlay.dtsi b/holi-camera-sensor-mot-cypfg-overlay.dtsi index fb79dbf6baac..3dc0800a7769 100644 --- a/holi-camera-sensor-mot-cypfg-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfg-overlay.dtsi @@ -234,6 +234,11 @@ status = "ok"; }; + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + led_flash_main: qcom,camera-flash@0 { cell-index = <0>; compatible = "qcom,camera-flash"; @@ -288,6 +293,7 @@ rgltr-max-voltage = <2800000>; rgltr-load-current = <100000>; status = "ok"; + multi-user-support; }; eeprom_main: qcom,eeprom0 { @@ -319,12 +325,13 @@ cam_vana-supply = <&cam_ldo4>; cam_vdig-supply = <&cam_ldo2>; cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_ldo5>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_clk", "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active diff --git a/holi-camera-sensor-mot-cypfq-overlay.dtsi b/holi-camera-sensor-mot-cypfq-overlay.dtsi index 25f05b995ba2..7f8ad3009d16 100644 --- a/holi-camera-sensor-mot-cypfq-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfq-overlay.dtsi @@ -235,6 +235,11 @@ status = "ok"; }; + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + cam_wide_dvdd: gpio-regulator@0{ compatible = "regulator-fixed"; reg = <0x00 0x00>; @@ -262,6 +267,7 @@ rgltr-max-voltage = <2800000>; rgltr-load-current = <100000>; status = "ok"; + multi-user-support; }; eeprom_main: qcom,eeprom0 { @@ -293,12 +299,13 @@ cam_vana-supply = <&cam_ldo4>; cam_vdig-supply = <&cam_ldo2>; cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_ldo5>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_clk", "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active From 1453cfd6737cfe4d6332216ee5ebf2de466fac13 Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Fri, 16 Jul 2021 15:26:12 +0800 Subject: [PATCH 044/183] corfur: 6375 hw camera not work corfur 6375 hw camera not work Change-Id: If4bae7d0e3c1f89ec20bed2e915f99e37b7ac1fb Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/2014930 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: XiaoFeng Wang Reviewed-by: Bolei Shang Reviewed-by: Ji Zhao Reviewed-by: Shuo Wang Reviewed-by: Zhuoran Xu Reviewed-by: Jichao Zou Submit-Approved: Jira Key --- blair-camera-sensor-mot-corfup-overlay.dtsi | 584 ++++++++++++++++++++ 1 file changed, 584 insertions(+) create mode 100644 blair-camera-sensor-mot-corfup-overlay.dtsi diff --git a/blair-camera-sensor-mot-corfup-overlay.dtsi b/blair-camera-sensor-mot-corfup-overlay.dtsi new file mode 100644 index 000000000000..3fc76ea8ea36 --- /dev/null +++ b/blair-camera-sensor-mot-corfup-overlay.dtsi @@ -0,0 +1,584 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_depth_reset_active: cam_sensor_macro_depth_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_depth_reset_suspend: cam_sensor_macro_depth_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_macro_avdd_en_default: cam_macro_avdd_en_default { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + cam_macro_avdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_macro_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_macro_avdd_en_default>; + }; + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo6_vddois>; + cam_vdig-supply = <&cam_pmic2_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + // front camera + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; + cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1100000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + // ROW/PRC: macro OV02B10; JP: depth OV02B1B;5G: macro GC02M1 + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + sensor_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 25b1dd4d3a52eaba7b0c5d0f4761064558707cf0 Mon Sep 17 00:00:00 2001 From: Tinno_Zhaozq Date: Wed, 14 Jul 2021 10:48:47 +0800 Subject: [PATCH 045/183] cypfq: add aw36514 i2c flash add i2c flash current control compatible evt flash(pmic) Change-Id: Ib64fda22c5744e4854dda72b281c411234294925 Reviewed-on: https://gerrit.mot.com/2011754 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: XiaoFeng Wang Reviewed-by: Xingyun Fu Reviewed-by: Zhenxin Xi Reviewed-by: Zhuoran Xu Submit-Approved: Jira Key --- holi-camera-sensor-mot-cypfq-overlay.dtsi | 51 +++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/holi-camera-sensor-mot-cypfq-overlay.dtsi b/holi-camera-sensor-mot-cypfq-overlay.dtsi index 7f8ad3009d16..e23140a2a46a 100644 --- a/holi-camera-sensor-mot-cypfq-overlay.dtsi +++ b/holi-camera-sensor-mot-cypfq-overlay.dtsi @@ -270,6 +270,51 @@ multi-user-support; }; + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + eeprom_main: qcom,eeprom0 { cell-index = <0>; reg = <0x0>; @@ -293,7 +338,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_main>; - //led-flash-src = <&led_flash_main>; + led-flash-src = <&led_flash_rear>; eeprom-src = <&eeprom_main>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo4>; @@ -369,7 +414,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_wide>; + led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; @@ -497,7 +542,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_macro>; + led-flash-src = <&led_flash_macro>; eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_ldo7>; cam_vana-supply = <&cam_ldo6>; From d0546a4dfce3f05118a92f93458625b50d628344 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Thu, 12 Aug 2021 14:01:46 +0800 Subject: [PATCH 046/183] cypfr: add camera dts [detail] add camera dts for cypfr Change-Id: I48c380316acf9b84357de8fde783798293592f03 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2039731 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Bolei Shang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-cypfr-overlay.dtsi | 575 +++++++++++++++++++++ 1 file changed, 575 insertions(+) create mode 100644 blair-camera-sensor-mot-cypfr-overlay.dtsi diff --git a/blair-camera-sensor-mot-cypfr-overlay.dtsi b/blair-camera-sensor-mot-cypfr-overlay.dtsi new file mode 100644 index 000000000000..c9ef1bc3880e --- /dev/null +++ b/blair-camera-sensor-mot-cypfr-overlay.dtsi @@ -0,0 +1,575 @@ +#include +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { + mux { + pins = "gpio134"; + function = "gpio"; + }; + + config { + pins = "gpio134"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + + cam_wide_dvdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_wide_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 134 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_dvdd_en_default>; + vin-supply = <&S6A>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + multi-user-support; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vaf-supply = <&cam_ldo5>; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <0>; + status = "ok"; + }; + + 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>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_front: qcom,eeprom1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_macro: qcom,eeprom3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 82bc8bff5f2439de86bfdfeb2bcef61209aa400e Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Tue, 17 Aug 2021 14:07:51 +0800 Subject: [PATCH 047/183] corfu5g: modify camera dts - add mot,actuator device - add multi-user-support property - add af power in sensor node Change-Id: Id62ccf813b80d174957fc78ff86d10da9693a1f0 Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2043410 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Bolei Shang Reviewed-by: Wang Liu Reviewed-by: Ji Zhao Reviewed-by: Xingyun Fu Reviewed-by: Zhuoran Xu Reviewed-by: Shuo Wang Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-corfup-overlay.dtsi | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/blair-camera-sensor-mot-corfup-overlay.dtsi b/blair-camera-sensor-mot-corfup-overlay.dtsi index 3fc76ea8ea36..0457ee88cd83 100644 --- a/blair-camera-sensor-mot-corfup-overlay.dtsi +++ b/blair-camera-sensor-mot-corfup-overlay.dtsi @@ -259,6 +259,10 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; cam_macro_avdd: gpio-regulator@0{ compatible = "regulator-fixed"; reg = <0x00 0x00>; @@ -327,6 +331,7 @@ rgltr-load-current = <100000>; cci-master = <1>; status = "ok"; + multi-user-support; }; eeprom_main: qcom,eeprom@0 { @@ -357,12 +362,13 @@ cam_vana-supply = <&cam_pmic1_ldo6_vddois>; cam_vdig-supply = <&cam_pmic2_ldo2_dvdd2>; cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_clk", "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active From 605b36967a8ccce2be396d69fcbdcf0358c01e06 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Mon, 2 Aug 2021 15:01:10 +0800 Subject: [PATCH 048/183] corfu5g: modify camera dts - add mot,actuator device - add multi-user-support property - add af power in sensor node Change-Id: Ieee7e084ffa9ba7f04775902c3614f2c17833560 Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2030377 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Xingyun Fu Reviewed-by: Bolei Shang Reviewed-by: Ji Zhao Reviewed-by: Shuo Wang Reviewed-by: Zhuoran Xu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-corfup-overlay.dtsi | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/holi-camera-sensor-mot-corfup-overlay.dtsi b/holi-camera-sensor-mot-corfup-overlay.dtsi index 0bd237d216cd..1ba8de072a8b 100644 --- a/holi-camera-sensor-mot-corfup-overlay.dtsi +++ b/holi-camera-sensor-mot-corfup-overlay.dtsi @@ -259,6 +259,10 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; cam_macro_avdd: gpio-regulator@0{ compatible = "regulator-fixed"; reg = <0x00 0x00>; @@ -327,6 +331,7 @@ rgltr-load-current = <100000>; cci-master = <1>; status = "ok"; + multi-user-support; }; eeprom_main: qcom,eeprom@0 { @@ -357,12 +362,13 @@ cam_vana-supply = <&cam_pmic1_ldo6_vddois>; cam_vdig-supply = <&cam_pmic2_ldo2_dvdd2>; cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_clk, cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active From a15667c35bd2659a5714c429e8e408422365eaef Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Tue, 24 Aug 2021 18:39:58 +0800 Subject: [PATCH 049/183] milanf: milan 5G camera bringup milanf 5G Configuring camera dtsi file Change-Id: If6d78a498eba817f69c22973445b6cecc547e329 Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/2049724 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Bolei Shang Reviewed-by: Wang Liu Reviewed-by: Shuo Wang Reviewed-by: XiaoFeng Wang Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 561 ++++++++++++++++++++ 1 file changed, 561 insertions(+) create mode 100644 blair-camera-sensor-mot-milanf-overlay.dtsi diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi new file mode 100644 index 000000000000..9b0d4e840aae --- /dev/null +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -0,0 +1,561 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <120000 100000>; + cci-master = <1>; + status = "ok"; + }; + + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <120000 100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; + //ois-src = <&ois_main>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; + cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1100000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1100000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + +}; + +&cam_cci1 { + eeprom_depth: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + sensor_depth: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_depth>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 33 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + actuator_wide: qcom,actuator@1 { + cell-index = <1>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <120000 100000>; + cci-master = <0>; + status = "ok"; + }; + + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + actuator-src = <&actuator_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 33 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From c7be257219e0bb8d48ca42c4f77d868da43dbe3a Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Thu, 26 Aug 2021 15:03:16 +0800 Subject: [PATCH 050/183] milanf: dw9781c ois bringup milan 5G set ois power config Change-Id: I9acecae10d103aa1425ffb89f47f0e301e9d3e93 Signed-off-by: Qiang Guo Reviewed-on: https://gerrit.mot.com/2051673 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Shuo Wang Reviewed-by: Wang Liu Reviewed-by: Xingyun Fu Reviewed-by: XiaoFeng Wang Reviewed-by: Long Cheng Reviewed-by: Bolei Shang Reviewed-by: Zhuoran Xu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index 9b0d4e840aae..227f01dc86cd 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -263,11 +263,12 @@ compatible = "qcom,actuator"; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; - regulator-names = "cam_vio", "cam_vaf"; + cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000>; - rgltr-max-voltage = <1800000 2800000>; - rgltr-load-current = <120000 100000>; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; cci-master = <1>; status = "ok"; }; @@ -277,11 +278,12 @@ compatible = "qcom,ois"; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; - regulator-names = "cam_vio", "cam_vaf"; + cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000>; - rgltr-max-voltage = <1800000 2800000>; - rgltr-load-current = <120000 100000>; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; cci-master = <1>; status = "ok"; }; @@ -310,7 +312,7 @@ actuator-src = <&actuator_main>; led-flash-src = <&led_flash_rear>; eeprom-src = <&eeprom_main>; - //ois-src = <&ois_main>; + ois-src = <&ois_main>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; From 285f60f93b6c993a6d93353ada7d8231a6f02022 Mon Sep 17 00:00:00 2001 From: Qiang Guo Date: Thu, 26 Aug 2021 15:03:16 +0800 Subject: [PATCH 051/183] add rhodp dtsi file copy dtsi file from milanf Change-Id: Ic9c7a606e48e8ba046b574696769729c870f4a3b Reviewed-on: https://gerrit.mot.com/2094357 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: gaoyx9 Submit-Approved: gaoyx9 Tested-by: gaoyx9 Reviewed-by: Zhenxin Xi --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 563 ++++++++++++++++++++ 1 file changed, 563 insertions(+) create mode 100644 blair-camera-sensor-mot-rhodep-overlay.dtsi diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi new file mode 100644 index 000000000000..227f01dc86cd --- /dev/null +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -0,0 +1,563 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; + ois-src = <&ois_main>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; + cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1100000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1100000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + +}; + +&cam_cci1 { + eeprom_depth: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + sensor_depth: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_depth>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 33 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + actuator_wide: qcom,actuator@1 { + cell-index = <1>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <120000 100000>; + cci-master = <0>; + status = "ok"; + }; + + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + actuator-src = <&actuator_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 33 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 52402b0201f731f75e1d280c1e3f1483dcd9e6a8 Mon Sep 17 00:00:00 2001 From: panyq6 Date: Wed, 27 Oct 2021 11:32:38 +0800 Subject: [PATCH 052/183] rhodec bringup : add rhodec dtsi file copy dtsi file from cypfq Change-Id: I6027c1fd9467eb921634f32bef03ee5234a3f795 Reviewed-on: https://gerrit.mot.com/2101533 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Zhuoran Xu Tested-by: Jira Key Reviewed-by: Zhenxin Xi Submit-Approved: panyq6 --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 575 +++++++++++++++++++++ 1 file changed, 575 insertions(+) create mode 100644 holi-camera-sensor-mot-rhodec-overlay.dtsi diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi new file mode 100644 index 000000000000..e23140a2a46a --- /dev/null +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -0,0 +1,575 @@ +#include +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { + mux { + pins = "gpio12"; + function = "gpio"; + }; + + config { + pins = "gpio12"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + + cam_wide_dvdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_wide_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 12 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_dvdd_en_default>; + vin-supply = <&S6A>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + multi-user-support; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vaf-supply = <&cam_ldo5>; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <0>; + status = "ok"; + }; + + 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>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_front: qcom,eeprom1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_macro: qcom,eeprom3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 7649ddacf52566ac66e8ddd219b09a1e0de004aa Mon Sep 17 00:00:00 2001 From: panyq6 Date: Thu, 28 Oct 2021 10:43:49 +0800 Subject: [PATCH 053/183] add rhodp dtsi file copy dtsi file from cyprf Change-Id: I6f51b17c1ae7df14211b86e19c340440e9da93ed Reviewed-on: https://gerrit.mot.com/2101644 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhuoran Xu Reviewed-by: Zhenxin Xi Submit-Approved: panyq6 --- blair-camera-sensor-mot-rhodec-overlay.dtsi | 575 ++++++++++++++++++++ 1 file changed, 575 insertions(+) create mode 100644 blair-camera-sensor-mot-rhodec-overlay.dtsi diff --git a/blair-camera-sensor-mot-rhodec-overlay.dtsi b/blair-camera-sensor-mot-rhodec-overlay.dtsi new file mode 100644 index 000000000000..c9ef1bc3880e --- /dev/null +++ b/blair-camera-sensor-mot-rhodec-overlay.dtsi @@ -0,0 +1,575 @@ +#include +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { + mux { + pins = "gpio134"; + function = "gpio"; + }; + + config { + pins = "gpio134"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + + cam_wide_dvdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_wide_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 134 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_dvdd_en_default>; + vin-supply = <&S6A>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + multi-user-support; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vaf-supply = <&cam_ldo5>; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vaf", "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; + cci-master = <0>; + status = "ok"; + }; + + 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>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo4>; + cam_vdig-supply = <&cam_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_ldo5>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 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 = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_front: qcom,eeprom1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo3>; + cam_vdig-supply = <&cam_ldo1>; + cam_clk-supply = <&gcc_camss_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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_macro: qcom,eeprom3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_ldo7>; + cam_vana-supply = <&cam_ldo6>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET3"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From f34f246d5f3a3400baca485ebac4d61df59b4c0c Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Thu, 18 Nov 2021 12:30:52 +0800 Subject: [PATCH 054/183] arm64/dts: rhodep: Add devicetree for main sensor s5kjn1 details: Add sensor baseline Bringup main sensor Change-Id: I9b366c42df8913f0a1d8655f41869738a11f4404 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2119887 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Long Cheng Reviewed-by: XiaoFeng Wang Reviewed-by: Xingyun Fu Reviewed-by: Reviewed-by: Tested-by: Jira Key Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 485 +------------------- 1 file changed, 15 insertions(+), 470 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 227f01dc86cd..31f3a3d3b0f8 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -1,32 +1,6 @@ #include &tlmm { - cam_sensor_mclk0_active: cam_sensor_mclk0_active { - mux { - pins = "gpio29"; - function = "cam_mclk"; - }; - - config { - pins = "gpio29"; - bias-disable; /* No PULL */ - drive-strength = <4>; /* 2 MA */ - }; - }; - - cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { - mux { - pins = "gpio29"; - function = "cam_mclk"; - }; - - config { - pins = "gpio29"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; /* 2 MA */ - }; - }; - cam_sensor_mclk1_active: cam_sensor_mclk1_active { mux { pins = "gpio30"; @@ -53,57 +27,6 @@ }; }; - cam_sensor_mclk2_active: cam_sensor_mclk2_active { - mux { - pins = "gpio31"; - function = "cam_mclk"; - }; - - config { - pins = "gpio31"; - bias-disable; /* No PULL */ - drive-strength = <4>; - }; - }; - - cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { - mux { - pins = "gpio31"; - function = "cam_mclk"; - }; - - config { - pins = "gpio31"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; - }; - }; - - cam_sensor_mclk3_active: cam_sensor_mclk3_active { - mux { - pins = "gpio32"; - function = "cam_mclk"; - }; - - config { - pins = "gpio32"; - bias-disable; /* No PULL */ - drive-strength = <4>; /* 2 MA */ - }; - }; - - cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { - mux { - pins = "gpio32"; - function = "cam_mclk"; - }; - - config { - pins = "gpio32"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; /* 2 MA */ - }; - }; cam_sensor_main_reset_active: cam_sensor_main_reset_active { mux { @@ -131,88 +54,6 @@ output-low; }; }; - - cam_sensor_front_reset_active: cam_sensor_front_reset_active { - mux { - pins = "gpio34"; - function = "gpio"; - }; - - config { - pins = "gpio34"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { - mux { - pins = "gpio34"; - function = "gpio"; - }; - - config { - pins = "gpio34"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - - cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { - mux { - pins = "gpio37"; - function = "gpio"; - }; - - config { - pins = "gpio37"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { - mux { - pins = "gpio37"; - function = "gpio"; - }; - - config { - pins = "gpio37"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - - cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { - mux { - pins = "gpio36"; - function = "gpio"; - }; - - config { - pins = "gpio36"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { - mux { - pins = "gpio36"; - function = "gpio"; - }; - - config { - pins = "gpio36"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - }; &soc { @@ -220,88 +61,9 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; - - mot,cam-actuator { - compatible = "mot,actuator"; - status = "ok"; - }; - - led_flash_rear: qcom,camera-flash@0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - flash-type = <1>; - cci-master = <0>; - status = "ok"; - }; - - led_flash_wide: qcom,camera-flash@3 { - cell-index = <3>; - reg = <0x3>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - flash-type = <1>; - cci-master = <0>; - status = "ok"; - }; }; &cam_cci0 { - actuator_main: qcom,actuator@0 { - cell-index = <0>; - compatible = "qcom,actuator"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; - cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; - regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1800000 2800000 2800000>; - rgltr-load-current = <120000 100000 100000>; - cci-master = <1>; - status = "ok"; - }; - - ois_main: qcom,ois@0 { - cell-index = <0>; - compatible = "qcom,ois"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; - cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; - regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1800000 2800000 2800000>; - rgltr-load-current = <120000 100000 100000>; - cci-master = <1>; - status = "ok"; - }; - - eeprom_main: qcom,eeprom@0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; - cci-master = <1>; - status = "ok"; - }; - sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -309,255 +71,38 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - actuator-src = <&actuator_main>; - led-flash-src = <&led_flash_rear>; - eeprom-src = <&eeprom_main>; - ois-src = <&ois_main>; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; - cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo4>; + cam_vdig-supply = <&cam_pmic_ldo1>; cam_clk-supply = <&gcc_camss_top_gdsc>; - cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; + "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1100000 0 2800000>; - rgltr-max-voltage = <1800000 2800000 1100000 0 2800000>; - rgltr-load-current = <120000 80000 1200000 0 100000>; + 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 + pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_main_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_main_reset_suspend>; - gpios = <&tlmm 29 0>, + gpios = <&tlmm 30 0>, <&tlmm 35 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK0", + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RM_RST"; cci-master = <1>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - eeprom_front: qcom,eeprom@1 { - cell-index = <1>; - reg = <0x1>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; - cci-master = <0>; - status = "ok"; - }; - - sensor_front: qcom,cam-sensor@1 { - cell-index = <1>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <3>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <0>; - eeprom-src = <&eeprom_front>; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; - cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 34 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_FW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - -}; - -&cam_cci1 { - eeprom_depth: qcom,eeprom@2 { - cell-index = <2>; - reg = <0x2>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RD_RST"; - cci-master = <0>; - status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - sensor_depth: qcom,cam-sensor@2 { - cell-index = <2>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - eeprom-src = <&eeprom_depth>; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_depth_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_depth_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RD_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - eeprom_wide: qcom,eeprom@3 { - cell-index = <3>; - reg = <0x3>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; - cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 33 0>, - <&tlmm 36 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - actuator_wide: qcom,actuator@1 { - cell-index = <1>; - compatible = "qcom,actuator"; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; - regulator-names = "cam_vio", "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000>; - rgltr-max-voltage = <1800000 2800000>; - rgltr-load-current = <120000 100000>; - cci-master = <0>; - status = "ok"; - }; - - sensor_wide: qcom,cam-sensor@3 { - cell-index = <3>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_wide>; - actuator-src = <&actuator_wide>; - eeprom-src = <&eeprom_wide>; - cam_vio-supply = <&cam_pmic1_ldo7_vddio>; - cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; - cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 33 0>, - <&tlmm 36 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; +}; + +&cam_cci1 { + }; From 9f52a417e9dda70e822702d483acc23fa2c06c68 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Wed, 24 Nov 2021 15:25:34 +0800 Subject: [PATCH 055/183] arm64/dts: rhodep: add UW sensor s5k4h7 details: add UW sensor s5k4h7 dtsi config MCLK drive-strength set to be 2, it can increase when HW feedback bad waveform. Change-Id: Ib6c29ba4bb06a8f68c13e42182978d0e2e68b43b Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2125943 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Xingyun Fu Reviewed-by: Shuo Wang Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 95 ++++++++++++++++++++- 1 file changed, 92 insertions(+), 3 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 31f3a3d3b0f8..ff1ae54fa3b6 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -10,7 +10,7 @@ config { pins = "gpio30"; bias-disable; /* No PULL */ - drive-strength = <4>; + drive-strength = <2>; }; }; @@ -23,10 +23,35 @@ config { pins = "gpio30"; bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; + drive-strength = <2>; }; }; + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; cam_sensor_main_reset_active: cam_sensor_main_reset_active { mux { @@ -54,6 +79,34 @@ output-low; }; }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + }; &soc { @@ -104,5 +157,41 @@ }; &cam_cci1 { - + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; From 77a2dde5039eca587e919190ada537411fc27f85 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Thu, 25 Nov 2021 15:22:54 +0800 Subject: [PATCH 056/183] arm64/dts: rhodep: add s5k4h7 eeprom details: add s5k4h7 eeprom dtsi config. Change-Id: Ifd6e958b067be9d58368ef5c579c6b899d21fa9f Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2127329 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Shuo Wang Reviewed-by: Zhichao Chen Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index ff1ae54fa3b6..f043eb58a878 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -157,6 +157,39 @@ }; &cam_cci1 { + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; sensor_wide: qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -164,6 +197,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo5>; cam_vdig-supply = <&cam_pmic_ldo2>; From 9d3b0afc2a7db9e3e08f777126ba0d706c963085 Mon Sep 17 00:00:00 2001 From: hansx3 Date: Fri, 26 Nov 2021 16:01:16 +0800 Subject: [PATCH 057/183] arm64/dts: rhodep: add Macro sensor gc02m1 details: add Macro sensor gc02m1 dtsi config Change-Id: I36d365a21d142e94df69df80b7dad58be03028d6 Signed-off-by: hansx3 Reviewed-on: https://gerrit.mot.com/2128637 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 89 +++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index f043eb58a878..4224e949e61c 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -53,6 +53,32 @@ }; }; + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + cam_sensor_main_reset_active: cam_sensor_main_reset_active { mux { pins = "gpio35"; @@ -107,6 +133,32 @@ }; }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; }; &soc { @@ -228,4 +280,41 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + sensor_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + }; From 575bd3b3f87536a7fcc406f47e68d4a935be87e7 Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Fri, 26 Nov 2021 19:29:41 +0800 Subject: [PATCH 058/183] arm64/dts: rhodep: AF dw9781c bringup for s5kjn1 details: Add actuator dw9781c for main sensor Change-Id: Ie2ada4cf3a83c18ed08ff3e0a10661b8b012ddcd Reviewed-on: https://gerrit.mot.com/2128839 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Reviewed-by: XiaoFeng Wang Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 44 +++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 4224e949e61c..0960f67ecae9 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -159,6 +159,18 @@ output-low; }; }; + cam_ois_ldo_en_default: cam_ois_ldo_en_default { + mux { + pins = "gpio86"; + function = "gpio"; + }; + config { + pins = "gpio86"; + bias-pull-up; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; }; &soc { @@ -166,9 +178,40 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + cam_ois_ldo: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_ois_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 86 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_ldo_en_default>; + }; }; &cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -176,6 +219,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; cam_vdig-supply = <&cam_pmic_ldo1>; From 1f57bc4890d2f0f285830089a20f5e6cefc0ab79 Mon Sep 17 00:00:00 2001 From: weilt2 Date: Thu, 25 Nov 2021 11:07:13 +0800 Subject: [PATCH 059/183] arm64/dts: rhodep: Add devicetree and dvdd config for front sensor ov16a1q details: Bringup Front sensor add front sensor dvdd voltage config Change-Id: Ifb29ec8e315e5d06dec3a2a0eb88c5384956cfa7 Signed-off-by: weilt2 Reviewed-on: https://gerrit.mot.com/2127083 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Zhichao Chen Reviewed-by: Long Cheng Reviewed-by: Xingyun Fu Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 97 +++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 0960f67ecae9..019c3b94f23b 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -1,6 +1,32 @@ #include &tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + cam_sensor_mclk1_active: cam_sensor_mclk1_active { mux { pins = "gpio30"; @@ -106,6 +132,33 @@ }; }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { mux { pins = "gpio36"; @@ -173,6 +226,13 @@ }; }; +&L21A{ + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + qcom,init-voltage = <1200000>; + status = "okay"; +}; + &soc { qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; @@ -250,6 +310,43 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo6>; + cam_vdig-supply = <&L21A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; &cam_cci1 { From c95d7e102ed8bc2a5afec59e34e6d02e7a31310f Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Fri, 26 Nov 2021 19:54:33 +0800 Subject: [PATCH 060/183] arm64/dts: rhodep: OIS dw9781c bringup for s5kjn1 details: add ois dw9781c Change-Id: I43f7ba952644403002d4fbb8a1e08ac0bc129203 Reviewed-on: https://gerrit.mot.com/2128852 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: XiaoFeng Wang Reviewed-by: Zhichao Chen Tested-by: Jira Key Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 019c3b94f23b..c3b70ed77bb0 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -272,6 +272,21 @@ status = "ok"; }; + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -280,6 +295,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_main>; + ois-src = <&ois_main>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; cam_vdig-supply = <&cam_pmic_ldo1>; From c08459de36d667a2018ff94911e0e237e7062591 Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Fri, 26 Nov 2021 20:36:20 +0800 Subject: [PATCH 061/183] rhodep: eeprom bringup for s5kjn1 details: add eeprom driver for s5kjn1 Change-Id: Ib206729a6329d26c5978808f94cdbf58c9983c73 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2128879 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Zhichao Chen Reviewed-by: Guobin Zhang Tested-by: Jira Key Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index c3b70ed77bb0..b39d7db4d26a 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -287,6 +287,20 @@ status = "ok"; }; + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -295,6 +309,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_main>; + eeprom-src = <&eeprom_main>; ois-src = <&ois_main>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; From 71d98c3dcbf099c70ce9a058100af26b7212a79b Mon Sep 17 00:00:00 2001 From: weilt2 Date: Fri, 26 Nov 2021 13:03:13 +0800 Subject: [PATCH 062/183] arm64/dts rhodep: Add devicetree for front camera ov16a1q eeprom(2/2) details: Add front camera ov16a1q eeprom driver Change-Id: I8d90db67d945eef8210cc336a0eec8c340398838 Reviewed-on: https://gerrit.mot.com/2128396 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Reviewed-by: Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index b39d7db4d26a..e32a8dfdc64c 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -301,6 +301,20 @@ status = "ok"; }; + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <3000>; + cci-master = <0>; + status = "ok"; + }; + sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -348,6 +362,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo6>; cam_vdig-supply = <&L21A>; From b7503368e642d3abbb14c7bea107e56b2b343260 Mon Sep 17 00:00:00 2001 From: hansx3 Date: Fri, 26 Nov 2021 19:30:46 +0800 Subject: [PATCH 063/183] rhodep: add gc02m1 otp details: add gc02m1 otp dtsi config. Change-Id: I40abcf2d981199126ef3d2d2a193fae3cc07e934 Signed-off-by: hansx3 Reviewed-on: https://gerrit.mot.com/2128838 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 107 +++++++++++++------- 1 file changed, 71 insertions(+), 36 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index e32a8dfdc64c..95113d95457d 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -396,6 +396,76 @@ }; &cam_cci1 { + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + sensor_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + eeprom_wide: qcom,eeprom@3 { cell-index = <3>; compatible = "qcom,eeprom"; @@ -467,41 +537,6 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - sensor_macro: qcom,cam-sensor@2 { - cell-index = <2>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk3_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; + }; From 3171e3a5b3db8ac23911df5c84a1ca60fc11d81b Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Wed, 1 Dec 2021 14:13:38 +0800 Subject: [PATCH 064/183] arm64/dts: rhodec: add UW sensor s5k4h7 details: add UW sensor s5k4h7 dtsi config Change-Id: Iaceafc000779f24b66b6fa3bc57bf62105d9a68f Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2131721 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xingyun Fu Reviewed-by: Shuo Wang Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 344 +++------------------ 1 file changed, 46 insertions(+), 298 deletions(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index e23140a2a46a..daa1bb80a20d 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -162,12 +162,12 @@ cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { mux { - pins = "gpio49"; + pins = "gpio36"; function = "gpio"; }; config { - pins = "gpio49"; + pins = "gpio36"; bias-disable; /* No PULL */ drive-strength = <2>; /* 2 MA */ }; @@ -175,12 +175,12 @@ cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { mux { - pins = "gpio49"; + pins = "gpio36"; function = "gpio"; }; config { - pins = "gpio49"; + pins = "gpio36"; bias-pull-down; /* PULL DOWN */ drive-strength = <2>; /* 2 MA */ output-low; @@ -216,15 +216,29 @@ cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { mux { - pins = "gpio12"; + pins = "gpio46"; function = "gpio"; }; config { - pins = "gpio12"; - bias-disable; /* NO PULL */ + pins = "gpio46"; + bias-pull-up; /* PULL UP */ drive-strength = <2>; /* 2 MA */ - output-low; + output-high; + }; + }; + + cam_wide_avdd_en_default: cam_wide_avdd_en_default { + mux { + pins = "gpio45"; + function = "gpio"; + }; + + config { + pins = "gpio45"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; }; }; }; @@ -235,11 +249,6 @@ status = "ok"; }; - mot,cam-actuator { - compatible = "mot,actuator"; - status = "ok"; - }; - cam_wide_dvdd: gpio-regulator@0{ compatible = "regulator-fixed"; reg = <0x00 0x00>; @@ -248,136 +257,41 @@ regulator-max-microvolt = <1200000>; regulator-enable-ramp-delay = <233>; enable-active-high; - gpio = <&tlmm 12 0>; + gpio = <&tlmm 46 0>; pinctrl-names = "default"; pinctrl-0 = <&cam_wide_dvdd_en_default>; vin-supply = <&S6A>; }; + + cam_wide_avdd: gpio-regulator@1{ + compatible = "regulator-fixed"; + reg = <0x01 0x01>; + regulator-name = "cam_wide_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 45 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_avdd_en_default>; + /*vin-supply = <&BOB>;*/ + }; }; &cam_cci0 { - actuator_main: qcom,actuator0 { - cell-index = <0>; - compatible = "qcom,actuator"; - cci-master = <0>; - cam_vaf-supply = <&cam_ldo5>; - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - status = "ok"; - multi-user-support; - }; - led_flash_rear: qcom,camera-flash@0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_ldo7>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - flash-type = <1>; - cci-master = <1>; - status = "ok"; - }; +}; - led_flash_macro: qcom,camera-flash@2 { - cell-index = <2>; - reg = <0x2>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_ldo7>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - flash-type = <1>; - cci-master = <1>; - status = "ok"; - }; - - led_flash_wide: qcom,camera-flash@3 { +&cam_cci1 { + qcom,cam-sensor3 { cell-index = <3>; - reg = <0x3>; - compatible = "qcom,camera-flash"; - cam_vio-supply = <&cam_ldo7>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - flash-type = <1>; - cci-master = <1>; - status = "ok"; - }; - - eeprom_main: qcom,eeprom0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,eeprom"; - cam_vaf-supply = <&cam_ldo5>; - cam_vio-supply = <&cam_ldo7>; - regulator-names = "cam_vaf", "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000 1800000>; - rgltr-max-voltage = <2800000 1800000>; - rgltr-load-current = <100000 120000>; - cci-master = <0>; - status = "ok"; - }; - - 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>; - actuator-src = <&actuator_main>; - led-flash-src = <&led_flash_rear>; - eeprom-src = <&eeprom_main>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo4>; - cam_vdig-supply = <&cam_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - cam_vaf-supply = <&cam_ldo5>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; - rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; - rgltr-load-current = <120000 80000 1200000 0 100000>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active - &cam_sensor_main_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_main_reset_suspend>; - gpios = <&tlmm 29 0>, - <&tlmm 35 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 = <&gcc GCC_CAMSS_MCLK0_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - eeprom_wide: qcom,eeprom2 { - cell-index = <2>; - reg = <0x2>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo6>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_wide_avdd>; cam_vdig-supply = <&cam_wide_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", @@ -388,112 +302,17 @@ 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 49 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2"; - cci-master = <1>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - qcom,cam-sensor2 { - cell-index = <2>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_wide>; - eeprom-src = <&eeprom_wide>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo6>; - cam_vdig-supply = <&cam_wide_dvdd>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 49 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2"; - cci-master = <1>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; -}; - -&cam_cci1 { - eeprom_front: qcom,eeprom1 { - cell-index = <1>; - reg = <0x1>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; - cci-master = <0>; - status = "ok"; - }; - - qcom,cam-sensor1 { - cell-index = <1>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <3>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <0>; - eeprom-src = <&eeprom_front>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo3>; - cam_vdig-supply = <&cam_ldo1>; - cam_clk-supply = <&gcc_camss_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_front_reset_active>; + &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_front_reset_suspend>; + &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 32 0>, - <&tlmm 34 0>; + <&tlmm 36 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RESET1"; + "CAM_RESET3"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; @@ -501,75 +320,4 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - eeprom_macro: qcom,eeprom3 { - cell-index = <3>; - reg = <0x3>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo6>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio","cam_vana", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 120000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET3"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - qcom,cam-sensor3 { - cell-index = <3>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_macro>; - eeprom-src = <&eeprom_macro>; - cam_vio-supply = <&cam_ldo7>; - cam_vana-supply = <&cam_ldo6>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio","cam_vana", "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 120000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET3"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; }; From 20c752ad293e98126c5851d3f1b7fbc1669b89cd Mon Sep 17 00:00:00 2001 From: huaqin90 Date: Fri, 3 Dec 2021 11:38:26 +0800 Subject: [PATCH 065/183] arm64/dts: rhodep: add flash dtsi details: add blair-camera-flash-pwm.dtsi Change-Id: If874430eb0bde509b78046039a37f81c9dcb2811 Signed-off-by: huaqin90 Reviewed-on: https://gerrit.mot.com/2134122 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- blair-camera-flash-pwm.dtsi | 22 ++++++++ blair-camera-sensor-mot-rhodep-overlay.dtsi | 57 +++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 blair-camera-flash-pwm.dtsi diff --git a/blair-camera-flash-pwm.dtsi b/blair-camera-flash-pwm.dtsi new file mode 100644 index 000000000000..d372343ec14a --- /dev/null +++ b/blair-camera-flash-pwm.dtsi @@ -0,0 +1,22 @@ +&pm6125_gpios { + camera_flash_pwm { + camera_flash_pwm_default: camera_flash_pwm_default { + pins = "gpio8"; + function = "func1"; + input-disable; /* No PULL */ + output-low; + bias-disable; + power-source = <0>; + drive-strength = <3>; + }; + }; +}; + +&soc { + pm6125_flash_gpio:pm6125_flash_gpio { + compatible = "qualcomm,pm6125_flash_gpio"; + pinctrl-names = "camera_flash_pwm_default"; + pinctrl-0 = <&camera_flash_pwm_default>; + pwms = <&pm6125_pwm 0 0>; + }; +}; diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 95113d95457d..cad63513d144 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -1,4 +1,6 @@ #include +#include +#include "blair-camera-flash-pwm.dtsi" &tlmm { cam_sensor_mclk0_active: cam_sensor_mclk0_active { @@ -224,6 +226,35 @@ output-high; }; }; + + flash_active: flash_active { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + flash_suspend: flash_suspend { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; }; &L21A{ @@ -233,11 +264,20 @@ status = "okay"; }; +&pm6125_pwm { + status = "ok"; +}; + &soc { qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; + gpios-shared = <404>; + pinctrl-names = "flash_active", "flash_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; }; + mot,cam-actuator { compatible = "mot,actuator"; status = "ok"; @@ -315,6 +355,22 @@ status = "ok"; }; + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -325,6 +381,7 @@ actuator-src = <&actuator_main>; eeprom-src = <&eeprom_main>; ois-src = <&ois_main>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; cam_vdig-supply = <&cam_pmic_ldo1>; From 67bf368864eb39e4700cff75c78991863423eb98 Mon Sep 17 00:00:00 2001 From: hansx3 Date: Fri, 3 Dec 2021 11:06:13 +0800 Subject: [PATCH 066/183] arm64/dts: rhodec: add Macro sensor gc02m1 details: add Macro sensor gc02m1 dtsi config Change-Id: I357b7edacaeb59b98bc17fa5df3c4751d28df766 Signed-off-by: hansx3 Reviewed-on: https://gerrit.mot.com/2134068 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Xingyun Fu Reviewed-by: XiaoFeng Wang Reviewed-by: Tested-by: Jira Key Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index daa1bb80a20d..d10e0bb714c4 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -241,6 +241,20 @@ output-high; }; }; + + cam_macro_avdd_en_default: cam_macro_avdd_en_default { + mux { + pins = "gpio45"; + function = "gpio"; + }; + + config { + pins = "gpio45"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; }; &soc { @@ -276,6 +290,21 @@ pinctrl-0 = <&cam_wide_avdd_en_default>; /*vin-supply = <&BOB>;*/ }; + + cam_macro_avdd: gpio-regulator@1{ + compatible = "regulator-fixed"; + reg = <0x01 0x01>; + regulator-name = "cam_macro_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 45 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_macro_avdd_en_default>; + /*vin-supply = <&BOB>;*/ + }; + }; &cam_cci0 { @@ -283,6 +312,41 @@ }; &cam_cci1 { + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_macro_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio","cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; qcom,cam-sensor3 { cell-index = <3>; compatible = "qcom,cam-sensor"; From 51392f222ec19e32cd3922903e1043de81cae4f5 Mon Sep 17 00:00:00 2001 From: weilt2 Date: Fri, 3 Dec 2021 21:02:59 +0800 Subject: [PATCH 067/183] arm64/dts: rhodec: add front sensor ov16a1q details: add front sensor ov16a1q dtsi config and config DVDD voltage Change-Id: I5838299a7b32f1d775e4e37a25a581d61344b07a Signed-off-by: weilt2 Reviewed-on: https://gerrit.mot.com/2134759 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: XiaoFeng Wang Reviewed-by: Wang Liu Reviewed-by: Zhuoran Xu Reviewed-by: Xingyun Fu Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 73 +++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index d10e0bb714c4..28441fd93037 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -214,6 +214,20 @@ }; }; + cam_front_avdd_en_default: cam_front_avdd_en_default { + mux { + pins = "gpio87"; + function = "gpio"; + }; + + config { + pins = "gpio87"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { mux { pins = "gpio46"; @@ -257,12 +271,33 @@ }; }; +&L3A{ + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + qcom,init-voltage = <1200000>; + status = "okay"; +}; + &soc { qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; }; + cam_front_avdd: gpio-regulator@3{ + compatible = "regulator-fixed"; + reg = <0x02 0x02>; + regulator-name = "cam_front_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 87 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_front_avdd_en_default>; + /*vin-supply = <&BOB>;*/ + }; + cam_wide_dvdd: gpio-regulator@0{ compatible = "regulator-fixed"; reg = <0x00 0x00>; @@ -308,7 +343,43 @@ }; &cam_cci0 { - + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_front_avdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET0"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; &cam_cci1 { From 0450c997369490f5b22c53815b97560ff380f8d0 Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Mon, 6 Dec 2021 16:19:24 +0800 Subject: [PATCH 068/183] arm64/dts: rhodec: main sensor s5kjn1 bringup details: add s5kjn1 sensor dtsi Change-Id: I1222734675adc8f708240f6fMontanae2e0e853ec5bd Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2136061 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Reviewed-by: XiaoFeng Wang Reviewed-by: Tested-by: Jira Key Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 133 +++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 28441fd93037..9038b9e7ef7e 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -214,6 +214,59 @@ }; }; + cam_rear_avdd_en_default: cam_rear_avdd_en_default { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_rear_dvdd_en_default: cam_rear_dvdd_en_default { + mux { + pins = "gpio33"; + function = "gpio"; + }; + + config { + pins = "gpio33"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_rear_af_en_default: cam_rear_af_en_default { + mux { + pins = "gpio56"; + function = "gpio"; + }; + + config { + pins = "gpio56"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_rear_adj_en_default: cam_rear_adj_en_default { + mux { + pins = "gpio47"; + function = "gpio"; + }; + + config { + pins = "gpio47"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + input-high; + }; + }; + cam_front_avdd_en_default: cam_front_avdd_en_default { mux { pins = "gpio87"; @@ -284,6 +337,43 @@ status = "ok"; }; + cam_rear_avdd: gpio-regulator@4{ + compatible = "regulator-fixed"; + reg = <0x04 0x04>; + regulator-name = "cam_rear_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 49 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_rear_avdd_en_default>; + }; + cam_rear_dvdd: gpio-regulator@5{ + compatible = "regulator-fixed"; + reg = <0x05 0x05>; + regulator-name = "cam_rear_dvdd"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 33 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_rear_dvdd_en_default>; + vin-supply = <&S6A>; + }; + cam_rear_af: gpio-regulator@6{ + compatible = "regulator-fixed"; + reg = <0x06 0x06>; + regulator-name = "cam_rear_af"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 56 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_rear_af_en_default>; + }; cam_front_avdd: gpio-regulator@3{ compatible = "regulator-fixed"; reg = <0x02 0x02>; @@ -343,6 +433,49 @@ }; &cam_cci0 { + qcom,cam-sensor0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_rear_avdd>; + cam_vdig-supply = <&cam_rear_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_rear_af>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active + &cam_rear_adj_en_default>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>, + <&tlmm 47 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_MCLK0", + "CAM_RESET0", + "CAM_DVDD_SEL0"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + qcom,cam-sensor1 { cell-index = <1>; compatible = "qcom,cam-sensor"; From 01fae1914c05784d650dd47c505d93f021216a84 Mon Sep 17 00:00:00 2001 From: hansx3 Date: Mon, 6 Dec 2021 15:15:47 +0800 Subject: [PATCH 069/183] arm64/dts: rhodec: add Macro sensro gc02m1 details: add Macro sensor gc02m1 dtsi config Correction regulator rename Change-Id: I02467e2f8c02160828ea19be4310c70d97491acf Signed-off-by: hansx3 Reviewed-on: https://gerrit.mot.com/2135965 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: XiaoFeng Wang Reviewed-by: Xingyun Fu Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 38 ++++------------------ 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 9038b9e7ef7e..9c24231edacc 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -295,7 +295,7 @@ }; }; - cam_wide_avdd_en_default: cam_wide_avdd_en_default { + cam_wide_macro_avdd_en_default: cam_wide_macro_avdd_en_default { mux { pins = "gpio45"; function = "gpio"; @@ -309,19 +309,6 @@ }; }; - cam_macro_avdd_en_default: cam_macro_avdd_en_default { - mux { - pins = "gpio45"; - function = "gpio"; - }; - - config { - pins = "gpio45"; - bias-pull-up; /* PULL UP */ - drive-strength = <2>; /* 2 MA */ - output-high; - }; - }; }; &L3A{ @@ -402,33 +389,20 @@ vin-supply = <&S6A>; }; - cam_wide_avdd: gpio-regulator@1{ + cam_wide_macro_avdd: gpio-regulator@1{ compatible = "regulator-fixed"; reg = <0x01 0x01>; - regulator-name = "cam_wide_avdd"; + regulator-name = "cam_wide_macro_avdd"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-enable-ramp-delay = <233>; enable-active-high; gpio = <&tlmm 45 0>; pinctrl-names = "default"; - pinctrl-0 = <&cam_wide_avdd_en_default>; + pinctrl-0 = <&cam_wide_macro_avdd_en_default>; /*vin-supply = <&BOB>;*/ }; - cam_macro_avdd: gpio-regulator@1{ - compatible = "regulator-fixed"; - reg = <0x01 0x01>; - regulator-name = "cam_macro_avdd"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - regulator-enable-ramp-delay = <233>; - enable-active-high; - gpio = <&tlmm 45 0>; - pinctrl-names = "default"; - pinctrl-0 = <&cam_macro_avdd_en_default>; - /*vin-supply = <&BOB>;*/ - }; }; @@ -524,7 +498,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; cam_vio-supply = <&L9A>; - cam_vana-supply = <&cam_macro_avdd>; + cam_vana-supply = <&cam_wide_macro_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio","cam_vana", "cam_clk"; rgltr-cntrl-support; @@ -559,7 +533,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; cam_vio-supply = <&L9A>; - cam_vana-supply = <&cam_wide_avdd>; + cam_vana-supply = <&cam_wide_macro_avdd>; cam_vdig-supply = <&cam_wide_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", From 0c35b92a5e44a27ecb90caf3443356eb70754da9 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Mon, 6 Dec 2021 17:14:44 +0800 Subject: [PATCH 070/183] rhodec: add s5k4h7 eeprom details: add s5k4h7 eeprom, copy from rhode5g+ Change-Id: I562d5e3df33a84661fb5dcbb84280f6cacb13be6 Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2136129 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhenxin Xi Reviewed-by: Xingyun Fu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 9c24231edacc..14b51535ee3f 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -525,6 +525,39 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_wide_avdd>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 36 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 = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; qcom,cam-sensor3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -532,6 +565,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&L9A>; cam_vana-supply = <&cam_wide_macro_avdd>; cam_vdig-supply = <&cam_wide_dvdd>; From 15373cab9384c8f187baf76bae8cc09a48723879 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Mon, 6 Dec 2021 18:06:40 +0800 Subject: [PATCH 071/183] milanf: remove mot actuator device milanf does not need af nosie workaround. remove mot actuator device. Change-Id: I84fc5bdc6cad0a773495d0eea32a800aa28e9cf5 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2136196 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Reviewed-by: Shuo Wang Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index 227f01dc86cd..8d598fc3e83d 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -221,11 +221,6 @@ status = "ok"; }; - mot,cam-actuator { - compatible = "mot,actuator"; - status = "ok"; - }; - led_flash_rear: qcom,camera-flash@0 { cell-index = <0>; reg = <0x0>; From 0073c67716bb49314199a8bdda0fa7995c0aea97 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Mon, 6 Dec 2021 19:38:44 +0800 Subject: [PATCH 072/183] rhodec: add s5k4h7 eeprom details: add s5k4h7 eeprom, copy from rhode5g+ Change-Id: I9cb0defe2adc9211a44c010f0fee4531a335e35a Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2136237 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 14b51535ee3f..ccd3371cee53 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -529,7 +529,7 @@ cell-index = <3>; compatible = "qcom,eeprom"; cam_vio-supply = <&L9A>; - cam_vana-supply = <&cam_wide_avdd>; + cam_vana-supply = <&cam_wide_macro_avdd>; cam_vdig-supply = <&cam_wide_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", From 9ee3fbced4ba18673a87331e765cbe88627e940d Mon Sep 17 00:00:00 2001 From: huaqin90 Date: Mon, 6 Dec 2021 16:33:45 +0800 Subject: [PATCH 073/183] arm64/dts: rhodep: Compatible with ldo fan53870 details: Change the maximum voltage range of LDO Change-Id: I0afd6d857bc1a96e48c36e966216ff84397a7fd3 Signed-off-by: huaqin90 Reviewed-on: https://gerrit.mot.com/2136074 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Long Cheng Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index cad63513d144..6633c94ae987 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -287,7 +287,7 @@ reg = <0x00 0x00>; regulator-name = "cam_ois_ldo"; regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; + regulator-max-microvolt = <2805000>; regulator-enable-ramp-delay = <233>; enable-active-high; gpio = <&tlmm 86 0>; @@ -306,7 +306,7 @@ regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2805000>; rgltr-load-current = <120000 100000 100000>; cci-master = <1>; status = "ok"; @@ -321,7 +321,7 @@ regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2805000>; rgltr-load-current = <120000 100000 100000>; cci-master = <1>; status = "ok"; @@ -335,7 +335,7 @@ regulator-names = "cam_vio"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; + rgltr-max-voltage = <1805000>; rgltr-load-current = <120000>; cci-master = <1>; status = "ok"; @@ -349,7 +349,7 @@ regulator-names = "cam_vio"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; + rgltr-max-voltage = <1805000>; rgltr-load-current = <3000>; cci-master = <0>; status = "ok"; @@ -390,7 +390,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; + rgltr-max-voltage = <1805000 2805000 1100000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -428,7 +428,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -463,7 +463,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -500,7 +500,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -534,7 +534,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; @@ -572,7 +572,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; From a9b080070844c965fd1daee3a7012be21640650f Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Mon, 6 Dec 2021 20:05:30 +0800 Subject: [PATCH 074/183] arm64/dts: rhodec: eeprom bringup for s5kjn1 details: add s5kjn1 eeprom dtsi Change-Id: Id72512b38123399d36077d093c4e267420343f28 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2136256 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: XiaoFeng Wang Reviewed-by: Wang Liu Reviewed-by: Xingyun Fu Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index ccd3371cee53..2abde7a704a7 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -407,6 +407,19 @@ }; &cam_cci0 { + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L9A>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -414,6 +427,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_main>; cam_vio-supply = <&L9A>; cam_vana-supply = <&cam_rear_avdd>; cam_vdig-supply = <&cam_rear_dvdd>; From 0195af36d6f7ebdcc9c8a2a0540587068ebb54af Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Tue, 7 Dec 2021 12:37:12 +0800 Subject: [PATCH 075/183] arm64/dts: rhodec: add AF dtsi for s5kjn1 details: add AF dtsi Change-Id: Ib833e05e30841dd80c6fd909f014de6bf4d1ab83 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2136854 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 2abde7a704a7..dee5723ee8f8 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -407,6 +407,19 @@ }; &cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vaf-supply = <&cam_rear_af>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + cci-master = <1>; + status = "ok"; + }; + eeprom_main: qcom,eeprom@0 { cell-index = <0>; reg = <0x0>; @@ -420,6 +433,7 @@ cci-master = <1>; status = "ok"; }; + qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -427,6 +441,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; eeprom-src = <&eeprom_main>; cam_vio-supply = <&L9A>; cam_vana-supply = <&cam_rear_avdd>; From 932942480c9d633ed06bb5c0a3fe038241bb2f25 Mon Sep 17 00:00:00 2001 From: weilt2 Date: Mon, 6 Dec 2021 16:10:42 +0800 Subject: [PATCH 076/183] arm64/dts rhodec: Add devicetree for front camera ov16a1q eeprom(2/2) details: Add front camera ov16a1q eeprom driver, copy from rhode5g+ Change-Id: I8348e3c88e91302dd3086078ab5acbd4e4a4b979 Signed-off-by: weilt2 Reviewed-on: https://gerrit.mot.com/2136053 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xingyun Fu Reviewed-by: XiaoFeng Wang Reviewed-by: Zhuoran Xu Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index dee5723ee8f8..179892e8bfc2 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -434,6 +434,20 @@ status = "ok"; }; + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L9A>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <3000>; + cci-master = <0>; + status = "ok"; + }; + qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -486,6 +500,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&L9A>; cam_vana-supply = <&cam_front_avdd>; cam_vdig-supply = <&L3A>; From 344e01a70fdfa018d3372884ce6fd788b6ca2d97 Mon Sep 17 00:00:00 2001 From: huaqin90 Date: Tue, 7 Dec 2021 15:11:42 +0800 Subject: [PATCH 077/183] arm64/dts: rhodep: Fix the problem that the camera cannot be opened caused by dtsi details: Modify the maximum voltage range of OIS Change-Id: I5fc1ab9f543a5a574e3685fcf0c72a2c5bc5ab7e Signed-off-by: huaqin90 Reviewed-on: https://gerrit.mot.com/2136994 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 6633c94ae987..e883c14754cf 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -287,7 +287,7 @@ reg = <0x00 0x00>; regulator-name = "cam_ois_ldo"; regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2805000>; + regulator-max-microvolt = <2800000>; regulator-enable-ramp-delay = <233>; enable-active-high; gpio = <&tlmm 86 0>; @@ -321,7 +321,7 @@ regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1805000 2805000 2805000>; + rgltr-max-voltage = <1805000 2805000 2800000>; rgltr-load-current = <120000 100000 100000>; cci-master = <1>; status = "ok"; @@ -428,7 +428,7 @@ "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1205000 0>; + rgltr-max-voltage = <1805000 2805000 1200000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; From 41645bdefb11c192cfed21e43054c15b3da8bcdc Mon Sep 17 00:00:00 2001 From: hansx3 Date: Tue, 7 Dec 2021 17:36:56 +0800 Subject: [PATCH 078/183] rhodec: add macro gc02m1 eeprom details: add macro eeprom, copy from rhode5g+ Change-Id: I090999b67dbcf7932b388ff424ad037ab0e4e279 Signed-off-by: hansx3 Reviewed-on: https://gerrit.mot.com/2137206 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: XiaoFeng Wang Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 179892e8bfc2..01e12560f1ca 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -534,6 +534,38 @@ }; &cam_cci1 { + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_wide_macro_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; qcom,cam-sensor2 { cell-index = <2>; compatible = "qcom,cam-sensor"; @@ -541,6 +573,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; cam_vio-supply = <&L9A>; cam_vana-supply = <&cam_wide_macro_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; From 43e12737f9cf07fc7f9ff2caee9ca4df519b8316 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Tue, 7 Dec 2021 19:04:36 +0800 Subject: [PATCH 079/183] milanf: support ois-vsync interrupt [detail] use GPIO51 as ois-vsync interrupt Change-Id: Icfb2a42c4c75c3e4f28be2918c0213458cfecf00 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2137314 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: XiaoFeng Wang Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index 8d598fc3e83d..92bb2f8f7f68 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -213,6 +213,17 @@ }; }; + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; }; &soc { @@ -271,6 +282,11 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; From 9c538f0328ad0ce1704129650b9d3ef925b7f8a9 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Thu, 9 Dec 2021 11:01:13 +0800 Subject: [PATCH 080/183] milanf: change MCLK3 from GPIO33 to GPIO32 [detail] MCLK3 is GPIO32 Change-Id: I06d14437cb7b277b48bcd9427847cfc49b3bb916 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2139245 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: XiaoFeng Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index 92bb2f8f7f68..fea05449a883 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -502,7 +502,7 @@ &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk3_suspend &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 33 0>, + gpios = <&tlmm 32 0>, <&tlmm 36 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; @@ -557,7 +557,7 @@ &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk3_suspend &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 33 0>, + gpios = <&tlmm 32 0>, <&tlmm 36 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; From d17b9a9beed4b0b8a660c8e32182ce7631dce637 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Fri, 10 Dec 2021 13:31:00 +0800 Subject: [PATCH 081/183] rhodec: flash ocp81373 bringup merge wentai flash ocp81373 bringup. https://gerrit-cn.motorola.com/#/c/34613/ Change-Id: Iae29b9daaa42a45c8dd684b348b126f00b8f75e4 Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2140684 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 78 +++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 01e12560f1ca..cb432b53e729 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -308,7 +308,58 @@ output-high; }; }; + cam_flash_en_active: cam_flash_en_active { + mux { + pins = "gpio102"; + function = "gpio"; + }; + config { + pins = "gpio102"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + cam_flash_en_suspend: cam_flash_en_suspend { + mux { + pins = "gpio102"; + function = "gpio"; + }; + + config { + pins = "gpio102"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_flash_torch_active: cam_flash_torch_active { + /* AFVDD */ + mux { + pins = "gpio57"; + function = "gpio"; + }; + + config { + pins = "gpio57"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + cam_flash_torch_suspend: cam_flash_torch_suspend { + /* AFVDD */ + mux { + pins = "gpio57"; + function = "gpio"; + }; + + config { + pins = "gpio57"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; }; &L3A{ @@ -403,7 +454,31 @@ /*vin-supply = <&BOB>;*/ }; - + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + cci-master = <0>; + flash-type = ; + cam_vio-supply = <&L9A>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; + gpios = <&tlmm 102 0>, + <&tlmm 57 0>; + gpio-custom1 = <0>; + gpio-custom2 = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <0 0>; + gpio-req-tbl-label = "SENSOR_CUSTOM_GPIO1", + "SENSOR_CUSTOM_GPIO2"; + status = "ok"; + }; }; &cam_cci0 { @@ -457,6 +532,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_main>; eeprom-src = <&eeprom_main>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&L9A>; cam_vana-supply = <&cam_rear_avdd>; cam_vdig-supply = <&cam_rear_dvdd>; From c247f0b96f442c75816689eb145176a451b830ae Mon Sep 17 00:00:00 2001 From: huaqin90 Date: Mon, 13 Dec 2021 19:22:56 +0800 Subject: [PATCH 082/183] arm64/dts: Rhodep:Add depth and macro camera flash Changes: Rhodep add depth ¯o camera flash Change-Id: I1f69e6fd7798c258416b41685141860adebd0e4d Reviewed-on: https://gerrit.mot.com/2142732 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Tested-by: Jira Key Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index e883c14754cf..03d39cb2e4f2 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -485,6 +485,22 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; sensor_macro: qcom,cam-sensor@2 { cell-index = <2>; compatible = "qcom,cam-sensor"; @@ -492,6 +508,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; eeprom-src = <&eeprom_macro>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo5>; @@ -556,6 +573,22 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; sensor_wide: qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -563,6 +596,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo5>; From 1c893868fba7784b0ce7ba106e5e243f6cfb3bbd Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Mon, 20 Dec 2021 10:27:53 +0800 Subject: [PATCH 083/183] arm64/dts: rhodep: remove mot actuator device details: rhodep does not need af nosie workaround. remove mot actuator device. Change-Id: I6cc4d21ae5d0f39865fde97d4511937c814cb608 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2149199 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Xingyun Fu Reviewed-by: XiaoFeng Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 03d39cb2e4f2..27f515c762b7 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -278,10 +278,6 @@ pinctrl-1 = <&flash_suspend>; }; - mot,cam-actuator { - compatible = "mot,actuator"; - status = "ok"; - }; cam_ois_ldo: gpio-regulator@0{ compatible = "regulator-fixed"; reg = <0x00 0x00>; From 2c087272f0780e93d30a8e03f2e1024f3a9181b1 Mon Sep 17 00:00:00 2001 From: huaqin78 Date: Wed, 22 Dec 2021 17:29:29 +0800 Subject: [PATCH 084/183] rhodep: wide camera driver current strengthen details: mclk raise and fall need below 10ns Change-Id: I5670dcdf760624efa9Montana7f78ad9d579a08249b7 Signed-off-by: huaqin78 Reviewed-on: https://gerrit.mot.com/2151859 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 27f515c762b7..0580c4994f0b 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -64,7 +64,7 @@ config { pins = "gpio31"; bias-disable; /* No PULL */ - drive-strength = <2>; + drive-strength = <4>; }; }; @@ -77,7 +77,7 @@ config { pins = "gpio31"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; + drive-strength = <4>; }; }; From ca38a52ecf87aa9ea752e7f4af70dcd2d9ab11e0 Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Tue, 21 Dec 2021 15:11:00 +0800 Subject: [PATCH 085/183] arm64/dts: rhodep: support ois-vsync interrupt details: use GPIO51 as ois-vsync interrupt Change-Id: Id1827e1b4a1727b487e3f211b8a50ddfbecb3891 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2150636 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: XiaoFeng Wang Reviewed-by: Long Cheng Reviewed-by: Xingyun Fu Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 0580c4994f0b..7066cfa61a07 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -255,6 +255,18 @@ output-low; }; }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; }; &L21A{ @@ -311,6 +323,11 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vaf-supply = <&cam_pmic_ldo3>; cam_v_custom1-supply = <&cam_ois_ldo>; From 1b1cf47cbb297bf113faa1aa0f2534ac2fa4e6e8 Mon Sep 17 00:00:00 2001 From: Wang Liu Date: Wed, 29 Dec 2021 03:19:51 -0600 Subject: [PATCH 086/183] Revert "(CR): milanf: support ois-vsync interrupt" OIS vsync irq will result in kernel panic, temp disable it. This reverts commit 5a6d54cab05b9c423f3002120774ba6164e4c983. Change-Id: I7f6b3a21bf9da41086d1bd7e0e7332e00a439b4a Reviewed-on: https://gerrit.mot.com/2157058 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index fea05449a883..ad6f47d998a2 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -213,17 +213,6 @@ }; }; - cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { - mux { - pins = "gpio51"; - function = "gpio"; - }; - config { - pins = "gpio51"; - drive-strength = <2>; - input-enable; - }; - }; }; &soc { @@ -282,11 +271,6 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; - interrupt-parent = <&tlmm>; - interrupts = <51 IRQ_TYPE_EDGE_RISING>; - vsync-irq-support; - pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; From b1377737924f84f5066dfe1236348792b18023f4 Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Thu, 30 Dec 2021 03:51:36 -0600 Subject: [PATCH 087/183] Revert "(CR): arm64/dts: rhodep: support ois-vsync interrupt" OIS vsync irq will result in kernel panic,temp disable it. This reverts commit e030b55cc9272591a51c2616c7c5ef4997a4cbef. Change-Id: I2e4647860fddccc330bef1ccee2Montanaaf8b98d0f8 Reviewed-on: https://gerrit.mot.com/2158606 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: XiaoFeng Wang Reviewed-by: Bolei Shang Reviewed-by: Zilong Zhang Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-rhodep-overlay.dtsi | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 7066cfa61a07..0580c4994f0b 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -255,18 +255,6 @@ output-low; }; }; - - cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { - mux { - pins = "gpio51"; - function = "gpio"; - }; - config { - pins = "gpio51"; - drive-strength = <2>; - input-enable; - }; - }; }; &L21A{ @@ -323,11 +311,6 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; - interrupt-parent = <&tlmm>; - interrupts = <51 IRQ_TYPE_EDGE_RISING>; - vsync-irq-support; - pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vaf-supply = <&cam_pmic_ldo3>; cam_v_custom1-supply = <&cam_ois_ldo>; From 61d57e01492fd9039be6b0a99fd8885991a790f6 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Fri, 7 Jan 2022 09:54:24 +0800 Subject: [PATCH 088/183] milanf: support ois-vsync interrupt [detail] use gpio51 as vsync interrupt Change-Id: I0e8202cfb8c5d15db0bc247f1824ca4dfb4b73d7 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2164370 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index ad6f47d998a2..fea05449a883 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -213,6 +213,17 @@ }; }; + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; }; &soc { @@ -271,6 +282,11 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; From a328d0648dff347ce36bda9e5af3758b7a984ce5 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Wed, 12 Jan 2022 15:15:44 +0800 Subject: [PATCH 089/183] milan5g: add s5k4h7 VAF power detail: resolve occasionally VAF power fail Change-Id: I3dbe98c37aadcd09fbe296fb02ac7d3490ca4181 Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2168120 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Zhenxin Xi Reviewed-by: Zhichao Chen Reviewed-by: Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index fea05449a883..4c136a006efb 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -544,13 +544,14 @@ cam_vio-supply = <&cam_pmic1_ldo7_vddio>; cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_vaf", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1200000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 2800000 0>; + rgltr-load-current = <120000 80000 1200000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active From 732e756f6a613207a1654379cac0e53461b30d6a Mon Sep 17 00:00:00 2001 From: huaqin90 Date: Thu, 13 Jan 2022 16:06:43 +0800 Subject: [PATCH 090/183] rhodep: dvt2 the front camera dvdd modify[1/3] details: modify dvt2 dtsi Change-Id: I34aec607784a9b714fdb64616ac6344476264bad Signed-off-by: huaqin90 Reviewed-on: https://gerrit.mot.com/2169340 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- ...camera-sensor-mot-rhodep-dvt2-overlay.dtsi | 662 ++++++++++++++++++ 1 file changed, 662 insertions(+) create mode 100644 blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi diff --git a/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi b/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi new file mode 100644 index 000000000000..80fa863160ec --- /dev/null +++ b/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi @@ -0,0 +1,662 @@ +#include +#include + +/delete-node/ &cam_sensor_mclk0_active; +/delete-node/ &cam_sensor_mclk1_active; +/delete-node/ &cam_sensor_mclk2_active; +/delete-node/ &cam_sensor_mclk3_active; +/delete-node/ &cam_sensor_main_reset_active; +/delete-node/ &cam_sensor_front_reset_active; +/delete-node/ &cam_sensor_macro_reset_active; +/delete-node/ &cam_sensor_wide_reset_active; +/delete-node/ &flash_active; +/delete-node/ &cam_sensor_mclk0_suspend; +/delete-node/ &cam_sensor_mclk1_suspend; +/delete-node/ &cam_sensor_mclk2_suspend; +/delete-node/ &cam_sensor_mclk3_suspend; +/delete-node/ &cam_sensor_main_reset_suspend; +/delete-node/ &cam_sensor_front_reset_suspend; +/delete-node/ &cam_sensor_macro_reset_suspend; +/delete-node/ &cam_sensor_wide_reset_suspend; +/delete-node/ &flash_suspend; +/delete-node/ &cam_ois_ldo_en_default; +/delete-node/ &cam_ois_ldo; +/delete-node/ &actuator_main; +/delete-node/ &ois_main; +/delete-node/ &eeprom_main; +/delete-node/ &eeprom_front; +/delete-node/ &led_flash_rear; +/delete-node/ &sensor_main; +/delete-node/ &sensor_front; +/delete-node/ &eeprom_macro; +/delete-node/ &led_flash_macro; +/delete-node/ &sensor_macro; +/delete-node/ &eeprom_wide; +/delete-node/ &led_flash_wide; +/delete-node/ &sensor_wide; + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_ois_ldo_en_default: cam_ois_ldo_en_default { + mux { + pins = "gpio86"; + function = "gpio"; + }; + config { + pins = "gpio86"; + bias-pull-up; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + + flash_active: flash_active { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + flash_suspend: flash_suspend { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&L21A{ + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3000000>; + qcom,init-voltage = <2500000>; + status = "okay"; +}; + +&pm6125_pwm { + status = "ok"; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + gpios-shared = <404>; + pinctrl-names = "flash_active", "flash_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + }; + + cam_ois_ldo: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_ois_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 86 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_ldo_en_default>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2805000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <3000>; + cci-master = <0>; + status = "ok"; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + eeprom-src = <&eeprom_main>; + ois-src = <&ois_main>; + led-flash-src = <&led_flash_rear>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo4>; + cam_vdig-supply = <&cam_pmic_ldo1>; + cam_clk-supply = <&gcc_camss_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 = <1805000 2805000 1100000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo6>; + cam_vdig-supply = <&L21A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2500000 0>; + rgltr-max-voltage = <1805000 2805000 2500000 0>; + rgltr-load-current = <120000 80000 2500000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + +}; From d518bd5709337cbddead14b65399151ed6a392bc Mon Sep 17 00:00:00 2001 From: handong Date: Fri, 14 Jan 2022 13:55:49 +0800 Subject: [PATCH 091/183] rhodec flash supplier distinguish[1/4] details: distinguish flash supplier Change-Id: Id37ca6150ba54d2bec60229a8dc4f01e6a34090a Reviewed-on: https://gerrit.mot.com/2170334 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Reviewed-by: XiaoFeng Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index cb432b53e729..8062ab495bab 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -548,21 +548,27 @@ pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_main_reset_active + &cam_flash_en_active &cam_rear_adj_en_default>; pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_main_reset_suspend>; + &cam_sensor_main_reset_suspend + &cam_flash_en_suspend>; gpios = <&tlmm 29 0>, <&tlmm 35 0>, + <&tlmm 102 0>, <&tlmm 47 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-custom2 = <2> + gpio-custom1 = <3>; + gpio-req-tbl-num = <0 1 2 3>; + gpio-req-tbl-flags = <1 0 0 0>; gpio-req-tbl-label = "CAMIF_MCLK0", "CAM_RESET0", + "CAM_FLASH_EN", "CAM_DVDD_SEL0"; cci-master = <1>; status = "ok"; + need-change-cci-master; clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; From 39b504ab06a63e92853689da1cf10abb1778a5b8 Mon Sep 17 00:00:00 2001 From: handong Date: Thu, 20 Jan 2022 16:26:25 +0800 Subject: [PATCH 092/183] rhodec fix flash supplier distinguish error details: distinguish flash supplier Change-Id: I83f4190e679126d04ab84a264bbbd90d3c8762cb Reviewed-on: https://gerrit.mot.com/2175409 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: XiaoFeng Wang Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index 8062ab495bab..d86d83714295 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -558,7 +558,7 @@ <&tlmm 102 0>, <&tlmm 47 0>; gpio-reset = <1>; - gpio-custom2 = <2> + gpio-custom2 = <2>; gpio-custom1 = <3>; gpio-req-tbl-num = <0 1 2 3>; gpio-req-tbl-flags = <1 0 0 0>; From acec2993d52d797e6dd87bc92980aa914570a46e Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Mon, 24 Jan 2022 14:40:18 +0800 Subject: [PATCH 093/183] arm64/dts: rhodep: add ois vsync configure details: add ois vsync configure Change-Id: Ic4f7663bb6d717591590814c31152a93a2ceeec5 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2177386 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Wang Liu Reviewed-by: XiaoFeng Wang Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- ...r-camera-sensor-mot-rhodep-dvt2-overlay.dtsi | 17 +++++++++++++++++ blair-camera-sensor-mot-rhodep-overlay.dtsi | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi b/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi index 80fa863160ec..fd88be53eb93 100644 --- a/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi @@ -288,6 +288,18 @@ output-low; }; }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; }; &L21A{ @@ -344,6 +356,11 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vaf-supply = <&cam_pmic_ldo3>; cam_v_custom1-supply = <&cam_ois_ldo>; diff --git a/blair-camera-sensor-mot-rhodep-overlay.dtsi b/blair-camera-sensor-mot-rhodep-overlay.dtsi index 0580c4994f0b..d7c966f1c569 100644 --- a/blair-camera-sensor-mot-rhodep-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-overlay.dtsi @@ -255,6 +255,18 @@ output-low; }; }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; }; &L21A{ @@ -311,6 +323,11 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vaf-supply = <&cam_pmic_ldo3>; cam_v_custom1-supply = <&cam_ois_ldo>; From 8e066992ffdbc5a7493db174decc0641264bf339 Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Mon, 24 Jan 2022 18:11:43 +0800 Subject: [PATCH 094/183] arm64/dts: rhodep: add "delete node" in dvt2.dtsi details: add "delete node" in dvt2.dtsi Change-Id: I5bef93b84333eac483f0304c140ec55bac6d4e23 Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2177645 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: gaoyx9 Submit-Approved: gaoyx9 Tested-by: gaoyx9 Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen --- blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi b/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi index fd88be53eb93..90d3e668c13e 100644 --- a/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodep-dvt2-overlay.dtsi @@ -34,6 +34,7 @@ /delete-node/ &eeprom_wide; /delete-node/ &led_flash_wide; /delete-node/ &sensor_wide; +/delete-node/ &cam_ois_vsync_irq_default; &tlmm { cam_sensor_mclk0_active: cam_sensor_mclk0_active { From b861d3313b8d27747739490d163d8c38867d7139 Mon Sep 17 00:00:00 2001 From: hansx3 Date: Tue, 8 Feb 2022 20:10:53 +0800 Subject: [PATCH 095/183] arm64/dts: rhodec: add macro Torch On/Off support details: According to the rhode5g OD Torch On/Off for both picture and video should be support. Change-Id: Ib00b72859a0141221a31ab6abaea9338bbd1412f Signed-off-by: hansx3 Reviewed-on: https://gerrit.mot.com/2185514 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: XiaoFeng Wang Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index d86d83714295..afa5a54d6467 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -656,6 +656,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; eeprom-src = <&eeprom_macro>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&L9A>; cam_vana-supply = <&cam_wide_macro_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; @@ -667,18 +668,24 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_macro_reset_active>; + &cam_sensor_macro_reset_active + &cam_flash_en_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_macro_reset_suspend + &cam_flash_en_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 37 0>; + <&tlmm 37 0>, + <&tlmm 102 0>; gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; + gpio-custom2 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET2"; + "CAM_RESET2", + "CAM_FLASH_EN"; cci-master = <0>; status = "ok"; + need-change-cci-master; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; From 4f0a001fad20cb22d14998d4d77cc82e97088f61 Mon Sep 17 00:00:00 2001 From: liuzy55 Date: Fri, 11 Feb 2022 11:01:49 +0800 Subject: [PATCH 096/183] arm64/dts: rhodec: Actuator noise reduction details: add flag multi-user-support in actuator Change-Id: I1800804942c2723ef0d490f7d89dbb79ef0a2dce Signed-off-by: liuzy55 Reviewed-on: https://gerrit.mot.com/2188598 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: XiaoFeng Wang Reviewed-by: Wang Liu Reviewed-by: Shuo Wang Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Tested-by: Jira Key Submit-Approved: Jira Key --- holi-camera-sensor-mot-rhodec-overlay.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/holi-camera-sensor-mot-rhodec-overlay.dtsi b/holi-camera-sensor-mot-rhodec-overlay.dtsi index afa5a54d6467..b505c5eb35df 100644 --- a/holi-camera-sensor-mot-rhodec-overlay.dtsi +++ b/holi-camera-sensor-mot-rhodec-overlay.dtsi @@ -375,6 +375,11 @@ status = "ok"; }; + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + cam_rear_avdd: gpio-regulator@4{ compatible = "regulator-fixed"; reg = <0x04 0x04>; @@ -493,6 +498,7 @@ rgltr-load-current = <100000>; cci-master = <1>; status = "ok"; + multi-user-support; }; eeprom_main: qcom,eeprom@0 { From ccb6f90f50196a7ff2d482ec01dc3bedc49f9dc1 Mon Sep 17 00:00:00 2001 From: panyq6 Date: Fri, 18 Feb 2022 13:28:41 +0800 Subject: [PATCH 097/183] =?UTF-8?q?Ronde5g=20of=20india=20sku=EF=BC=88rhod?= =?UTF-8?q?ei=EF=BC=89=20bringup=20:=20add=20rhodei=20dtsi=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rhodei dtsi file from rhodep Change-Id: I9ffefbc351e6c3e153982ba70c9ca606c1fc79b0 Reviewed-on: https://gerrit.mot.com/2193934 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhuoran Xu Submit-Approved: panyq6 --- ...camera-sensor-mot-rhodei-dvt2-overlay.dtsi | 680 ++++++++++++++++++ blair-camera-sensor-mot-rhodei-overlay.dtsi | 646 +++++++++++++++++ 2 files changed, 1326 insertions(+) create mode 100644 blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi create mode 100644 blair-camera-sensor-mot-rhodei-overlay.dtsi diff --git a/blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi b/blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi new file mode 100644 index 000000000000..90d3e668c13e --- /dev/null +++ b/blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi @@ -0,0 +1,680 @@ +#include +#include + +/delete-node/ &cam_sensor_mclk0_active; +/delete-node/ &cam_sensor_mclk1_active; +/delete-node/ &cam_sensor_mclk2_active; +/delete-node/ &cam_sensor_mclk3_active; +/delete-node/ &cam_sensor_main_reset_active; +/delete-node/ &cam_sensor_front_reset_active; +/delete-node/ &cam_sensor_macro_reset_active; +/delete-node/ &cam_sensor_wide_reset_active; +/delete-node/ &flash_active; +/delete-node/ &cam_sensor_mclk0_suspend; +/delete-node/ &cam_sensor_mclk1_suspend; +/delete-node/ &cam_sensor_mclk2_suspend; +/delete-node/ &cam_sensor_mclk3_suspend; +/delete-node/ &cam_sensor_main_reset_suspend; +/delete-node/ &cam_sensor_front_reset_suspend; +/delete-node/ &cam_sensor_macro_reset_suspend; +/delete-node/ &cam_sensor_wide_reset_suspend; +/delete-node/ &flash_suspend; +/delete-node/ &cam_ois_ldo_en_default; +/delete-node/ &cam_ois_ldo; +/delete-node/ &actuator_main; +/delete-node/ &ois_main; +/delete-node/ &eeprom_main; +/delete-node/ &eeprom_front; +/delete-node/ &led_flash_rear; +/delete-node/ &sensor_main; +/delete-node/ &sensor_front; +/delete-node/ &eeprom_macro; +/delete-node/ &led_flash_macro; +/delete-node/ &sensor_macro; +/delete-node/ &eeprom_wide; +/delete-node/ &led_flash_wide; +/delete-node/ &sensor_wide; +/delete-node/ &cam_ois_vsync_irq_default; + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_ois_ldo_en_default: cam_ois_ldo_en_default { + mux { + pins = "gpio86"; + function = "gpio"; + }; + config { + pins = "gpio86"; + bias-pull-up; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + + flash_active: flash_active { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + flash_suspend: flash_suspend { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; +}; + +&L21A{ + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3000000>; + qcom,init-voltage = <2500000>; + status = "okay"; +}; + +&pm6125_pwm { + status = "ok"; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + gpios-shared = <404>; + pinctrl-names = "flash_active", "flash_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + }; + + cam_ois_ldo: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_ois_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 86 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_ldo_en_default>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2805000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <3000>; + cci-master = <0>; + status = "ok"; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + eeprom-src = <&eeprom_main>; + ois-src = <&ois_main>; + led-flash-src = <&led_flash_rear>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo4>; + cam_vdig-supply = <&cam_pmic_ldo1>; + cam_clk-supply = <&gcc_camss_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 = <1805000 2805000 1100000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo6>; + cam_vdig-supply = <&L21A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2500000 0>; + rgltr-max-voltage = <1805000 2805000 2500000 0>; + rgltr-load-current = <120000 80000 2500000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + +}; diff --git a/blair-camera-sensor-mot-rhodei-overlay.dtsi b/blair-camera-sensor-mot-rhodei-overlay.dtsi new file mode 100644 index 000000000000..d7c966f1c569 --- /dev/null +++ b/blair-camera-sensor-mot-rhodei-overlay.dtsi @@ -0,0 +1,646 @@ +#include +#include +#include "blair-camera-flash-pwm.dtsi" + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_ois_ldo_en_default: cam_ois_ldo_en_default { + mux { + pins = "gpio86"; + function = "gpio"; + }; + config { + pins = "gpio86"; + bias-pull-up; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + + flash_active: flash_active { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + flash_suspend: flash_suspend { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; +}; + +&L21A{ + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + qcom,init-voltage = <1200000>; + status = "okay"; +}; + +&pm6125_pwm { + status = "ok"; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + gpios-shared = <404>; + pinctrl-names = "flash_active", "flash_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + }; + + cam_ois_ldo: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_ois_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 86 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_ldo_en_default>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2805000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <3000>; + cci-master = <0>; + status = "ok"; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + eeprom-src = <&eeprom_main>; + ois-src = <&ois_main>; + led-flash-src = <&led_flash_rear>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo4>; + cam_vdig-supply = <&cam_pmic_ldo1>; + cam_clk-supply = <&gcc_camss_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 = <1805000 2805000 1100000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo6>; + cam_vdig-supply = <&L21A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + +}; From 557c6d12348e9d6dd228454243fd1932a4154922 Mon Sep 17 00:00:00 2001 From: zhoujs3 Date: Mon, 28 Feb 2022 13:33:15 +0800 Subject: [PATCH 098/183] Bring up miami,init the overlay file Bring up new product miani base on rhodep Copy the camera overlay files for miami Change-Id: I3cc0cbeace8cf88a1fa634b4098ea60156dc6541 Signed-off-by: zhoujs3 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-on: https://gerrit.mot.com/2205165 Reviewed-by: Reviewed-by: Zhuoran Xu --- blair-camera-sensor-mot-miami-overlay.dtsi | 646 +++++++++++++++++++++ 1 file changed, 646 insertions(+) create mode 100644 blair-camera-sensor-mot-miami-overlay.dtsi diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi new file mode 100644 index 000000000000..c7b4eb3e9f92 --- /dev/null +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -0,0 +1,646 @@ +#include +#include +#include "blair-camera-flash-pwm.dtsi" + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_ois_ldo_en_default: cam_ois_ldo_en_default { + mux { + pins = "gpio86"; + function = "gpio"; + }; + config { + pins = "gpio86"; + bias-pull-up; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + + flash_active: flash_active { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + flash_suspend: flash_suspend { + /* MCLK 0*/ + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; +}; + +&L21A{ + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3000000>; + qcom,init-voltage = <2500000>; + status = "okay"; +}; + +&pm6125_pwm { + status = "ok"; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + gpios-shared = <404>; + pinctrl-names = "flash_active", "flash_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + }; + + cam_ois_ldo: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_ois_ldo"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 86 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_ldo_en_default>; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2805000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo3>; + cam_v_custom1-supply = <&cam_ois_ldo>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1805000 2805000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <3000>; + cci-master = <0>; + status = "ok"; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + eeprom-src = <&eeprom_main>; + ois-src = <&ois_main>; + led-flash-src = <&led_flash_rear>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo4>; + cam_vdig-supply = <&cam_pmic_ldo1>; + cam_clk-supply = <&gcc_camss_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 = <1805000 2805000 1100000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo6>; + cam_vdig-supply = <&L21A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2500000 0>; + rgltr-max-voltage = <1805000 2805000 2500000 0>; + rgltr-load-current = <120000 80000 2500000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + eeprom-src = <&eeprom_macro>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1805000 2805000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-type = ; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&flash_active>; + pinctrl-1 = <&flash_suspend>; + gpios = <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + status = "ok"; + }; + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vana-supply = <&cam_pmic_ldo5>; + cam_vdig-supply = <&cam_pmic_ldo2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + +}; From f4e02796a3a6849ccf14e47dd290395e855ce588 Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Mon, 28 Mar 2022 11:08:48 +0800 Subject: [PATCH 099/183] arm64/dts: maimi: bringup front camera ov32c4c Change-Id: I7ff4b58ff9ff7cc802e6f1e1b0c6b46869a163ab Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2227146 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Wang Liu Reviewed-by: Shuo Wang Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Tested-by: Jira Key Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index c7b4eb3e9f92..8480e3d35a48 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -434,31 +434,31 @@ sensor-position-yaw = <0>; eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo6>; - cam_vdig-supply = <&L21A>; + cam_vana-supply = <&cam_pmic_ldo4>; + cam_vdig-supply = <&cam_pmic_ldo2>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2500000 0>; - rgltr-max-voltage = <1805000 2805000 2500000 0>; - rgltr-load-current = <120000 80000 2500000 0>; + rgltr-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1100000 0>; + rgltr-load-current = <120000 80000 1100000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_reset_suspend>; gpios = <&tlmm 31 0>, <&tlmm 34 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK0", + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_FW_RST"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; From 4cc17ff6ba77be22a02e6b3a52bdaf913b93cc64 Mon Sep 17 00:00:00 2001 From: zhaoxy41 Date: Wed, 30 Mar 2022 11:10:46 +0800 Subject: [PATCH 100/183] arm64/dts: Miami: s5kgw3 bring up details: add s5kgw3 camera dts Change-Id: I533ebcaa1fd4860af4d3775577f268eef83cbfaf Signed-off-by: zhaoxy41 Reviewed-on: https://gerrit.mot.com/2229119 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 8480e3d35a48..b4bd0f3a983b 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -384,43 +384,43 @@ status = "ok"; }; - sensor_main: qcom,cam-sensor@0 { + sensor_main: qcom,cam-sensor@0 { cell-index = <0>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <0>; + csiphy-sd-index = <1>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - actuator-src = <&actuator_main>; - eeprom-src = <&eeprom_main>; - ois-src = <&ois_main>; - led-flash-src = <&led_flash_rear>; + //actuator-src = <&actuator_main>; + //eeprom-src = <&eeprom_main>; + //ois-src = <&ois_main>; + //led-flash-src = <&led_flash_rear>; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo4>; + cam_vana-supply = <&cam_pmic_ldo3>; cam_vdig-supply = <&cam_pmic_ldo1>; cam_clk-supply = <&gcc_camss_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 = <1805000 2805000 1100000 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 + pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_main_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend + pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_main_reset_suspend>; - gpios = <&tlmm 30 0>, + gpios = <&tlmm 29 0>, <&tlmm 35 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", + gpio-req-tbl-label = "CAMIF_MCLK0", "CAM_RM_RST"; cci-master = <1>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; From 1dc19f5b3fd594a943277b83d17be1a58b59314f Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Wed, 30 Mar 2022 07:30:15 -0500 Subject: [PATCH 101/183] Revert "(CR): arm64/dts: maimi: bringup front camera ov32c4c" This reverts commit 71f0f376b584395654247ee269f2aba9c7ac51c0. Change-Id: Ie20ab4ed781a7ee0bb4977821bc3b614905749f6 Reviewed-on: https://gerrit.mot.com/2229686 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index b4bd0f3a983b..b15094ea01bb 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -434,31 +434,31 @@ sensor-position-yaw = <0>; eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo4>; - cam_vdig-supply = <&cam_pmic_ldo2>; + cam_vana-supply = <&cam_pmic_ldo6>; + cam_vdig-supply = <&L21A>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1100000 0>; - rgltr-max-voltage = <1800000 2800000 1100000 0>; - rgltr-load-current = <120000 80000 1100000 0>; + rgltr-min-voltage = <1800000 2800000 2500000 0>; + rgltr-max-voltage = <1805000 2805000 2500000 0>; + rgltr-load-current = <120000 80000 2500000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active + pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_front_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend + pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_front_reset_suspend>; gpios = <&tlmm 31 0>, <&tlmm 34 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", + gpio-req-tbl-label = "CAMIF_MCLK0", "CAM_FW_RST"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; From 519d92c788cc56771412fcd3fc2f649fb96b8d5b Mon Sep 17 00:00:00 2001 From: hansx3 Date: Mon, 28 Mar 2022 14:28:05 +0800 Subject: [PATCH 102/183] arm64/dts: rhodei: add camera dts details: add camera dts for rhodei Change-Id: I72f9313e285fc6be8a998cf5c5d0aecf05cc1fed Signed-off-by: hansx3 Reviewed-on: https://gerrit.mot.com/2227347 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: XiaoFeng Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- ...camera-sensor-mot-rhodei-dvt2-overlay.dtsi | 680 ------------------ blair-camera-sensor-mot-rhodei-overlay.dtsi | 569 +++++++++------ 2 files changed, 347 insertions(+), 902 deletions(-) delete mode 100644 blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi diff --git a/blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi b/blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi deleted file mode 100644 index 90d3e668c13e..000000000000 --- a/blair-camera-sensor-mot-rhodei-dvt2-overlay.dtsi +++ /dev/null @@ -1,680 +0,0 @@ -#include -#include - -/delete-node/ &cam_sensor_mclk0_active; -/delete-node/ &cam_sensor_mclk1_active; -/delete-node/ &cam_sensor_mclk2_active; -/delete-node/ &cam_sensor_mclk3_active; -/delete-node/ &cam_sensor_main_reset_active; -/delete-node/ &cam_sensor_front_reset_active; -/delete-node/ &cam_sensor_macro_reset_active; -/delete-node/ &cam_sensor_wide_reset_active; -/delete-node/ &flash_active; -/delete-node/ &cam_sensor_mclk0_suspend; -/delete-node/ &cam_sensor_mclk1_suspend; -/delete-node/ &cam_sensor_mclk2_suspend; -/delete-node/ &cam_sensor_mclk3_suspend; -/delete-node/ &cam_sensor_main_reset_suspend; -/delete-node/ &cam_sensor_front_reset_suspend; -/delete-node/ &cam_sensor_macro_reset_suspend; -/delete-node/ &cam_sensor_wide_reset_suspend; -/delete-node/ &flash_suspend; -/delete-node/ &cam_ois_ldo_en_default; -/delete-node/ &cam_ois_ldo; -/delete-node/ &actuator_main; -/delete-node/ &ois_main; -/delete-node/ &eeprom_main; -/delete-node/ &eeprom_front; -/delete-node/ &led_flash_rear; -/delete-node/ &sensor_main; -/delete-node/ &sensor_front; -/delete-node/ &eeprom_macro; -/delete-node/ &led_flash_macro; -/delete-node/ &sensor_macro; -/delete-node/ &eeprom_wide; -/delete-node/ &led_flash_wide; -/delete-node/ &sensor_wide; -/delete-node/ &cam_ois_vsync_irq_default; - -&tlmm { - cam_sensor_mclk0_active: cam_sensor_mclk0_active { - mux { - pins = "gpio29"; - function = "cam_mclk"; - }; - - config { - pins = "gpio29"; - bias-disable; /* No PULL */ - drive-strength = <4>; /* 2 MA */ - }; - }; - - cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { - mux { - pins = "gpio29"; - function = "cam_mclk"; - }; - - config { - pins = "gpio29"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; /* 2 MA */ - }; - }; - - cam_sensor_mclk1_active: cam_sensor_mclk1_active { - mux { - pins = "gpio30"; - function = "cam_mclk"; - }; - - config { - pins = "gpio30"; - bias-disable; /* No PULL */ - drive-strength = <2>; - }; - }; - - cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { - mux { - pins = "gpio30"; - function = "cam_mclk"; - }; - - config { - pins = "gpio30"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; - }; - }; - - cam_sensor_mclk2_active: cam_sensor_mclk2_active { - mux { - pins = "gpio31"; - function = "cam_mclk"; - }; - - config { - pins = "gpio31"; - bias-disable; /* No PULL */ - drive-strength = <4>; - }; - }; - - cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { - mux { - pins = "gpio31"; - function = "cam_mclk"; - }; - - config { - pins = "gpio31"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; - }; - }; - - cam_sensor_mclk3_active: cam_sensor_mclk3_active { - mux { - pins = "gpio32"; - function = "cam_mclk"; - }; - - config { - pins = "gpio32"; - bias-disable; /* No PULL */ - drive-strength = <2>; - }; - }; - - cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { - mux { - pins = "gpio32"; - function = "cam_mclk"; - }; - - config { - pins = "gpio32"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; - }; - }; - - cam_sensor_main_reset_active: cam_sensor_main_reset_active { - mux { - pins = "gpio35"; - function = "gpio"; - }; - - config { - pins = "gpio35"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { - mux { - pins = "gpio35"; - function = "gpio"; - }; - - config { - pins = "gpio35"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - - cam_sensor_front_reset_active: cam_sensor_front_reset_active { - mux { - pins = "gpio34"; - function = "gpio"; - }; - - config { - pins = "gpio34"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { - mux { - pins = "gpio34"; - function = "gpio"; - }; - - config { - pins = "gpio34"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - - cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { - mux { - pins = "gpio36"; - function = "gpio"; - }; - - config { - pins = "gpio36"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { - mux { - pins = "gpio36"; - function = "gpio"; - }; - - config { - pins = "gpio36"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - - cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { - mux { - pins = "gpio37"; - function = "gpio"; - }; - - config { - pins = "gpio37"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { - mux { - pins = "gpio37"; - function = "gpio"; - }; - - config { - pins = "gpio37"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - cam_ois_ldo_en_default: cam_ois_ldo_en_default { - mux { - pins = "gpio86"; - function = "gpio"; - }; - config { - pins = "gpio86"; - bias-pull-up; /* NO PULL */ - drive-strength = <2>; /* 2 MA */ - output-high; - }; - }; - - flash_active: flash_active { - /* MCLK 0*/ - mux { - pins = "gpio49"; - function = "gpio"; - }; - - config { - pins = "gpio49"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - flash_suspend: flash_suspend { - /* MCLK 0*/ - mux { - pins = "gpio49"; - function = "gpio"; - }; - - config { - pins = "gpio49"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - - cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { - mux { - pins = "gpio51"; - function = "gpio"; - }; - config { - pins = "gpio51"; - drive-strength = <2>; - input-enable; - }; - }; -}; - -&L21A{ - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <3000000>; - qcom,init-voltage = <2500000>; - status = "okay"; -}; - -&pm6125_pwm { - status = "ok"; -}; - -&soc { - qcom,cam-res-mgr { - compatible = "qcom,cam-res-mgr"; - status = "ok"; - gpios-shared = <404>; - pinctrl-names = "flash_active", "flash_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - }; - - cam_ois_ldo: gpio-regulator@0{ - compatible = "regulator-fixed"; - reg = <0x00 0x00>; - regulator-name = "cam_ois_ldo"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - regulator-enable-ramp-delay = <233>; - enable-active-high; - gpio = <&tlmm 86 0>; - pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_ldo_en_default>; - }; -}; - -&cam_cci0 { - actuator_main: qcom,actuator@0 { - cell-index = <0>; - compatible = "qcom,actuator"; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vaf-supply = <&cam_pmic_ldo3>; - cam_v_custom1-supply = <&cam_ois_ldo>; - regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1805000 2805000 2805000>; - rgltr-load-current = <120000 100000 100000>; - cci-master = <1>; - status = "ok"; - }; - - ois_main: qcom,ois@0 { - cell-index = <0>; - compatible = "qcom,ois"; - interrupt-parent = <&tlmm>; - interrupts = <51 IRQ_TYPE_EDGE_RISING>; - vsync-irq-support; - pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_vsync_irq_default>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vaf-supply = <&cam_pmic_ldo3>; - cam_v_custom1-supply = <&cam_ois_ldo>; - regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1805000 2805000 2800000>; - rgltr-load-current = <120000 100000 100000>; - cci-master = <1>; - status = "ok"; - }; - - eeprom_main: qcom,eeprom@0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1805000>; - rgltr-load-current = <120000>; - cci-master = <1>; - status = "ok"; - }; - - eeprom_front: qcom,eeprom@1 { - cell-index = <1>; - reg = <0x1>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; - regulator-names = "cam_vio"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1805000>; - rgltr-load-current = <3000>; - cci-master = <0>; - status = "ok"; - }; - - led_flash_rear: qcom,camera-flash@0 { - cell-index = <0>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; - - sensor_main: qcom,cam-sensor@0 { - cell-index = <0>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <0>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - actuator-src = <&actuator_main>; - eeprom-src = <&eeprom_main>; - ois-src = <&ois_main>; - led-flash-src = <&led_flash_rear>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo4>; - cam_vdig-supply = <&cam_pmic_ldo1>; - cam_clk-supply = <&gcc_camss_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 = <1805000 2805000 1100000 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_main_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_main_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 35 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RM_RST"; - cci-master = <1>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - sensor_front: qcom,cam-sensor@1 { - cell-index = <1>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <3>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <0>; - eeprom-src = <&eeprom_front>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo6>; - cam_vdig-supply = <&L21A>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2500000 0>; - rgltr-max-voltage = <1805000 2805000 2500000 0>; - rgltr-load-current = <120000 80000 2500000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active - &cam_sensor_front_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_front_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 34 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK0", - "CAM_FW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; -}; - -&cam_cci1 { - eeprom_macro: qcom,eeprom@2 { - cell-index = <2>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1805000 2805000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk3_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - led_flash_macro: qcom,camera-flash@2 { - cell-index = <2>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; - sensor_macro: qcom,cam-sensor@2 { - cell-index = <2>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_macro>; - eeprom-src = <&eeprom_macro>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1805000 2805000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk3_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - eeprom_wide: qcom,eeprom@3 { - cell-index = <3>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_vdig-supply = <&cam_pmic_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 36 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - led_flash_wide: qcom,camera-flash@3 { - cell-index = <3>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; - sensor_wide: qcom,cam-sensor@3 { - cell-index = <3>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_wide>; - eeprom-src = <&eeprom_wide>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_vdig-supply = <&cam_pmic_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 36 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - -}; diff --git a/blair-camera-sensor-mot-rhodei-overlay.dtsi b/blair-camera-sensor-mot-rhodei-overlay.dtsi index d7c966f1c569..e03fc7adc0c0 100644 --- a/blair-camera-sensor-mot-rhodei-overlay.dtsi +++ b/blair-camera-sensor-mot-rhodei-overlay.dtsi @@ -1,6 +1,5 @@ #include #include -#include "blair-camera-flash-pwm.dtsi" &tlmm { cam_sensor_mclk0_active: cam_sensor_mclk0_active { @@ -12,7 +11,7 @@ config { pins = "gpio29"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 2 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -25,7 +24,7 @@ config { pins = "gpio29"; bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; /* 2 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -64,7 +63,7 @@ config { pins = "gpio31"; bias-disable; /* No PULL */ - drive-strength = <4>; + drive-strength = <2>; }; }; @@ -77,7 +76,7 @@ config { pins = "gpio31"; bias-pull-down; /* PULL DOWN */ - drive-strength = <4>; + drive-strength = <2>; }; }; @@ -90,7 +89,7 @@ config { pins = "gpio32"; bias-disable; /* No PULL */ - drive-strength = <2>; + drive-strength = <2>; /* 2 MA */ }; }; @@ -103,7 +102,7 @@ config { pins = "gpio32"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; + drive-strength = <2>; /* 2 MA */ }; }; @@ -214,93 +213,276 @@ output-low; }; }; - cam_ois_ldo_en_default: cam_ois_ldo_en_default { + + cam_rear_avdd_en_default: cam_rear_avdd_en_default { mux { - pins = "gpio86"; + pins = "gpio49"; function = "gpio"; }; + config { - pins = "gpio86"; - bias-pull-up; /* NO PULL */ + pins = "gpio49"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_rear_dvdd_en_default: cam_rear_dvdd_en_default { + mux { + pins = "gpio33"; + function = "gpio"; + }; + + config { + pins = "gpio33"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_rear_af_en_default: cam_rear_af_en_default { + mux { + pins = "gpio56"; + function = "gpio"; + }; + + config { + pins = "gpio56"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_rear_adj_en_default: cam_rear_adj_en_default { + mux { + pins = "gpio47"; + function = "gpio"; + }; + + config { + pins = "gpio47"; + bias-disable; /* NO PULL */ + drive-strength = <2>; /* 2 MA */ + input-high; + }; + }; + + cam_front_avdd_en_default: cam_front_avdd_en_default { + mux { + pins = "gpio87"; + function = "gpio"; + }; + + config { + pins = "gpio87"; + bias-pull-up; /* PULL UP */ drive-strength = <2>; /* 2 MA */ output-high; }; }; - flash_active: flash_active { - /* MCLK 0*/ + cam_wide_dvdd_en_default: cam_wide_dvdd_en_default { mux { - pins = "gpio49"; + pins = "gpio46"; function = "gpio"; }; config { - pins = "gpio49"; + pins = "gpio46"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + + cam_wide_macro_avdd_en_default: cam_wide_macro_avdd_en_default { + mux { + pins = "gpio45"; + function = "gpio"; + }; + + config { + pins = "gpio45"; + bias-pull-up; /* PULL UP */ + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + cam_flash_en_active: cam_flash_en_active { + mux { + pins = "gpio102"; + function = "gpio"; + }; + + config { + pins = "gpio102"; bias-disable; /* No PULL */ drive-strength = <2>; /* 2 MA */ }; }; - - flash_suspend: flash_suspend { - /* MCLK 0*/ + cam_flash_en_suspend: cam_flash_en_suspend { mux { - pins = "gpio49"; + pins = "gpio102"; function = "gpio"; }; config { - pins = "gpio49"; + pins = "gpio102"; bias-pull-down; /* PULL DOWN */ drive-strength = <2>; /* 2 MA */ output-low; }; }; - - cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + cam_flash_torch_active: cam_flash_torch_active { + /* AFVDD */ mux { - pins = "gpio51"; + pins = "gpio57"; function = "gpio"; }; + config { - pins = "gpio51"; - drive-strength = <2>; - input-enable; + pins = "gpio57"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + cam_flash_torch_suspend: cam_flash_torch_suspend { + /* AFVDD */ + mux { + pins = "gpio57"; + function = "gpio"; + }; + + config { + pins = "gpio57"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; }; }; }; -&L21A{ +&L3A{ regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; qcom,init-voltage = <1200000>; status = "okay"; }; -&pm6125_pwm { - status = "ok"; -}; - &soc { qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; - gpios-shared = <404>; - pinctrl-names = "flash_active", "flash_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; }; - cam_ois_ldo: gpio-regulator@0{ + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; + + cam_rear_avdd: gpio-regulator@4{ compatible = "regulator-fixed"; - reg = <0x00 0x00>; - regulator-name = "cam_ois_ldo"; + reg = <0x04 0x04>; + regulator-name = "cam_rear_avdd"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-enable-ramp-delay = <233>; enable-active-high; - gpio = <&tlmm 86 0>; + gpio = <&tlmm 49 0>; pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_ldo_en_default>; + pinctrl-0 = <&cam_rear_avdd_en_default>; + }; + cam_rear_dvdd: gpio-regulator@5{ + compatible = "regulator-fixed"; + reg = <0x05 0x05>; + regulator-name = "cam_rear_dvdd"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 33 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_rear_dvdd_en_default>; + vin-supply = <&S6A>; + }; + cam_rear_af: gpio-regulator@6{ + compatible = "regulator-fixed"; + reg = <0x06 0x06>; + regulator-name = "cam_rear_af"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 56 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_rear_af_en_default>; + }; + cam_front_avdd: gpio-regulator@3{ + compatible = "regulator-fixed"; + reg = <0x02 0x02>; + regulator-name = "cam_front_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 87 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_front_avdd_en_default>; + /*vin-supply = <&BOB>;*/ + }; + + cam_wide_dvdd: gpio-regulator@0{ + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "cam_wide_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 46 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_dvdd_en_default>; + vin-supply = <&S6A>; + }; + + cam_wide_macro_avdd: gpio-regulator@1{ + compatible = "regulator-fixed"; + reg = <0x01 0x01>; + regulator-name = "cam_wide_macro_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 45 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_wide_macro_avdd_en_default>; + /*vin-supply = <&BOB>;*/ + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + cci-master = <0>; + flash-type = ; + cam_vio-supply = <&L9A>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; + gpios = <&tlmm 102 0>, + <&tlmm 57 0>; + gpio-custom1 = <0>; + gpio-custom2 = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <0 0>; + gpio-req-tbl-label = "SENSOR_CUSTOM_GPIO1", + "SENSOR_CUSTOM_GPIO2"; + status = "ok"; }; }; @@ -308,47 +490,26 @@ actuator_main: qcom,actuator@0 { cell-index = <0>; compatible = "qcom,actuator"; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vaf-supply = <&cam_pmic_ldo3>; - cam_v_custom1-supply = <&cam_ois_ldo>; - regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + cam_vaf-supply = <&cam_rear_af>; + regulator-names = "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1805000 2805000 2805000>; - rgltr-load-current = <120000 100000 100000>; - cci-master = <1>; - status = "ok"; - }; - - ois_main: qcom,ois@0 { - cell-index = <0>; - compatible = "qcom,ois"; - interrupt-parent = <&tlmm>; - interrupts = <51 IRQ_TYPE_EDGE_RISING>; - vsync-irq-support; - pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_vsync_irq_default>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vaf-supply = <&cam_pmic_ldo3>; - cam_v_custom1-supply = <&cam_ois_ldo>; - regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1805000 2805000 2800000>; - rgltr-load-current = <120000 100000 100000>; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; cci-master = <1>; status = "ok"; + multi-user-support; }; eeprom_main: qcom,eeprom@0 { cell-index = <0>; reg = <0x0>; compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; + cam_vio-supply = <&L9A>; regulator-names = "cam_vio"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1805000>; + rgltr-max-voltage = <1800000>; rgltr-load-current = <120000>; cci-master = <1>; status = "ok"; @@ -358,74 +519,69 @@ cell-index = <1>; reg = <0x1>; compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; + cam_vio-supply = <&L9A>; regulator-names = "cam_vio"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1805000>; + rgltr-max-voltage = <1800000>; rgltr-load-current = <3000>; cci-master = <0>; status = "ok"; }; - led_flash_rear: qcom,camera-flash@0 { - cell-index = <0>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; - - sensor_main: qcom,cam-sensor@0 { + qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <0>; + csiphy-sd-index = <1>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_main>; eeprom-src = <&eeprom_main>; - ois-src = <&ois_main>; led-flash-src = <&led_flash_rear>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo4>; - cam_vdig-supply = <&cam_pmic_ldo1>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_rear_avdd>; + cam_vdig-supply = <&cam_rear_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_rear_af>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_clk", "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1805000 2805000 1100000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_main_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_main_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 35 0>; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active + &cam_flash_en_active + &cam_rear_adj_en_default>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend + &cam_flash_en_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>, + <&tlmm 102 0>, + <&tlmm 47 0>; gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RM_RST"; + gpio-custom2 = <2>; + gpio-custom1 = <3>; + gpio-req-tbl-num = <0 1 2 3>; + gpio-req-tbl-flags = <1 0 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0", + "CAM_FLASH_EN", + "CAM_DVDD_SEL0"; cci-master = <1>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + need-change-cci-master; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - sensor_front: qcom,cam-sensor@1 { + + qcom,cam-sensor1 { cell-index = <1>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <3>; @@ -433,32 +589,32 @@ sensor-position-pitch = <0>; sensor-position-yaw = <0>; eeprom-src = <&eeprom_front>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo6>; - cam_vdig-supply = <&L21A>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_front_avdd>; + cam_vdig-supply = <&L3A>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_reset_suspend>; gpios = <&tlmm 31 0>, <&tlmm 34 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK0", - "CAM_FW_RST"; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET0"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; @@ -469,82 +625,104 @@ eeprom_macro: qcom,eeprom@2 { cell-index = <2>; compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_wide_macro_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1805000 2805000 0>; + rgltr-max-voltage = <1800000 2800000 0>; rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk3_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 30 0>, <&tlmm 37 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - led_flash_macro: qcom,camera-flash@2 { - cell-index = <2>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; - sensor_macro: qcom,cam-sensor@2 { + qcom,cam-sensor2 { cell-index = <2>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <2>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - led-flash-src = <&led_flash_macro>; eeprom-src = <&eeprom_macro>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; + led-flash-src = <&led_flash_rear>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_wide_macro_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; + regulator-names = "cam_vio","cam_vana", "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1805000 2805000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 120000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_reset_active + &cam_flash_en_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend + &cam_flash_en_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>, + <&tlmm 102 0>; + gpio-reset = <1>; + gpio-custom2 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET2", + "CAM_FLASH_EN"; + cci-master = <0>; + status = "ok"; + need-change-cci-master; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_wide_macro_avdd>; + cam_vdig-supply = <&cam_wide_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_macro_reset_active>; + &cam_sensor_wide_reset_active>; pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_wide_reset_suspend>; gpios = <&tlmm 32 0>, - <&tlmm 37 0>; + <&tlmm 36 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; + "CAM_RESET3"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; @@ -552,95 +730,42 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - eeprom_wide: qcom,eeprom@3 { - cell-index = <3>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_vdig-supply = <&cam_pmic_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 36 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - led_flash_wide: qcom,camera-flash@3 { - cell-index = <3>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; - sensor_wide: qcom,cam-sensor@3 { + qcom,cam-sensor3 { cell-index = <3>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; + csiphy-sd-index = <0>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_vdig-supply = <&cam_pmic_ldo2>; + cam_vio-supply = <&L9A>; + cam_vana-supply = <&cam_wide_macro_avdd>; + cam_vdig-supply = <&cam_wide_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1205000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 0>; rgltr-load-current = <120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active + pinctrl-0 = <&cam_sensor_mclk3_active &cam_sensor_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend + pinctrl-1 = <&cam_sensor_mclk3_suspend &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 31 0>, + gpios = <&tlmm 32 0>, <&tlmm 36 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RW_RST"; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET3"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - }; From 261116420b8f43eef60ff84c98e6a47c0dbb2839 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Wed, 30 Mar 2022 17:14:58 +0800 Subject: [PATCH 103/183] arm64/dts: miami: ad actuator dts [detail] add aw86006 actuator dts Change-Id: I62f9c1675de5979557c36a28ce840f39d4170250 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2229529 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Shuo Wang Reviewed-by: Pengfei Qiao Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index b15094ea01bb..666fe515cef7 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -309,13 +309,13 @@ cell-index = <0>; compatible = "qcom,actuator"; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vaf-supply = <&cam_pmic_ldo3>; - cam_v_custom1-supply = <&cam_ois_ldo>; + cam_vaf-supply = <&cam_pmic_ldo5>; + cam_v_custom1-supply = <&cam_pmic_ldo6>; regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1805000 2805000 2805000>; - rgltr-load-current = <120000 100000 100000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <500 300000 30000>; cci-master = <1>; status = "ok"; }; @@ -391,7 +391,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //actuator-src = <&actuator_main>; + actuator-src = <&actuator_main>; //eeprom-src = <&eeprom_main>; //ois-src = <&ois_main>; //led-flash-src = <&led_flash_rear>; From 8cea2f030dca02123f469a8906a45ba569c8e9a0 Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Thu, 31 Mar 2022 16:28:04 +0800 Subject: [PATCH 104/183] arm64/dts: maimi: bringup rw camera hi1336 Change-Id: I68c450b9d5e652c696d112f8bbb84abcb2b78fc5 Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2230740 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Reviewed-by: Pengfei Qiao Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 666fe515cef7..72c44353c63a 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -605,38 +605,38 @@ sensor_wide: qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; + csiphy-sd-index = <0>; sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - led-flash-src = <&led_flash_wide>; - eeprom-src = <&eeprom_wide>; + //led-flash-src = <&led_flash_wide>; + //eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; + cam_vana-supply = <&cam_pmic_ldo4>; cam_vdig-supply = <&cam_pmic_ldo2>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1205000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1100000 0>; + rgltr-load-current = <3000 81000 36000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active + pinctrl-0 = <&cam_sensor_mclk3_active &cam_sensor_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend + pinctrl-1 = <&cam_sensor_mclk3_suspend &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 31 0>, + gpios = <&tlmm 32 0>, <&tlmm 36 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", + gpio-req-tbl-label = "CAMIF_MCLK3", "CAM_RW_RST"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; From b1349d7fa9d436e3cda6e9d603cbc5087f8610e9 Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Fri, 1 Apr 2022 09:19:09 +0800 Subject: [PATCH 105/183] arm64/dts: maimi: bringup eeprom gt24p64e of rw camera hi1336 Change-Id: Idd251ff80c9930d46c40685b4df84eb42ffd1d05 Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2231469 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Pengfei Qiao Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 33 +++++----------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 72c44353c63a..e91dc1119537 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -555,36 +555,17 @@ eeprom_wide: qcom,eeprom@3 { cell-index = <3>; + reg = <0x3>; compatible = "qcom,eeprom"; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_vdig-supply = <&cam_pmic_ldo2>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + regulator-names = "cam_vio"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1805000 2805000 1205000 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_wide_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_wide_reset_suspend>; - gpios = <&tlmm 31 0>, - <&tlmm 36 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RW_RST"; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1805000>; + rgltr-load-current = <120000>; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; + }; led_flash_wide: qcom,camera-flash@3 { @@ -610,7 +591,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; //led-flash-src = <&led_flash_wide>; - //eeprom-src = <&eeprom_wide>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; cam_vdig-supply = <&cam_pmic_ldo2>; From b854b70ebf5326101c8b429c5177e337bffa7300 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Wed, 23 Mar 2022 14:21:45 +0800 Subject: [PATCH 106/183] arm64/dts: miami: add aw86006 ois dts [detail] add aw86006 ois dts. Change-Id: I9fea8ea8355e6b3d810e00a61552561b07a04ee0 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2223838 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 28 ++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index e91dc1119537..c8dff8da2ea2 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -305,6 +305,18 @@ }; &cam_cci0 { + i2c_freq_100Khz_cci0: qcom,i2c_standard_mode { + hw-scl-stretch-en = <1>; + }; + + i2c_freq_400Khz_cci0: qcom,i2c_fast_mode { + hw-scl-stretch-en = <0>; + }; + + i2c_freq_1Mhz_cci0: qcom,i2c_fast_plus_mode { + hw-scl-stretch-en = <1>; + }; + actuator_main: qcom,actuator@0 { cell-index = <0>; compatible = "qcom,actuator"; @@ -323,21 +335,17 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; - interrupt-parent = <&tlmm>; - interrupts = <51 IRQ_TYPE_EDGE_RISING>; - vsync-irq-support; - pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vaf-supply = <&cam_pmic_ldo3>; - cam_v_custom1-supply = <&cam_ois_ldo>; + cam_vaf-supply = <&cam_pmic_ldo5>; + cam_v_custom1-supply = <&cam_pmic_ldo6>; regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 2800000>; - rgltr-max-voltage = <1805000 2805000 2800000>; - rgltr-load-current = <120000 100000 100000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <500 300000 30000>; cci-master = <1>; status = "ok"; + ois-name = "mot_aw86006"; }; eeprom_main: qcom,eeprom@0 { @@ -393,7 +401,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_main>; //eeprom-src = <&eeprom_main>; - //ois-src = <&ois_main>; + ois-src = <&ois_main>; //led-flash-src = <&led_flash_rear>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo3>; From c3edd386219e2605fbc104c2b03d0e48010dc99d Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Fri, 1 Apr 2022 20:19:55 +0800 Subject: [PATCH 107/183] arm64/dts: maimi: bringup front camera ov32b40 Change-Id: I7028cb03ffbe67de23b4c509ce0bb510630f7f19 Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2232171 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Pengfei Qiao Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index c8dff8da2ea2..20d1e3cd971d 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -440,33 +440,33 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - eeprom-src = <&eeprom_front>; + //eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo6>; - cam_vdig-supply = <&L21A>; + cam_vana-supply = <&cam_pmic_ldo4>; + cam_vdig-supply = <&cam_pmic_ldo2>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2500000 0>; - rgltr-max-voltage = <1805000 2805000 2500000 0>; - rgltr-load-current = <120000 80000 2500000 0>; + rgltr-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1100000 0>; + rgltr-load-current = <300 39000 93000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_reset_suspend>; gpios = <&tlmm 31 0>, <&tlmm 34 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK0", + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_FW_RST"; cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; clock-rates = <24000000>; From 6a24d8d9986e1fe9b1383bc2e145cdf5f257c8dc Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Sat, 2 Apr 2022 12:03:14 +0800 Subject: [PATCH 108/183] arm64/dts: miami: flash aw36515 bring up Change-Id: I6e0f9f58d6ec18b8d5f5341f16538d31a67c4275 Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2232680 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Pengfei Qiao Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 53 ++++++++++------------ 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 20d1e3cd971d..ecb499948520 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -376,19 +376,31 @@ status = "ok"; }; + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = ; + cci-master = <0>; + status = "ok"; + }; + led_flash_rear: qcom,camera-flash@0 { cell-index = <0>; compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; + cam_vio-supply = <&cam_pmic_ldo7>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = ; + cci-master = <0>; status = "ok"; }; @@ -402,7 +414,7 @@ actuator-src = <&actuator_main>; //eeprom-src = <&eeprom_main>; ois-src = <&ois_main>; - //led-flash-src = <&led_flash_rear>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo3>; cam_vdig-supply = <&cam_pmic_ldo1>; @@ -576,21 +588,6 @@ }; - led_flash_wide: qcom,camera-flash@3 { - cell-index = <3>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; sensor_wide: qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -598,7 +595,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //led-flash-src = <&led_flash_wide>; + led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; @@ -630,6 +627,4 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - }; From 8843865463c5454c77b2d0df399c65bc857e5b3d Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Thu, 7 Apr 2022 20:42:05 +0800 Subject: [PATCH 109/183] arm64/dts: miami: bring up Actuator dw9800v of rw camera hi1336 Change-Id: Ic5bf142f21cd79ff983642c8c4ad5789bddae3f1 Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2236251 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Pengfei Qiao Reviewed-by: Long Cheng Reviewed-by: Wang Liu Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index ecb499948520..4482f2e56012 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -588,6 +588,20 @@ }; + actuator_wide: qcom,actuator@3 { + cell-index = <3>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic_ldo7>; + cam_vaf-supply = <&cam_pmic_ldo5>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 >; + rgltr-max-voltage = <1800000 2800000 >; + rgltr-load-current = <3000 130000 >; + cci-master = <0>; + status = "ok"; + }; + sensor_wide: qcom,cam-sensor@3 { cell-index = <3>; compatible = "qcom,cam-sensor"; @@ -597,6 +611,7 @@ sensor-position-yaw = <180>; led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; + actuator-src = <&actuator_wide>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; cam_vdig-supply = <&cam_pmic_ldo2>; From a267dd2ac9cb9f1d3c70b649b01f1cec3bb46b87 Mon Sep 17 00:00:00 2001 From: zhaoxy41 Date: Mon, 11 Apr 2022 11:36:47 +0800 Subject: [PATCH 110/183] arm64/dts: Miami: s5kgw3 eeprom bring up details: add dts for s5kgw3 Change-Id: Ia6a0848a254d90f39fd3576bba3401c6c2a82d80 Signed-off-by: zhaoxy41 Reviewed-on: https://gerrit.mot.com/2238225 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Pengfei Qiao Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 4482f2e56012..9fee5406d5ce 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -412,7 +412,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_main>; - //eeprom-src = <&eeprom_main>; + eeprom-src = <&eeprom_main>; ois-src = <&ois_main>; led-flash-src = <&led_flash_rear>; cam_vio-supply = <&cam_pmic_ldo7>; From 710ae26c6c57433f50686d3b78189ff52bd76a30 Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Fri, 8 Apr 2022 16:24:16 +0800 Subject: [PATCH 111/183] arm64/dts: miami: bring up eeprom gtp24e64p of camera ov32b40 Change-Id: Ie52ee62f885726447a84007f776d26f8435aa54f Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2237243 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Pengfei Qiao Reviewed-by: Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 9fee5406d5ce..3cf0f6b90c24 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -452,7 +452,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - //eeprom-src = <&eeprom_front>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vana-supply = <&cam_pmic_ldo4>; cam_vdig-supply = <&cam_pmic_ldo2>; From 8c7ccc42a72dc84b1d2ce9f4426a7765815d84ca Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Sun, 24 Apr 2022 10:15:02 +0800 Subject: [PATCH 112/183] arm/dts: miami: modify ois dts [detail] remove ois unused dts config Change-Id: Ibae84f0aa0eaf7f8ae1190a16bab4dfdadbc569c Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2251073 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Shuo Wang Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 25 ---------------------- 1 file changed, 25 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 3cf0f6b90c24..3a6105567265 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -214,18 +214,6 @@ output-low; }; }; - cam_ois_ldo_en_default: cam_ois_ldo_en_default { - mux { - pins = "gpio86"; - function = "gpio"; - }; - config { - pins = "gpio86"; - bias-pull-up; /* NO PULL */ - drive-strength = <2>; /* 2 MA */ - output-high; - }; - }; flash_active: flash_active { /* MCLK 0*/ @@ -289,19 +277,6 @@ pinctrl-0 = <&flash_active>; pinctrl-1 = <&flash_suspend>; }; - - cam_ois_ldo: gpio-regulator@0{ - compatible = "regulator-fixed"; - reg = <0x00 0x00>; - regulator-name = "cam_ois_ldo"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - regulator-enable-ramp-delay = <233>; - enable-active-high; - gpio = <&tlmm 86 0>; - pinctrl-names = "default"; - pinctrl-0 = <&cam_ois_ldo_en_default>; - }; }; &cam_cci0 { From 47d73b0ccccd3ec177d0712ef00ac01e39df1321 Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Fri, 29 Apr 2022 17:56:59 +0800 Subject: [PATCH 113/183] camera-kernel: miami: Modify hi1336 and s5kgw3 hw sync details: -modify hi1336 cameraid 3 to cameraid 2 because there are only 3 cameras,so the eeprom and flash related to hi1336 must be change at the same time -remove unused codes Change-Id: I2778a258f406177b1b91e75c8ef8b91d9b53c669 Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2256850 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Wang Liu Reviewed-by: Shuo Wang Reviewed-by: Long Cheng Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 100 ++------------------- 1 file changed, 7 insertions(+), 93 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 3a6105567265..d9d9d414b2a4 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -351,8 +351,8 @@ status = "ok"; }; - led_flash_wide: qcom,camera-flash@3 { - cell-index = <3>; + led_flash_wide: qcom,camera-flash@2 { + cell-index = <2>; compatible = "qcom,camera-flash"; cam_vio-supply = <&cam_pmic_ldo7>; regulator-names = "cam_vio"; @@ -461,94 +461,8 @@ }; &cam_cci1 { - eeprom_macro: qcom,eeprom@2 { - cell-index = <2>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1805000 2805000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk3_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - led_flash_macro: qcom,camera-flash@2 { - cell-index = <2>; - compatible = "qcom,camera-flash"; - flash-type = ; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; - gpios = <&tlmm 49 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; - status = "ok"; - }; - sensor_macro: qcom,cam-sensor@2 { - cell-index = <2>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; - sensor-position-roll = <90>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_macro>; - eeprom-src = <&eeprom_macro>; - cam_vio-supply = <&cam_pmic_ldo7>; - cam_vana-supply = <&cam_pmic_ldo5>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", - "cam_clk"; - rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1805000 2805000 0>; - rgltr-load-current = <120000 80000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk3_active - &cam_sensor_macro_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; - gpios = <&tlmm 32 0>, - <&tlmm 37 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RW_RST"; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <24000000>; - }; - - eeprom_wide: qcom,eeprom@3 { + eeprom_wide: qcom,eeprom@2 { cell-index = <3>; reg = <0x3>; compatible = "qcom,eeprom"; @@ -563,8 +477,8 @@ }; - actuator_wide: qcom,actuator@3 { - cell-index = <3>; + actuator_wide: qcom,actuator@2 { + cell-index = <2>; compatible = "qcom,actuator"; cam_vio-supply = <&cam_pmic_ldo7>; cam_vaf-supply = <&cam_pmic_ldo5>; @@ -577,8 +491,8 @@ status = "ok"; }; - sensor_wide: qcom,cam-sensor@3 { - cell-index = <3>; + sensor_wide: qcom,cam-sensor@2 { + cell-index = <2>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <0>; sensor-position-roll = <90>; From 3d2d092be6f3401ba37257fc73e0a960429768fc Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Sat, 7 May 2022 09:58:56 +0800 Subject: [PATCH 114/183] arm/dts: miami: add ois vsync interrupt [detail] use gpio51 as ois vsync interrupt Change-Id: I385c012ef4de600c90347bf9edbb1c3c11b56e88 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/2262298 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: XiaoFeng Wang Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index d9d9d414b2a4..0034d6500516 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -310,6 +310,11 @@ ois_main: qcom,ois@0 { cell-index = <0>; compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; cam_vio-supply = <&cam_pmic_ldo7>; cam_vaf-supply = <&cam_pmic_ldo5>; cam_v_custom1-supply = <&cam_pmic_ldo6>; From f2ff5de9f44bb0f73873b4dcd4489b7fdb2dfeae Mon Sep 17 00:00:00 2001 From: caoqian4 Date: Fri, 10 Jun 2022 16:52:27 +0800 Subject: [PATCH 115/183] camera/dtsi:add dtsi to fix Penang vendor build error add blair-camera-sensor-mot-penang-overlay.dtsi to fix build error new product penang base on milanf Change-Id: I3aaf78212dff68532ae5e2615a6d6cec43e0fffe Signed-off-by: caoqian4 Reviewed-on: https://gerrit.mot.com/2296693 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao --- blair-camera-sensor-mot-penang-overlay.dtsi | 575 ++++++++++++++++++++ 1 file changed, 575 insertions(+) create mode 100644 blair-camera-sensor-mot-penang-overlay.dtsi diff --git a/blair-camera-sensor-mot-penang-overlay.dtsi b/blair-camera-sensor-mot-penang-overlay.dtsi new file mode 100644 index 000000000000..4c136a006efb --- /dev/null +++ b/blair-camera-sensor-mot-penang-overlay.dtsi @@ -0,0 +1,575 @@ +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_depth_reset_active: cam_sensor_depth_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_depth_reset_suspend: cam_sensor_depth_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_wide_reset_active: cam_sensor_wide_reset_active { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_wide_reset_suspend: cam_sensor_wide_reset_suspend { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio51"; + function = "gpio"; + }; + config { + pins = "gpio51"; + drive-strength = <2>; + input-enable; + }; + }; +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; + + led_flash_wide: qcom,camera-flash@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <0>; + status = "ok"; + }; +}; + +&cam_cci0 { + actuator_main: qcom,actuator@0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + ois_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + interrupt-parent = <&tlmm>; + interrupts = <51 IRQ_TYPE_EDGE_RISING>; + vsync-irq-support; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + cam_v_custom1-supply = <&cam_pmic1_ldo6_vddois>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000>; + rgltr-max-voltage = <1800000 2800000 2800000>; + rgltr-load-current = <120000 100000 100000>; + cci-master = <1>; + status = "ok"; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + sensor_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_main>; + led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_main>; + ois-src = <&ois_main>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo3_avdd1>; + cam_vdig-supply = <&cam_pmic1_ldo1_dvdd1>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1100000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1100000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RM_RST"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + sensor_front: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_FW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + +}; + +&cam_cci1 { + eeprom_depth: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + sensor_depth: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_depth>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_depth_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_depth_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RD_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_wide: qcom,eeprom@3 { + cell-index = <3>; + reg = <0x3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + actuator_wide: qcom,actuator@1 { + cell-index = <1>; + compatible = "qcom,actuator"; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <120000 100000>; + cci-master = <0>; + status = "ok"; + }; + + sensor_wide: qcom,cam-sensor@3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + led-flash-src = <&led_flash_wide>; + actuator-src = <&actuator_wide>; + eeprom-src = <&eeprom_wide>; + cam_vio-supply = <&cam_pmic1_ldo7_vddio>; + cam_vana-supply = <&cam_pmic1_ldo4_avdd2>; + cam_vdig-supply = <&cam_pmic1_ldo2_dvdd2>; + cam_vaf-supply = <&cam_pmic1_ldo5_vddaf>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_vaf", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 2800000 0>; + rgltr-load-current = <120000 80000 1200000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_wide_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_wide_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 36 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RW_RST"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 4f3a33098176b901cbf950c90ab2811885e20939 Mon Sep 17 00:00:00 2001 From: chenlj26 Date: Mon, 30 May 2022 20:05:05 +0800 Subject: [PATCH 116/183] arm64/dts: miami: modify Hi1336 mclk signal distortion details: enhanced driver current to 4ma remove unused files Change-Id: Ide14c7fececee35c65268819a83f794a202fba74 Signed-off-by: chenlj26 Reviewed-on: https://gerrit.mot.com/2284132 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Long Cheng Reviewed-by: Shuo Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-miami-overlay.dtsi | 90 +--------------------- 1 file changed, 2 insertions(+), 88 deletions(-) diff --git a/blair-camera-sensor-mot-miami-overlay.dtsi b/blair-camera-sensor-mot-miami-overlay.dtsi index 0034d6500516..19688d6acf0f 100644 --- a/blair-camera-sensor-mot-miami-overlay.dtsi +++ b/blair-camera-sensor-mot-miami-overlay.dtsi @@ -29,32 +29,6 @@ }; }; - cam_sensor_mclk1_active: cam_sensor_mclk1_active { - mux { - pins = "gpio30"; - function = "cam_mclk"; - }; - - config { - pins = "gpio30"; - bias-disable; /* No PULL */ - drive-strength = <2>; - }; - }; - - cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { - mux { - pins = "gpio30"; - function = "cam_mclk"; - }; - - config { - pins = "gpio30"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; - }; - }; - cam_sensor_mclk2_active: cam_sensor_mclk2_active { mux { pins = "gpio31"; @@ -90,7 +64,7 @@ config { pins = "gpio32"; bias-disable; /* No PULL */ - drive-strength = <2>; + drive-strength = <4>; }; }; @@ -103,7 +77,7 @@ config { pins = "gpio32"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; + drive-strength = <4>; }; }; @@ -188,62 +162,6 @@ }; }; - cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { - mux { - pins = "gpio37"; - function = "gpio"; - }; - - config { - pins = "gpio37"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { - mux { - pins = "gpio37"; - function = "gpio"; - }; - - config { - pins = "gpio37"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - - flash_active: flash_active { - /* MCLK 0*/ - mux { - pins = "gpio49"; - function = "gpio"; - }; - - config { - pins = "gpio49"; - bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - flash_suspend: flash_suspend { - /* MCLK 0*/ - mux { - pins = "gpio49"; - function = "gpio"; - }; - - config { - pins = "gpio49"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { mux { pins = "gpio51"; @@ -272,10 +190,6 @@ qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; - gpios-shared = <404>; - pinctrl-names = "flash_active", "flash_suspend"; - pinctrl-0 = <&flash_active>; - pinctrl-1 = <&flash_suspend>; }; }; From b21f1c853d67ebd06ba77328d33bab4abd90473c Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Mon, 18 Jul 2022 19:45:42 +0800 Subject: [PATCH 117/183] arm64/dts: penang: front camera tsp s5k4h7yx03 bring up details: Add penang front camera dtsi Change-Id: I2cd54d23cb2b134d0eb01b55369cb6f66f292458 Reviewed-on: https://gerrit.mot.com/2336582 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Zhuoran Xu Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 194 +++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 holi-camera-sensor-mot-penang-overlay.dtsi diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi new file mode 100644 index 000000000000..5dc5f29afa57 --- /dev/null +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -0,0 +1,194 @@ +#include +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + /* MCLK 0*/ + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + /* MCLK 0*/ + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + camera_ldo_dovdd_en: camera_ldo_dovdd_en { + mux { + pins = "gpio33"; + function = "gpio"; + }; + + config { + pins = "gpio33"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_8m_dvdd_en: camera_ldo_8m_dvdd_en { + mux { + pins = "gpio12"; + function = "gpio"; + }; + + config { + pins = "gpio12"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + +}; + +&soc { + camera_ldo_dovdd: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 33 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_dovdd_en>; + }; + + camera_ldo_8m_dvdd: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "camera_ldo_8m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_dvdd_en>; + vin-supply = <&S6A>; + }; + + camera_ldo_8m_avdd: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera_ldo_8m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_avdd_en>; + }; + + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + gpios-shared = <407>; + pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend"; + pinctrl-0 = <&cam_flash_hwen_active>; + pinctrl-1 = <&cam_flash_hwen_suspend>; + }; +}; + +&cam_cci0 { + /*MOTO Front 8M*/ + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&L3A>; // PMIC + // cam_vdig-supply = <&camera_ldo_8m_dvdd>; // LDO + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 2f89f5fc6969efa41ab257f785a3fddfd9ee3be5 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Fri, 22 Jul 2022 15:07:44 +0800 Subject: [PATCH 118/183] arm64/dts: penang: rear camera qtech s5kjn1 bring up details: Add penang rear camera dtsi Change-Id: I743ffe21d8209db547f5678162d56a7629184bd9 Reviewed-on: https://gerrit.mot.com/2341905 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 172 +++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index 5dc5f29afa57..a9b0e56d052d 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -30,6 +30,61 @@ }; }; + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + /* MCLK 1*/ + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + /* MCLK 1*/ + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { mux { pins = "gpio34"; @@ -70,6 +125,32 @@ }; }; + camera_ldo_50m_dvdd_en: camera_ldo_50m_dvdd_en { + mux { + pins = "gpio6"; + function = "gpio"; + }; + + config { + pins = "gpio6"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + camera_ldo_8m_dvdd_en: camera_ldo_8m_dvdd_en { mux { pins = "gpio12"; @@ -98,6 +179,13 @@ }; +&L21A{ + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + qcom,init-voltage = <2800000>; + status = "okay"; +}; + &soc { camera_ldo_dovdd: gpio-regulator@0 { compatible = "regulator-fixed"; @@ -112,6 +200,33 @@ pinctrl-0 = <&camera_ldo_dovdd_en>; }; + camera_ldo_50m_dvdd: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x01 0x00>; + regulator-name = "camera_ldo_50m_dvdd"; + regulator-min-microvolt = <1056000>; + regulator-max-microvolt = <1056000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_dvdd_en>; + vin-supply = <&S6A>; + }; + + camera_ldo_50m_avdd: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x02 0x00>; + regulator-name = "camera_ldo_50m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 36 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_avdd_en>; + }; + camera_ldo_8m_dvdd: gpio-regulator@3 { compatible = "regulator-fixed"; reg = <0x03 0x00>; @@ -150,6 +265,63 @@ }; &cam_cci0 { + /*MOTO Rear 50M AF*/ + actuator_rear: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <1>; + cam_vaf-supply = <&L21A>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + /*MOTO Rear 50M*/ + 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>; + actuator-src = <&actuator_rear>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vaf-supply = <&L21A>; + cam_vdig-supply = <&camera_ldo_50m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <1800000 2800000 2800000 1056000 0>; + rgltr-max-voltage = <1800000 2800000 2800000 1056000 0>; + rgltr-load-current = <120000 80000 100000 1200000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET1"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /*MOTO Front 8M*/ qcom,cam-sensor1 { cell-index = <1>; From 819d8daebfda5c3515d39668d728791226580d90 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Fri, 22 Jul 2022 16:11:40 +0800 Subject: [PATCH 119/183] arm64/dts: penang: macro camera ofilm ov02b10 bring up details: Add penang macro camera dtsi Remove flash gpio config Change-Id: Ibe7c65384bad5473d066e0052c242ff31971c70c Reviewed-on: https://gerrit.mot.com/2341966 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 128 ++++++++++++++++++++- 1 file changed, 124 insertions(+), 4 deletions(-) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index a9b0e56d052d..9548284cb7aa 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -58,6 +58,34 @@ }; }; + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + /* MCLK 3*/ + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + /* MCLK 3*/ + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + cam_sensor_main_reset_active: cam_sensor_main_reset_active { mux { pins = "gpio35"; @@ -112,6 +140,35 @@ }; }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + + camera_ldo_dovdd_en: camera_ldo_dovdd_en { mux { pins = "gpio33"; @@ -177,6 +234,19 @@ }; }; + camera_ldo_2m_avdd_en: camera_ldo_2m_avdd_en { + mux { + pins = "gpio51"; + function = "gpio"; + }; + + config { + pins = "gpio51"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + }; &L21A{ @@ -254,13 +324,22 @@ pinctrl-0 = <&camera_ldo_8m_avdd_en>; }; + camera_ldo_2m_avdd: gpio-regulator@5 { + compatible = "regulator-fixed"; + reg = <0x05 0x00>; + regulator-name = "camera_ldo_2m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 51 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_2m_avdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; - gpios-shared = <407>; - pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend"; - pinctrl-0 = <&cam_flash_hwen_active>; - pinctrl-1 = <&cam_flash_hwen_suspend>; }; }; @@ -364,3 +443,44 @@ clock-rates = <24000000>; }; }; + +&cam_cci1 { + /*MOTO Rear Aux 2M*/ + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 4886954c72f0c31b4a738dfc64f72e63e0007caa Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Mon, 25 Jul 2022 17:08:07 +0800 Subject: [PATCH 120/183] arm64/dts: penang: rear camera s5kjn1 eeprom bring up details: Add s5kjn1 eeprom dtsi config to penang camera dtsi. Change-Id: I0b234a6d489bbdeee5848824bba347e74a1da25e Reviewed-on: https://gerrit.mot.com/2343523 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Shuo Wang Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index 9548284cb7aa..42ce6b3c9297 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -358,6 +358,20 @@ status = "ok"; }; + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + /*MOTO Rear 50M*/ qcom,cam-sensor0 { cell-index = <0>; @@ -367,6 +381,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_rear>; + eeprom-src = <&eeprom_main>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vaf-supply = <&L21A>; From 70ef6fc038c54b7dc4abe449f63e2f585f772f99 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Wed, 27 Jul 2022 15:07:23 +0800 Subject: [PATCH 121/183] arm64/dts: penang: camera flash aw36518 bring up details: Add flash dtsi config to penang camera dtsi. Add flash to rear camera and macro camera. Change-Id: I776f58730c5e42fd80d9f732ada03278ce9a367f Reviewed-on: https://gerrit.mot.com/2346082 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Reviewed-by: Reviewed-by: Shuo Wang Reviewed-by: Wang Liu Reviewed-by: Long Cheng Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 107 +++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index 42ce6b3c9297..08b9d6bab0e3 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -247,6 +247,59 @@ }; }; + cam_flash_en_active: cam_flash_en_active { + mux { + pins = "gpio89"; + function = "gpio"; + }; + + config { + pins = "gpio89"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_flash_en_suspend: cam_flash_en_suspend { + mux { + pins = "gpio89"; + function = "gpio"; + }; + + config { + pins = "gpio89"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_flash_torch_active: cam_flash_torch_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_flash_torch_suspend: cam_flash_torch_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; }; &L21A{ @@ -382,6 +435,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_rear>; eeprom-src = <&eeprom_main>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vaf-supply = <&L21A>; @@ -460,6 +514,58 @@ }; &cam_cci1 { + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + cci-master = <0>; + flash-type = ; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; + gpios = <&tlmm 89 0>, + <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-custom2 = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <0 0>; + gpio-req-tbl-label = "CUSTOM_GPIO1", + "CUSTOM_GPIO2"; + status = "ok"; + }; + + led_flash_rear_aux: qcom,camera-flash@1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + cci-master = <0>; + flash-type = ; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; + gpios = <&tlmm 89 0>, + <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-custom2 = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <0 0>; + gpio-req-tbl-label = "CUSTOM_GPIO1", + "CUSTOM_GPIO2"; + status = "ok"; + }; + /*MOTO Rear Aux 2M*/ qcom,cam-sensor2 { cell-index = <2>; @@ -468,6 +574,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + led-flash-src = <&led_flash_rear_aux>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; From c667abaab6233a088bb2b066c36c691c52ad3c7b Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Wed, 27 Jul 2022 19:12:02 +0800 Subject: [PATCH 122/183] arm64/dts: penang: macro camera ov02b10 otp bring up details: Add ov02b10 otp dtsi config to penang camera dtsi. Change-Id: I0076f15af87be7fc90a108234f30c13cbf60c7d8 Reviewed-on: https://gerrit.mot.com/2346423 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Pengfei Qiao Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index 08b9d6bab0e3..00819e316c6e 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -565,6 +565,43 @@ "CUSTOM_GPIO2"; status = "ok"; }; + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + csiphy-sd-index = <2>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; /*MOTO Rear Aux 2M*/ qcom,cam-sensor2 { @@ -574,6 +611,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; led-flash-src = <&led_flash_rear_aux>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; From edb501cd03a47318f07426bfe9497f93f695f2c1 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Thu, 28 Jul 2022 18:05:58 +0800 Subject: [PATCH 123/183] arm64/dts: penang: front camera s5k4h7 otp bring up details: Add s5k4h7 otp dtsi config to penang camera dtsi. Change-Id: I4685bf4b9d656781eaea90dffbe23cbc4a3a61b7 Reviewed-on: https://gerrit.mot.com/2347845 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index 00819e316c6e..4fcc7003cd57 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -470,6 +470,46 @@ clock-rates = <24000000>; }; + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + compatible = "qcom,eeprom"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; /*MOTO Front 8M*/ qcom,cam-sensor1 { cell-index = <1>; @@ -478,6 +518,7 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&L3A>; // PMIC From 1c1fdfe0ae1f23d052d08cce935b62d742ee7c92 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Tue, 2 Aug 2022 10:05:56 +0800 Subject: [PATCH 124/183] milanf: modify ois vsync irq processing flow details: modify ois vsync irq processing flow same with aw86006 Change-Id: Iccd64fff6f575ecd00386573bc15273e5af3548d Signed-off-by: Xiaofeng Wang Reviewed-on: https://gerrit.mot.com/2351256 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Shuo Wang Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-milanf-overlay.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/blair-camera-sensor-mot-milanf-overlay.dtsi b/blair-camera-sensor-mot-milanf-overlay.dtsi index 4c136a006efb..58c2afe99a66 100644 --- a/blair-camera-sensor-mot-milanf-overlay.dtsi +++ b/blair-camera-sensor-mot-milanf-overlay.dtsi @@ -297,6 +297,7 @@ rgltr-load-current = <120000 100000 100000>; cci-master = <1>; status = "ok"; + ois-name = "mot_dw9781c"; }; eeprom_main: qcom,eeprom@0 { From a0718eebcd6b46e496c5123ab29cb6b1084323c4 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Mon, 8 Aug 2022 15:19:32 +0800 Subject: [PATCH 125/183] arm64/dts: penang: Adjust rotation of ov02b10 details: Adjust rotation of ov02b10 camera dtsi Change-Id: I70c9d90e79e205d37f709c6b05da45c7ec5623dd Reviewed-on: https://gerrit.mot.com/2356817 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index 4fcc7003cd57..acc4615bd84b 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -649,7 +649,7 @@ cell-index = <2>; compatible = "qcom,cam-sensor"; csiphy-sd-index = <2>; - sensor-position-roll = <270>; + sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; eeprom-src = <&eeprom_macro>; From c650f563991a5a43ea7fbe7c42386a5e6228ee47 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Wed, 3 Aug 2022 14:39:05 +0800 Subject: [PATCH 126/183] arm64/dts: penang: Actuator noise reduction details: Add flag multi-user-support in actuator, follow rhodec Change-Id: Ie1bf183983e55c8c548977e6da1b23a13e606ad9 Reviewed-on: https://gerrit.mot.com/2352678 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index acc4615bd84b..b7aecf3402b9 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -394,6 +394,11 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; }; &cam_cci0 { @@ -409,6 +414,7 @@ rgltr-max-voltage = <2800000>; rgltr-load-current = <100000>; status = "ok"; + multi-user-support; }; eeprom_main: qcom,eeprom@0 { From 70709c83eb9206a50d8864e572d155f33b745d8a Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Thu, 11 Aug 2022 15:59:19 +0800 Subject: [PATCH 127/183] arm64/dts: penang: second supply flash lm3644 bringup details: Add need-change-cci-master flag to s5kjn1 for using flash lm3644 Change-Id: Ice8cb5357e3bc1d77896a9d4e80ab2cbcc413f9d Reviewed-on: https://gerrit.mot.com/2360496 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: XiaoFeng Wang Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index b7aecf3402b9..33f9675ef6bc 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -470,6 +470,7 @@ sensor-mode = <0>; cci-master = <1>; status = "ok"; + need-change-cci-master; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; From e0a90a368b682906767366f8f5a51cf7c87723ea Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Wed, 17 Aug 2022 16:21:41 +0800 Subject: [PATCH 128/183] arm64/dts: penang: update device id for flash lm3644 details: Add hwen gpio to rear and macro sensor config Remove unused pwm-switch Change-Id: I8edad2515ebd3d2f7210ecda3d40cb8b66aaedec Reviewed-on: https://gerrit.mot.com/2364994 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 43 ++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index 33f9675ef6bc..e23dc00b3017 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -450,23 +450,27 @@ regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - pwm-switch; rgltr-min-voltage = <1800000 2800000 2800000 1056000 0>; rgltr-max-voltage = <1800000 2800000 2800000 1056000 0>; rgltr-load-current = <120000 80000 100000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_main_reset_active>; + &cam_sensor_main_reset_active + &cam_flash_en_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_main_reset_suspend>; + &cam_sensor_main_reset_suspend + &cam_flash_en_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 35 0>; + <&tlmm 35 0>, + <&tlmm 89 0>; gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; + 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"; + "CAM_RESET1", + "CUSTOM_GPIO1"; sensor-mode = <0>; cci-master = <1>; status = "ok"; @@ -492,7 +496,6 @@ regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - pwm-switch; rgltr-min-voltage = <1800000 2800000 1200000 0>; rgltr-max-voltage = <1800000 2800000 1200000 0>; rgltr-load-current = <120000 80000 1200000 0>; @@ -534,7 +537,6 @@ regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - pwm-switch; rgltr-min-voltage = <1800000 2800000 1200000 0>; rgltr-max-voltage = <1800000 2800000 1200000 0>; rgltr-load-current = <120000 80000 1200000 0>; @@ -588,8 +590,8 @@ status = "ok"; }; - led_flash_rear_aux: qcom,camera-flash@1 { - cell-index = <1>; + led_flash_rear_aux: qcom,camera-flash@2 { + cell-index = <2>; compatible = "qcom,camera-flash"; cci-master = <0>; flash-type = ; @@ -625,7 +627,6 @@ cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; - pwm-switch; rgltr-min-voltage = <1800000 2800000 0>; rgltr-max-voltage = <1800000 2800000 0>; rgltr-load-current = <120000 80000 0>; @@ -666,23 +667,27 @@ cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; - pwm-switch; rgltr-min-voltage = <1800000 2800000 0>; rgltr-max-voltage = <1800000 2800000 0>; rgltr-load-current = <120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active - &cam_sensor_macro_reset_active>; + &cam_sensor_macro_reset_active + &cam_flash_en_active>; pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_macro_reset_suspend + &cam_flash_en_suspend>; gpios = <&tlmm 32 0>, - <&tlmm 37 0>; + <&tlmm 37 0>, + <&tlmm 89 0>; gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; + gpio-custom1 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RESET3"; + "CAM_RESET3", + "CUSTOM_GPIO1"; sensor-mode = <0>; cci-master = <0>; status = "ok"; From fcfb6338b73657e7009a5f38febd149af5d95be7 Mon Sep 17 00:00:00 2001 From: longc105 Date: Fri, 26 Aug 2022 01:00:12 +0800 Subject: [PATCH 129/183] arm64/dts: Penang5G NA: front camera tsp s5k4h7yx03 bring up details: add front camera sensor s5k4h7yx03 dtsi node for pnangn camera Change-Id: I7d78eb35dd3ffbd05172326ee87b22a3d008f473 Signed-off-by: longc105 Reviewed-on: https://gerrit.mot.com/2371435 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 186 +++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100644 holi-camera-sensor-mot-pnangn-overlay.dtsi diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi new file mode 100644 index 000000000000..dca7bca7b6be --- /dev/null +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -0,0 +1,186 @@ +#include +#include + +&tlmm { + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + /* MCLK 3*/ + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + /* MCLK 3*/ + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + camera_ldo_dovdd_en: camera_ldo_dovdd_en { + mux { + pins = "gpio46"; + function = "gpio"; + }; + + config { + pins = "gpio46"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { + mux { + pins = "gpio87"; + function = "gpio"; + }; + + config { + pins = "gpio87"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_8m_dvdd_en: camera_ldo_8m_dvdd_en { + mux { + pins = "gpio33"; + function = "gpio"; + }; + + config { + pins = "gpio33"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; +}; + +&soc { + camera_ldo_dovdd: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 46 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_dovdd_en>; + }; + + camera_ldo_8m_avdd: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x01 0x00>; + regulator-name = "camera_ldo_8m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 87 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_avdd_en>; + }; + + camera_ldo_8m_dvdd: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x02 0x00>; + regulator-name = "camera_ldo_8m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 33 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_dvdd_en>; + }; + + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; +}; + +&cam_cci1 { + /*MOTO Front 8M*/ + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From c81ea1b6f28298742f57d2157b6b215638362b75 Mon Sep 17 00:00:00 2001 From: longc110 Date: Thu, 25 Aug 2022 17:46:03 +0800 Subject: [PATCH 130/183] arm64/dts: Penang5G NA: macro camera tsp ov02b10 bring up details: add macro camera sensor ov02b10 dtsi node for pnangn camera Change-Id: Ibd38c2aee76acf0a877b9293772196ef5d1beef5 Signed-off-by: longc110 Reviewed-on: https://gerrit.mot.com/2371098 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 121 +++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index dca7bca7b6be..ee88ea2accc3 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -2,6 +2,34 @@ #include &tlmm { + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + /* MCLK 1*/ + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + /* MCLK 1*/ + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <4>; /* 4 MA */ + }; + }; + cam_sensor_mclk3_active: cam_sensor_mclk3_active { /* MCLK 3*/ mux { @@ -57,6 +85,33 @@ }; }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + camera_ldo_dovdd_en: camera_ldo_dovdd_en { mux { pins = "gpio46"; @@ -95,6 +150,19 @@ drive-strength = <4>; /* 4 MA */ }; }; + + camera_ldo_2m_avdd_en: camera_ldo_2m_avdd_en { + mux { + pins = "gpio45"; + function = "gpio"; + }; + + config { + pins = "gpio45"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; }; &soc { @@ -137,12 +205,65 @@ pinctrl-0 = <&camera_ldo_8m_dvdd_en>; }; + camera_ldo_2m_avdd: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "camera_ldo_2m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 45 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_2m_avdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; }; }; +&cam_cci0 { + /*MOTO Rear Aux 2M*/ + 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 = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + &cam_cci1 { /*MOTO Front 8M*/ qcom,cam-sensor1 { From 4638f8e1926ff2c49b316ed8389d78a038dd046b Mon Sep 17 00:00:00 2001 From: longc107 Date: Mon, 29 Aug 2022 11:54:49 +0800 Subject: [PATCH 131/183] arm64/dts: Penang5G NA: Rear camera bringup details: add rear camera sensor s5kgm1sp dtsi node for pnangn camera Change-Id: I074f6607449863b1dc3330b13a8bb3152483891e Signed-off-by: longc107 Reviewed-on: https://gerrit.mot.com/2373234 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 132 +++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index ee88ea2accc3..4d1e512813a6 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -2,6 +2,34 @@ #include &tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + /* MCLK 0*/ + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + /* MCLK 0*/ + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + cam_sensor_mclk1_active: cam_sensor_mclk1_active { /* MCLK 1*/ mux { @@ -58,6 +86,33 @@ }; }; + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { mux { pins = "gpio34"; @@ -125,6 +180,19 @@ }; }; + camera_ldo_48m_avdd_en: camera_ldo_48m_avdd_en { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { mux { pins = "gpio87"; @@ -218,13 +286,77 @@ pinctrl-0 = <&camera_ldo_2m_avdd_en>; }; + camera_ldo_48m_avdd: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera_ldo_48m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 49 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_48m_avdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; }; }; +&L3A{ + regulator-min-microvolt = <1056000>; + regulator-max-microvolt = <1056000>; + qcom,init-voltage = <1056000>; + status = "okay"; +}; + &cam_cci0 { + /*MOTO Rear 48M*/ + 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>; + //actuator-src = <&actuator_rear>; + //eeprom-src = <&eeprom_rear>; + //led-flash-src = <&led_flash_rear>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_48m_avdd>; + //cam_vaf-supply = <&camera_ldo_50m_afvdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1056000 0>; + rgltr-max-voltage = <1800000 2800000 1056000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /*MOTO Rear Aux 2M*/ qcom,cam-sensor2 { cell-index = <2>; From d697f25aa61996aeca63ad175989dae5478deadf Mon Sep 17 00:00:00 2001 From: longc110 Date: Tue, 30 Aug 2022 12:20:41 +0800 Subject: [PATCH 132/183] arm64/dts: Penang5G NA:flashlight bringup flashlight bringup for pnangn camera Change-Id: If1fc00ad41c4cfc6f4d403e979133643b765b95b Signed-off-by: longc110 Reviewed-on: https://gerrit.mot.com/2374287 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index 4d1e512813a6..15cfed7a0f91 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -231,6 +231,19 @@ drive-strength = <4>; /* 4 MA */ }; }; + + flash_ldo_dovdd_en: flash_ldo_dovdd_en { + mux { + pins = "gpio57"; + function = "gpio"; + }; + + config { + pins = "gpio57"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; }; &soc { @@ -299,6 +312,19 @@ pinctrl-0 = <&camera_ldo_48m_avdd_en>; }; + flash_ldo_dovdd: gpio-regulator@5 { + compatible = "regulator-fixed"; + reg = <0x05 0x00>; + regulator-name = "flash_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 57 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_dovdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -313,6 +339,21 @@ }; &cam_cci0 { + //MOTO Rear 48M FLASH + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + cci-master = <1>; + flash-type = ; + cam_vio-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + status = "ok"; + }; + /*MOTO Rear 48M*/ qcom,cam-sensor0 { cell-index = <0>; @@ -323,7 +364,7 @@ sensor-position-yaw = <180>; //actuator-src = <&actuator_rear>; //eeprom-src = <&eeprom_rear>; - //led-flash-src = <&led_flash_rear>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_48m_avdd>; //cam_vaf-supply = <&camera_ldo_50m_afvdd>; @@ -365,6 +406,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; From 4deb078e715339c1f0b4a020a7f321e9a22f29ed Mon Sep 17 00:00:00 2001 From: longc107 Date: Wed, 31 Aug 2022 14:26:02 +0800 Subject: [PATCH 133/183] arm64/dts: Penang 5G NA: Rear camera actuator bringup details: add rear camera actuator GT9767 dtsi node for pnangn camera Change-Id: I34aa53049460e16d1b4eab9fa52b177b25a216c4 Signed-off-by: longc107 Reviewed-on: https://gerrit.mot.com/2375260 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 52 +++++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index 15cfed7a0f91..318332ccfa1e 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -244,6 +244,19 @@ drive-strength = <4>; /* 4 MA */ }; }; + + camera_ldo_48m_afvdd_en: camera_ldo_48m_afvdd_en { + mux { + pins = "gpio56"; + function = "gpio"; + }; + + config { + pins = "gpio56"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; }; &soc { @@ -325,6 +338,19 @@ pinctrl-0 = <&flash_ldo_dovdd_en>; }; + camera_ldo_48m_afvdd: gpio-regulator@6 { + compatible = "regulator-fixed"; + reg = <0x06 0x00>; + regulator-name = "camera_ldo_48m_afvdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 56 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_48m_afvdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -354,6 +380,20 @@ status = "ok"; }; + //MOTO Rear 48M AF + actuator_rear: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&camera_ldo_48m_afvdd>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + /*MOTO Rear 48M*/ qcom,cam-sensor0 { cell-index = <0>; @@ -362,20 +402,20 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //actuator-src = <&actuator_rear>; + actuator-src = <&actuator_rear>; //eeprom-src = <&eeprom_rear>; led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_48m_avdd>; - //cam_vaf-supply = <&camera_ldo_50m_afvdd>; + cam_vaf-supply = <&camera_ldo_48m_afvdd>; cam_vdig-supply = <&L3A>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", + regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1056000 0>; - rgltr-max-voltage = <1800000 2800000 1056000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 2800000 1056000 0>; + rgltr-max-voltage = <1800000 2800000 2800000 1056000 0>; + rgltr-load-current = <120000 80000 100000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active From 804c3a9b237cd6c31b2cd550c1a2c7a7ac0578d2 Mon Sep 17 00:00:00 2001 From: longc110 Date: Fri, 26 Aug 2022 21:22:07 +0800 Subject: [PATCH 134/183] arm64/dts: Penang5G NA: macro camera tsp ov02b10 otp bring up details: add macro camera sensor ov02b10 eeprom dtsi node for pnangn camera Change-Id: Id2912fd6c99d9aeb9852e3512f5796747a843ec0 Signed-off-by: longc110 Reviewed-on: https://gerrit.mot.com/2372428 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Reviewed-by: Tested-by: Jira Key Reviewed-by: Wang Liu Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index 318332ccfa1e..bf8dddf8814d 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -438,6 +438,43 @@ clock-rates = <24000000>; }; + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /*MOTO Rear Aux 2M*/ qcom,cam-sensor2 { cell-index = <2>; @@ -446,6 +483,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; From d4cde9baf2238befe9495029f99c6c6e020c1576 Mon Sep 17 00:00:00 2001 From: longc105 Date: Thu, 1 Sep 2022 16:23:59 +0800 Subject: [PATCH 135/183] arm64/dts: penang 5G NA: front camera s5k4h7 otp bring up details: Add s5k4h7 otp dtsi config to penang camera dtsi. Change-Id: Id05499f39d986b784955d611d8eca1104832ab99 Signed-off-by: longc105 Reviewed-on: https://gerrit.mot.com/2376161 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 46 ++++++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index bf8dddf8814d..a48161e4b4f1 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -517,10 +517,9 @@ }; &cam_cci1 { - /*MOTO Front 8M*/ - qcom,cam-sensor1 { + eeprom_front: qcom,eeprom@1 { cell-index = <1>; - compatible = "qcom,cam-sensor"; + compatible = "qcom,eeprom"; csiphy-sd-index = <3>; sensor-position-roll = <270>; sensor-position-pitch = <0>; @@ -556,4 +555,45 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + + /*MOTO Front 8M*/ + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; From 4f347ec7a26cd4b4536574011ed0883c53ca6881 Mon Sep 17 00:00:00 2001 From: longc107 Date: Thu, 8 Sep 2022 16:11:40 +0800 Subject: [PATCH 136/183] arm64/dts: penang 5G NA: Modify Rear camera DVDD power supply details: Rear camera DVDD has changed the power supply from L3A to external LDO GPIO47 is used to enable LDO Change-Id: I4c952a56b0ac1af484480abda6f90ce6d03d071d Signed-off-by: longc107 Reviewed-on: https://gerrit.mot.com/2380515 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Shuo Wang Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 35 +++++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index a48161e4b4f1..71dade7b9a4f 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -180,6 +180,19 @@ }; }; + camera_ldo_48m_dvdd_en: camera_ldo_48m_dvdd_en { + mux { + pins = "gpio47"; + function = "gpio"; + }; + + config { + pins = "gpio47"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + camera_ldo_48m_avdd_en: camera_ldo_48m_avdd_en { mux { pins = "gpio49"; @@ -351,19 +364,25 @@ pinctrl-0 = <&camera_ldo_48m_afvdd_en>; }; + camera_ldo_48m_dvdd: gpio-regulator@7 { + compatible = "regulator-fixed"; + reg = <0x07 0x00>; + regulator-name = "camera_ldo_48m_dvdd"; + regulator-min-microvolt = <1056000>; + regulator-max-microvolt = <1056000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 47 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_48m_dvdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; }; }; -&L3A{ - regulator-min-microvolt = <1056000>; - regulator-max-microvolt = <1056000>; - qcom,init-voltage = <1056000>; - status = "okay"; -}; - &cam_cci0 { //MOTO Rear 48M FLASH led_flash_rear: qcom,camera-flash@0 { @@ -408,7 +427,7 @@ cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_48m_avdd>; cam_vaf-supply = <&camera_ldo_48m_afvdd>; - cam_vdig-supply = <&L3A>; + cam_vdig-supply = <&camera_ldo_48m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", "cam_clk"; From 95bfb5a748d8989cd8d6d388003828de3bd914a4 Mon Sep 17 00:00:00 2001 From: longc107 Date: Mon, 5 Sep 2022 15:07:03 +0800 Subject: [PATCH 137/183] arm64/dts: penang 5G NA: Rear camera eeprom bringup details: Add s5kgm1sp otp dtsi config to Penang 5G NA camera dtsi. Change-Id: I781c5515b46173986d1d9567232076df91c7084b Signed-off-by: longc107 Reviewed-on: https://gerrit.mot.com/2378139 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index 71dade7b9a4f..838a29b8ed1c 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -413,6 +413,21 @@ status = "ok"; }; + eeprom_rear: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vaf-supply = <&camera_ldo_48m_afvdd>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <120000 100000>; + cci-master = <0>; + status = "ok"; + }; + /*MOTO Rear 48M*/ qcom,cam-sensor0 { cell-index = <0>; @@ -422,7 +437,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_rear>; - //eeprom-src = <&eeprom_rear>; + eeprom-src = <&eeprom_rear>; led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_48m_avdd>; From 64127c6de2adc2d7933b5579c6797a7ebacafa76 Mon Sep 17 00:00:00 2001 From: yh Date: Wed, 7 Sep 2022 14:53:15 +0800 Subject: [PATCH 138/183] arm64/dts: Pnangn5G NA: flash supplier distinguish details: flashIC:aw36515 ocp81373 distinguish flash supplier Change-Id: Idaf99277128c35d553fef6981afc86e80b8a1cd9 Signed-off-by: yh Signed-off-by: longc110 Reviewed-on: https://gerrit.mot.com/2379844 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 77 ++++++++++++++-------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index 838a29b8ed1c..545694b42692 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -245,7 +245,7 @@ }; }; - flash_ldo_dovdd_en: flash_ldo_dovdd_en { + cam_flash_en_active: cam_flash_en_active { mux { pins = "gpio57"; function = "gpio"; @@ -254,7 +254,21 @@ config { pins = "gpio57"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_flash_en_suspend: cam_flash_en_suspend { + mux { + pins = "gpio57"; + function = "gpio"; + }; + + config { + pins = "gpio57"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; }; }; @@ -338,19 +352,6 @@ pinctrl-0 = <&camera_ldo_48m_avdd_en>; }; - flash_ldo_dovdd: gpio-regulator@5 { - compatible = "regulator-fixed"; - reg = <0x05 0x00>; - regulator-name = "flash_ldo_dovdd"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-enable-ramp-delay = <233>; - enable-active-high; - gpio = <&tlmm 57 0>; - pinctrl-names = "default"; - pinctrl-0 = <&flash_ldo_dovdd_en>; - }; - camera_ldo_48m_afvdd: gpio-regulator@6 { compatible = "regulator-fixed"; reg = <0x06 0x00>; @@ -390,12 +391,21 @@ compatible = "qcom,camera-flash"; cci-master = <1>; flash-type = ; - cam_vio-supply = <&flash_ldo_dovdd>; + cam_vio-supply = <&camera_ldo_dovdd>; regulator-names = "cam_vio"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; rgltr-max-voltage = <1800000>; rgltr-load-current = <120000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active>; + pinctrl-1 = <&cam_flash_en_suspend >; + gpios = <&tlmm 57 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; status = "ok"; }; @@ -453,19 +463,25 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active - &cam_sensor_main_reset_active>; + &cam_sensor_main_reset_active + &cam_flash_en_active>; pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_main_reset_suspend>; + &cam_sensor_main_reset_suspend + &cam_flash_en_suspend>; gpios = <&tlmm 29 0>, - <&tlmm 35 0>; + <&tlmm 35 0>, + <&tlmm 57 0>; gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; + gpio-custom1 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; gpio-req-tbl-label = "CAMIF_MCLK0", - "CAM_RESET0"; + "CAM_RESET0", + "CUSTOM_GPIO1"; sensor-mode = <0>; cci-master = <0>; status = "ok"; + need-change-cci-master; clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; @@ -530,16 +546,21 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_macro_reset_active>; + &cam_sensor_macro_reset_active + &cam_flash_en_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_macro_reset_suspend>; + &cam_sensor_macro_reset_suspend + &cam_flash_en_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 37 0>; + <&tlmm 37 0>, + <&tlmm 57 0>; gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; + gpio-custom1 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3"; + "CAM_RESET3", + "CUSTOM_GPIO1"; sensor-mode = <0>; cci-master = <1>; status = "ok"; From f383776eacd3bcbfc0d2bae7e5f124c8071b5328 Mon Sep 17 00:00:00 2001 From: longc110 Date: Mon, 19 Sep 2022 22:17:02 +0800 Subject: [PATCH 139/183] arm64/dts: Penang5G NA:Modify the flash power supply rootcause: camera and flash exist shared gpio details: solve the problem of slow open of main camera and macro camera Change-Id: I7cd0681ac16aa054408536bb333fa586ee726a5f Signed-off-by: longc110 Reviewed-on: https://gerrit.mot.com/2386612 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Reviewed-by: Zhuoran Xu Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 96 +++++++++------------- 1 file changed, 39 insertions(+), 57 deletions(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index 545694b42692..ae3400c9db3a 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -245,7 +245,7 @@ }; }; - cam_flash_en_active: cam_flash_en_active { + flash_ldo_dovdd_en: flash_ldo_dovdd_en { mux { pins = "gpio57"; function = "gpio"; @@ -254,21 +254,7 @@ config { pins = "gpio57"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ - }; - }; - - cam_flash_en_suspend: cam_flash_en_suspend { - mux { - pins = "gpio57"; - function = "gpio"; - }; - - config { - pins = "gpio57"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; + drive-strength = <4>; /* 4 MA */ }; }; @@ -352,6 +338,19 @@ pinctrl-0 = <&camera_ldo_48m_avdd_en>; }; + flash_ldo_dovdd: gpio-regulator@5 { + compatible = "regulator-fixed"; + reg = <0x05 0x00>; + regulator-name = "flash_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 57 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_dovdd_en>; + }; + camera_ldo_48m_afvdd: gpio-regulator@6 { compatible = "regulator-fixed"; reg = <0x06 0x00>; @@ -391,21 +390,12 @@ compatible = "qcom,camera-flash"; cci-master = <1>; flash-type = ; - cam_vio-supply = <&camera_ldo_dovdd>; - regulator-names = "cam_vio"; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_v_custom1"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; rgltr-max-voltage = <1800000>; rgltr-load-current = <120000>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_flash_en_active>; - pinctrl-1 = <&cam_flash_en_suspend >; - gpios = <&tlmm 57 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; status = "ok"; }; @@ -453,31 +443,27 @@ cam_vana-supply = <&camera_ldo_48m_avdd>; cam_vaf-supply = <&camera_ldo_48m_afvdd>; cam_vdig-supply = <&camera_ldo_48m_dvdd>; + cam_v_custom1-supply = <&flash_ldo_dovdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", + regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", "cam_v_custom1", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000 1056000 0>; - rgltr-max-voltage = <1800000 2800000 2800000 1056000 0>; - rgltr-load-current = <120000 80000 100000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 2800000 1056000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 2800000 1056000 1800000 0>; + rgltr-load-current = <120000 80000 100000 1200000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active - &cam_sensor_main_reset_active - &cam_flash_en_active>; + &cam_sensor_main_reset_active>; pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_main_reset_suspend - &cam_flash_en_suspend>; + &cam_sensor_main_reset_suspend>; gpios = <&tlmm 29 0>, - <&tlmm 35 0>, - <&tlmm 57 0>; + <&tlmm 35 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK0", - "CAM_RESET0", - "CUSTOM_GPIO1"; + "CAM_RESET0"; sensor-mode = <0>; cci-master = <0>; status = "ok"; @@ -537,30 +523,26 @@ led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_v_custom1-supply = <&flash_ldo_dovdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; + regulator-names = "cam_vio", "cam_vana", "cam_v_custom1", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-min-voltage = <1800000 2800000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 1800000 0>; + rgltr-load-current = <120000 80000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_macro_reset_active - &cam_flash_en_active>; + &cam_sensor_macro_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_macro_reset_suspend - &cam_flash_en_suspend>; + &cam_sensor_macro_reset_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 37 0>, - <&tlmm 57 0>; + <&tlmm 37 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET3", - "CUSTOM_GPIO1"; + "CAM_RESET3"; sensor-mode = <0>; cci-master = <1>; status = "ok"; From ffff0b82d0b28d0509f24e9cec3eb01967b4e4ce Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Thu, 29 Sep 2022 16:57:33 +0800 Subject: [PATCH 140/183] : camera: change 50m s5kjn1 dvdd GPIO from 6 to 48 this change only for DVT2 later hardware and only for JP SKU SN110P Change-Id: Ibb9e0d12fd2823aebbf22d79b0872cbfbbb25589 Signed-off-by: HQ Cam LiJunyu Reviewed-on: https://gerrit.mot.com/2394517 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Pengfei Qiao Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Shuo Wang Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-jp-overlay.dtsi | 699 ++++++++++++++++++ 1 file changed, 699 insertions(+) create mode 100644 holi-camera-sensor-mot-penang-jp-overlay.dtsi diff --git a/holi-camera-sensor-mot-penang-jp-overlay.dtsi b/holi-camera-sensor-mot-penang-jp-overlay.dtsi new file mode 100644 index 000000000000..a744acc709a7 --- /dev/null +++ b/holi-camera-sensor-mot-penang-jp-overlay.dtsi @@ -0,0 +1,699 @@ +#include +#include + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + /* MCLK 0*/ + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + /* MCLK 0*/ + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + /* MCLK 1*/ + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + /* MCLK 1*/ + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + /* MCLK 3*/ + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + /* MCLK 3*/ + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + + + camera_ldo_dovdd_en: camera_ldo_dovdd_en { + mux { + pins = "gpio33"; + function = "gpio"; + }; + + config { + pins = "gpio33"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_50m_dvdd_en: camera_ldo_50m_dvdd_en { + mux { + pins = "gpio48"; + function = "gpio"; + }; + + config { + pins = "gpio48"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_8m_dvdd_en: camera_ldo_8m_dvdd_en { + mux { + pins = "gpio12"; + function = "gpio"; + }; + + config { + pins = "gpio12"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + camera_ldo_2m_avdd_en: camera_ldo_2m_avdd_en { + mux { + pins = "gpio51"; + function = "gpio"; + }; + + config { + pins = "gpio51"; + bias-disable; /* No PULL */ + drive-strength = <4>; /* 4 MA */ + }; + }; + + cam_flash_en_active: cam_flash_en_active { + mux { + pins = "gpio89"; + function = "gpio"; + }; + + config { + pins = "gpio89"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_flash_en_suspend: cam_flash_en_suspend { + mux { + pins = "gpio89"; + function = "gpio"; + }; + + config { + pins = "gpio89"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + cam_flash_torch_active: cam_flash_torch_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_flash_torch_suspend: cam_flash_torch_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +}; + +&L21A{ + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + qcom,init-voltage = <2800000>; + status = "okay"; +}; + +&soc { + camera_ldo_dovdd: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 33 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_dovdd_en>; + }; + + camera_ldo_50m_dvdd: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x01 0x00>; + regulator-name = "camera_ldo_50m_dvdd"; + regulator-min-microvolt = <1056000>; + regulator-max-microvolt = <1056000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 48 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_dvdd_en>; + vin-supply = <&S6A>; + }; + + camera_ldo_50m_avdd: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x02 0x00>; + regulator-name = "camera_ldo_50m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 36 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_avdd_en>; + }; + + camera_ldo_8m_dvdd: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "camera_ldo_8m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_dvdd_en>; + vin-supply = <&S6A>; + }; + + camera_ldo_8m_avdd: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera_ldo_8m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_avdd_en>; + }; + + camera_ldo_2m_avdd: gpio-regulator@5 { + compatible = "regulator-fixed"; + reg = <0x05 0x00>; + regulator-name = "camera_ldo_2m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 51 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_2m_avdd_en>; + }; + + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; +}; + +&cam_cci0 { + /*MOTO Rear 50M AF*/ + actuator_rear: qcom,actuator0 { + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <1>; + cam_vaf-supply = <&L21A>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <100000>; + status = "ok"; + multi-user-support; + }; + + eeprom_main: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <1>; + status = "ok"; + }; + + /*MOTO Rear 50M*/ + 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>; + actuator-src = <&actuator_rear>; + eeprom-src = <&eeprom_main>; + led-flash-src = <&led_flash_rear>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vaf-supply = <&L21A>; + cam_vdig-supply = <&camera_ldo_50m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 2800000 1056000 0>; + rgltr-max-voltage = <1800000 2800000 2800000 1056000 0>; + rgltr-load-current = <120000 80000 100000 1200000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk1_active + &cam_sensor_main_reset_active + &cam_flash_en_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_main_reset_suspend + &cam_flash_en_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 35 0>, + <&tlmm 89 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"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + need-change-cci-master; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + compatible = "qcom,eeprom"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /*MOTO Front 8M*/ + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&L3A>; // PMIC + // cam_vdig-supply = <&camera_ldo_8m_dvdd>; // LDO + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + compatible = "qcom,camera-flash"; + cci-master = <0>; + flash-type = ; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; + gpios = <&tlmm 89 0>, + <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-custom2 = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <0 0>; + gpio-req-tbl-label = "CUSTOM_GPIO1", + "CUSTOM_GPIO2"; + status = "ok"; + }; + + led_flash_rear_aux: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + cci-master = <0>; + flash-type = ; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; + gpios = <&tlmm 89 0>, + <&tlmm 49 0>; + gpio-custom1 = <0>; + gpio-custom2 = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <0 0>; + gpio-req-tbl-label = "CUSTOM_GPIO1", + "CUSTOM_GPIO2"; + status = "ok"; + }; + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + csiphy-sd-index = <2>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /*MOTO Rear Aux 2M*/ + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; + led-flash-src = <&led_flash_rear_aux>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_macro_reset_active + &cam_flash_en_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_macro_reset_suspend + &cam_flash_en_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 37 0>, + <&tlmm 89 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_MCLK3", + "CAM_RESET3", + "CUSTOM_GPIO1"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 44df8f9795cc738c384caa0019109a9dcef4e475 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Sat, 15 Oct 2022 12:49:58 +0800 Subject: [PATCH 141/183] : camera: change 8m s5k4h7 dvdd GPIO from 6 to 12 detial: nfc need gpio 6 that s5k4h7 dvdd gpio from 6 to 12 Change-Id: Id31d07e33f9b878ceba98928074947979d5160ed Signed-off-by: HQ Cam LiJunyu Reviewed-on: https://gerrit.mot.com/2404980 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-jp-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-penang-jp-overlay.dtsi b/holi-camera-sensor-mot-penang-jp-overlay.dtsi index a744acc709a7..de921807d3ed 100644 --- a/holi-camera-sensor-mot-penang-jp-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-jp-overlay.dtsi @@ -358,7 +358,7 @@ regulator-max-microvolt = <1200000>; regulator-enable-ramp-delay = <233>; enable-active-high; - gpio = <&tlmm 6 0>; + gpio = <&tlmm 12 0>; pinctrl-names = "default"; pinctrl-0 = <&camera_ldo_8m_dvdd_en>; vin-supply = <&S6A>; From c900e55b9b321e4b47413eb47228deabf8e868cc Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Thu, 13 Oct 2022 11:16:25 +0800 Subject: [PATCH 142/183] fix lm3644 flash kernel pin occupation details: Reconfigure the power on/off the flash and sensor configure. Change-Id: I5e65e4cf0eb45a1f134ef42909f86d70fdbf1ba6 Signed-off-by: HQ Cam LiJunyu Reviewed-on: https://gerrit.mot.com/2402833 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Shuo Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-overlay.dtsi | 130 ++++++++++----------- 1 file changed, 59 insertions(+), 71 deletions(-) diff --git a/holi-camera-sensor-mot-penang-overlay.dtsi b/holi-camera-sensor-mot-penang-overlay.dtsi index e23dc00b3017..728fc6272857 100644 --- a/holi-camera-sensor-mot-penang-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-overlay.dtsi @@ -247,7 +247,7 @@ }; }; - cam_flash_en_active: cam_flash_en_active { + flash_ldo_dovdd_en: flash_ldo_dovdd_en { mux { pins = "gpio89"; function = "gpio"; @@ -260,20 +260,6 @@ }; }; - cam_flash_en_suspend: cam_flash_en_suspend { - mux { - pins = "gpio89"; - function = "gpio"; - }; - - config { - pins = "gpio89"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - cam_flash_torch_active: cam_flash_torch_active { mux { pins = "gpio49"; @@ -390,6 +376,20 @@ pinctrl-0 = <&camera_ldo_2m_avdd_en>; }; + flash_ldo_dovdd: gpio-regulator@6 { + compatible = "regulator-fixed"; + reg = <0x06 0x00>; + regulator-name = "flash_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 89 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_dovdd_en>; + + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -447,30 +447,26 @@ cam_vaf-supply = <&L21A>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", "cam_v_custom1", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000 1056000 0>; - rgltr-max-voltage = <1800000 2800000 2800000 1056000 0>; - rgltr-load-current = <120000 80000 100000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 2800000 1056000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 2800000 1056000 1800000 0>; + rgltr-load-current = <120000 80000 100000 1200000 800000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_main_reset_active - &cam_flash_en_active>; + &cam_sensor_main_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_main_reset_suspend - &cam_flash_en_suspend>; + &cam_sensor_main_reset_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 35 0>, - <&tlmm 89 0>; + <&tlmm 35 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET1", - "CUSTOM_GPIO1"; + "CAM_RESET1"; sensor-mode = <0>; cci-master = <1>; status = "ok"; @@ -570,23 +566,21 @@ cci-master = <0>; flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; - regulator-names = "cam_vio"; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom1"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <120000 800000>; gpio-no-mux = <0>; pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; - pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; - gpios = <&tlmm 89 0>, - <&tlmm 49 0>; + pinctrl-0 = <&cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_torch_suspend>; + gpios = <&tlmm 49 0>; gpio-custom1 = <0>; - gpio-custom2 = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <0 0>; - gpio-req-tbl-label = "CUSTOM_GPIO1", - "CUSTOM_GPIO2"; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; status = "ok"; }; @@ -596,23 +590,21 @@ cci-master = <0>; flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; - regulator-names = "cam_vio"; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom1"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <120000 800000>; gpio-no-mux = <0>; pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; - pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; - gpios = <&tlmm 89 0>, - <&tlmm 49 0>; + pinctrl-0 = <&cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_torch_suspend>; + gpios = <&tlmm 49 0>; gpio-custom1 = <0>; - gpio-custom2 = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <0 0>; - gpio-req-tbl-label = "CUSTOM_GPIO1", - "CUSTOM_GPIO2"; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; status = "ok"; }; eeprom_macro: qcom,eeprom@2 { @@ -665,29 +657,25 @@ cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio", "cam_vana", "cam_v_custom1","cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-min-voltage = <1800000 2800000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 1800000 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_macro_reset_active - &cam_flash_en_active>; + &cam_sensor_macro_reset_active>; pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend - &cam_flash_en_suspend>; + &cam_sensor_macro_reset_suspend>; gpios = <&tlmm 32 0>, - <&tlmm 37 0>, - <&tlmm 89 0>; + <&tlmm 37 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RESET3", - "CUSTOM_GPIO1"; + "CAM_RESET3"; sensor-mode = <0>; cci-master = <0>; status = "ok"; From f4ac3b1e3b03d805224439fe765fb2f08fc92044 Mon Sep 17 00:00:00 2001 From: HQ Cam LiJunyu Date: Sun, 30 Oct 2022 11:18:19 +0800 Subject: [PATCH 143/183] fix lm3644 flash kernel pin occupation for jp config details: Reconfigure the power on/off the flash and sensor configure. Change-Id: I4ea0dc1a2c2f0e9d57cf2fb0474a3db5470f4c50 Reviewed-on: https://gerrit.mot.com/2416728 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-penang-jp-overlay.dtsi | 130 ++++++++---------- 1 file changed, 59 insertions(+), 71 deletions(-) diff --git a/holi-camera-sensor-mot-penang-jp-overlay.dtsi b/holi-camera-sensor-mot-penang-jp-overlay.dtsi index de921807d3ed..3a8a2913ba72 100644 --- a/holi-camera-sensor-mot-penang-jp-overlay.dtsi +++ b/holi-camera-sensor-mot-penang-jp-overlay.dtsi @@ -247,7 +247,7 @@ }; }; - cam_flash_en_active: cam_flash_en_active { + flash_ldo_dovdd_en: flash_ldo_dovdd_en { mux { pins = "gpio89"; function = "gpio"; @@ -260,20 +260,6 @@ }; }; - cam_flash_en_suspend: cam_flash_en_suspend { - mux { - pins = "gpio89"; - function = "gpio"; - }; - - config { - pins = "gpio89"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; - cam_flash_torch_active: cam_flash_torch_active { mux { pins = "gpio49"; @@ -390,6 +376,20 @@ pinctrl-0 = <&camera_ldo_2m_avdd_en>; }; + flash_ldo_dovdd: gpio-regulator@6 { + compatible = "regulator-fixed"; + reg = <0x06 0x00>; + regulator-name = "flash_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 89 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_dovdd_en>; + + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -447,30 +447,26 @@ cam_vaf-supply = <&L21A>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", "cam_v_custom1", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000 1056000 0>; - rgltr-max-voltage = <1800000 2800000 2800000 1056000 0>; - rgltr-load-current = <120000 80000 100000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 2800000 1056000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 2800000 1056000 1800000 0>; + rgltr-load-current = <120000 80000 100000 1200000 800000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_main_reset_active - &cam_flash_en_active>; + &cam_sensor_main_reset_active>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_main_reset_suspend - &cam_flash_en_suspend>; + &cam_sensor_main_reset_suspend>; gpios = <&tlmm 30 0>, - <&tlmm 35 0>, - <&tlmm 89 0>; + <&tlmm 35 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET1", - "CUSTOM_GPIO1"; + "CAM_RESET1"; sensor-mode = <0>; cci-master = <1>; status = "ok"; @@ -570,23 +566,21 @@ cci-master = <0>; flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; - regulator-names = "cam_vio"; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom1"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <120000 800000>; gpio-no-mux = <0>; pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; - pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; - gpios = <&tlmm 89 0>, - <&tlmm 49 0>; + pinctrl-0 = <&cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_torch_suspend>; + gpios = <&tlmm 49 0>; gpio-custom1 = <0>; - gpio-custom2 = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <0 0>; - gpio-req-tbl-label = "CUSTOM_GPIO1", - "CUSTOM_GPIO2"; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; status = "ok"; }; @@ -596,23 +590,21 @@ cci-master = <0>; flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; - regulator-names = "cam_vio"; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio", "cam_v_custom1"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <120000 800000>; gpio-no-mux = <0>; pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_flash_en_active &cam_flash_torch_active>; - pinctrl-1 = <&cam_flash_en_suspend &cam_flash_torch_suspend>; - gpios = <&tlmm 89 0>, - <&tlmm 49 0>; + pinctrl-0 = <&cam_flash_torch_active>; + pinctrl-1 = <&cam_flash_torch_suspend>; + gpios = <&tlmm 49 0>; gpio-custom1 = <0>; - gpio-custom2 = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <0 0>; - gpio-req-tbl-label = "CUSTOM_GPIO1", - "CUSTOM_GPIO2"; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; status = "ok"; }; eeprom_macro: qcom,eeprom@2 { @@ -665,29 +657,25 @@ cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio", "cam_vana", "cam_v_custom1", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-min-voltage = <1800000 2800000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 1800000 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_macro_reset_active - &cam_flash_en_active>; + &cam_sensor_macro_reset_active>; pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_macro_reset_suspend - &cam_flash_en_suspend>; + &cam_sensor_macro_reset_suspend>; gpios = <&tlmm 32 0>, - <&tlmm 37 0>, - <&tlmm 89 0>; + <&tlmm 37 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-req-tbl-num = <0 1 2>; - gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RESET3", - "CUSTOM_GPIO1"; + "CAM_RESET3"; sensor-mode = <0>; cci-master = <0>; status = "ok"; From e17f72c9b150079d17f1a0f3a05f247c307b3e2b Mon Sep 17 00:00:00 2001 From: longc107 Date: Fri, 21 Oct 2022 21:29:53 +0800 Subject: [PATCH 144/183] arm64/dts: Penang5G NA:add flash dtsi node for marco camera detail: Add flash dtsi node for marco camera, Prevent flash conflict with the rear main camera. Change-Id: Iba7fc93bae3217197424eb6dffc36911687b0fd4 Signed-off-by: longc107 Reviewed-on: https://gerrit.mot.com/2411265 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index ae3400c9db3a..b32e232659ab 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -399,6 +399,21 @@ status = "ok"; }; + //MOTO Rear 2M FLASH + led_flash_rear_aux: qcom,camera-flash@2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + cci-master = <1>; + flash-type = ; + cam_v_custom1-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + status = "ok"; + }; + //MOTO Rear 48M AF actuator_rear: qcom,actuator0 { cell-index = <0>; @@ -520,7 +535,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; eeprom-src = <&eeprom_macro>; - led-flash-src = <&led_flash_rear>; + led-flash-src = <&led_flash_rear_aux>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_v_custom1-supply = <&flash_ldo_dovdd>; From 6ded8459024ab8c2e2a240567c81106cf141cfe0 Mon Sep 17 00:00:00 2001 From: longc110 Date: Wed, 2 Nov 2022 16:09:24 +0800 Subject: [PATCH 145/183] arm64/dts: Penang5G NA:set camera ldo driver current to 2MA nomally detail: set camera ldo driver current to 2MA nomally Change-Id: I930cbbe22bd8e438e7f094795933fe954ba24e1a Signed-off-by: longc110 Reviewed-on: https://gerrit.mot.com/2423617 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index b32e232659ab..5c1fa443f89f 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -176,7 +176,7 @@ config { pins = "gpio46"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -202,7 +202,7 @@ config { pins = "gpio49"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -215,7 +215,7 @@ config { pins = "gpio87"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -228,7 +228,7 @@ config { pins = "gpio33"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -241,7 +241,7 @@ config { pins = "gpio45"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -254,7 +254,7 @@ config { pins = "gpio57"; bias-disable; /* No PULL */ - drive-strength = <4>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; From e2508bc14ba5e5bbf464a40e9fb189cfe5516d92 Mon Sep 17 00:00:00 2001 From: longc107 Date: Tue, 8 Nov 2022 18:36:01 +0800 Subject: [PATCH 146/183] arm64/dts: Penang5G NA:Modify camera i2c power supply detail: Remove L13A from display dtsi file, Add L13A to camera dtsi, and add it to power on & down sequence. Change-Id: Ic5195918da25e5aad203438a575aafdc0a6ea3b6 Signed-off-by: longc107 Reviewed-on: https://gerrit.mot.com/2423857 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Wang Liu Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- holi-camera-sensor-mot-pnangn-overlay.dtsi | 90 +++++++++++++--------- 1 file changed, 54 insertions(+), 36 deletions(-) diff --git a/holi-camera-sensor-mot-pnangn-overlay.dtsi b/holi-camera-sensor-mot-pnangn-overlay.dtsi index 5c1fa443f89f..7c04a32ca5f1 100644 --- a/holi-camera-sensor-mot-pnangn-overlay.dtsi +++ b/holi-camera-sensor-mot-pnangn-overlay.dtsi @@ -272,6 +272,14 @@ }; }; +//MOTO camera I2C power supply +&L13A{ + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,init-voltage = <1800000>; + status = "okay"; +}; + &soc { camera_ldo_dovdd: gpio-regulator@0 { compatible = "regulator-fixed"; @@ -391,11 +399,12 @@ cci-master = <1>; flash-type = ; cam_v_custom1-supply = <&flash_ldo_dovdd>; - regulator-names = "cam_v_custom1"; + cam_v_custom2-supply = <&L13A>; + regulator-names = "cam_v_custom1", "cam_v_custom2"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <120000 120000>; status = "ok"; }; @@ -406,11 +415,12 @@ cci-master = <1>; flash-type = ; cam_v_custom1-supply = <&flash_ldo_dovdd>; - regulator-names = "cam_v_custom1"; + cam_v_custom2-supply = <&L13A>; + regulator-names = "cam_v_custom1", "cam_v_custom2"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <120000>; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <120000 120000>; status = "ok"; }; @@ -420,11 +430,12 @@ compatible = "qcom,actuator"; cci-master = <0>; cam_vaf-supply = <&camera_ldo_48m_afvdd>; - regulator-names = "cam_vaf"; + cam_v_custom2-supply = <&L13A>; + regulator-names = "cam_vaf", "cam_v_custom2"; rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; + rgltr-min-voltage = <2800000 1800000>; + rgltr-max-voltage = <2800000 1800000>; + rgltr-load-current = <100000 120000>; status = "ok"; }; @@ -434,11 +445,12 @@ compatible = "qcom,eeprom"; cam_vio-supply = <&camera_ldo_dovdd>; cam_vaf-supply = <&camera_ldo_48m_afvdd>; - regulator-names = "cam_vio", "cam_vaf"; + cam_v_custom2-supply = <&L13A>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom2"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000>; - rgltr-max-voltage = <1800000 2800000>; - rgltr-load-current = <120000 100000>; + rgltr-min-voltage = <1800000 2800000 1800000>; + rgltr-max-voltage = <1800000 2800000 1800000>; + rgltr-load-current = <120000 100000 120000>; cci-master = <0>; status = "ok"; }; @@ -459,13 +471,14 @@ cam_vaf-supply = <&camera_ldo_48m_afvdd>; cam_vdig-supply = <&camera_ldo_48m_dvdd>; cam_v_custom1-supply = <&flash_ldo_dovdd>; + cam_v_custom2-supply = <&L13A>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vaf", "cam_vdig", "cam_v_custom1", - "cam_clk"; + "cam_v_custom2", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 2800000 1056000 1800000 0>; - rgltr-max-voltage = <1800000 2800000 2800000 1056000 1800000 0>; - rgltr-load-current = <120000 80000 100000 1200000 120000 0>; + rgltr-min-voltage = <1800000 2800000 2800000 1056000 1800000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 2800000 1056000 1800000 1800000 0>; + rgltr-load-current = <120000 80000 100000 1200000 120000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active @@ -498,12 +511,13 @@ sensor-position-yaw = <180>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_v_custom2-supply = <&L13A>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; + regulator-names = "cam_vio", "cam_vana", "cam_v_custom2", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-min-voltage = <1800000 2800000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 1800000 0>; + rgltr-load-current = <120000 80000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -539,12 +553,14 @@ cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_v_custom1-supply = <&flash_ldo_dovdd>; + cam_v_custom2-supply = <&L13A>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_v_custom1", "cam_clk"; + regulator-names = "cam_vio", "cam_vana", "cam_v_custom1", "cam_v_custom2", + "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1800000 0>; - rgltr-max-voltage = <1800000 2800000 1800000 0>; - rgltr-load-current = <120000 80000 120000 0>; + rgltr-min-voltage = <1800000 2800000 1800000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 1800000 1800000 0>; + rgltr-load-current = <120000 80000 120000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -579,13 +595,14 @@ cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_v_custom2-supply = <&L13A>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_v_custom2", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1200000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 1800000 0>; + rgltr-load-current = <120000 80000 1200000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active @@ -620,13 +637,14 @@ cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_v_custom2-supply = <&L13A>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + "cam_v_custom2", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1200000 1800000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 1800000 0>; + rgltr-load-current = <120000 80000 1200000 120000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active From 779bfe1b2fd08b9bf6124151f55bcea885170b92 Mon Sep 17 00:00:00 2001 From: tinno_huandong_tmp Date: Wed, 22 Mar 2023 19:14:50 +0800 Subject: [PATCH 147/183] Bangkok5G: Camera EVB Device Tree setup details: 1.add devicetree file for all cameras Change-Id: Id175e272ad0810ab1c19576b07d2ec9f3da2e461 Signed-off-by: tinno_huandong_tmp Reviewed-on: https://gerrit.mot.com/2549326 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 480 ++++++++++++++++++++ 1 file changed, 480 insertions(+) create mode 100644 blair-camera-sensor-mot-bangkk-overlay.dtsi diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi new file mode 100644 index 000000000000..469c78a01ab8 --- /dev/null +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -0,0 +1,480 @@ +#include +#include +&soc { + /*s5kgn9 ov16a1a s5k4h7 iovdd*/ + camera_ldo_dovdd: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_dovdd_en>; + }; + /*s5kgn9 avdd*/ + camera_ldo_50m_avdd: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x0A 0x00>; + regulator-name = "camera_ldo_50m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_avdd_en>; + }; + /*s5kgn9 dvdd*/ + camera_ldo_50m_dvdd: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x0B 0x00>; + regulator-name = "camera_ldo_50m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 8 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_dvdd_en>; + }; + /*ov16a1q avdd*/ + camera_ldo_16m_avdd: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "camera_ldo_16m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 37 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_16m_avdd_en>; + }; + /*ov16a1q dvdd*/ + camera_ldo_16m_dvdd: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera_ldo_16m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 92 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_16m_dvdd_en>; + }; + /*s5k4h7 avdd*/ + camera_ldo_8m_avdd: gpio-regulator@5 { + compatible = "regulator-fixed"; + reg = <0x05 0x00>; + regulator-name = "camera_ldo_8m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 36 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_avdd_en>; + }; + /*s5k4h7 dvdd*/ + camera_ldo_8m_dvdd: gpio-regulator@6 { + compatible = "regulator-fixed"; + reg = <0x06 0x00>; + regulator-name = "camera_ldo_8m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 51 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_dvdd_en>; + }; + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + gpios-shared = <407>; + pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend"; + pinctrl-0 = <&cam_flash_hwen_active>; + pinctrl-1 = <&cam_flash_hwen_suspend>; + }; +}; + +&tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + cam_sensor_mclk3_active: cam_sensor_mclk3_active { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend { + mux { + pins = "gpio32"; + function = "cam_mclk"; + }; + + config { + pins = "gpio32"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_mainaux_reset_active: cam_sensor_mainaux_reset_active { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mainaux_reset_suspend: cam_sensor_mainaux_reset_suspend { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + camera_ldo_dovdd_en: camera_ldo_dovdd_en { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 4 MA */ + }; + }; + camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { + mux { + pins = "gpio6"; + function = "gpio"; + }; + + config { + pins = "gpio6"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 4 MA */ + }; + }; + camera_ldo_50m_dvdd_en: camera_ldo_50m_dvdd_en { + mux { + pins = "gpio8"; + function = "gpio"; + }; + + config { + pins = "gpio8"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + camera_ldo_16m_avdd_en: camera_ldo_16m_avdd_en { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 4 MA */ + }; + }; + + camera_ldo_16m_dvdd_en: camera_ldo_16m_dvdd_en { + mux { + pins = "gpio92"; + function = "gpio"; + }; + + config { + pins = "gpio92"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 4 MA */ + }; + }; + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 4 MA */ + }; + }; + + camera_ldo_8m_dvdd_en: camera_ldo_8m_dvdd_en { + mux { + pins = "gpio51"; + function = "gpio"; + }; + + config { + pins = "gpio51"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 4 MA */ + }; + }; +}; + +&cam_cci0 { + /* Rear s5kgn9*/ + 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>; + //actuator-src = <&actuator_rear>; + //led-flash-src = <&led_flash_rear>; + //eeprom-src = <&eeprom_rear>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vdig-supply = <&camera_ldo_50m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /*Rear Aux s5k4h7*/ + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + //actuator-src = <&actuator_rear>; + //led-flash-src = <&led_flash_rear>; + //eeprom-src = <&eeprom_rear>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_mainaux_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_mainaux_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + +}; + +&cam_cci1 { + /*Front ov16a1q*/ + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + //actuator-src = <&actuator_rear>; + //led-flash-src = <&led_flash_rear>; + //eeprom-src = <&eeprom_rear>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_16m_avdd>; + cam_vdig-supply = <&camera_ldo_16m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 32 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET1"; + sensor-mode = <1>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 33ace90a3d15f98670ff15889a0ad38afc8c9cf6 Mon Sep 17 00:00:00 2001 From: "tin_minchao.wang_tmp" Date: Fri, 24 Mar 2023 18:48:42 +0800 Subject: [PATCH 148/183] bangkk: Ov16a1q eeprom dtsi configure details: add configuration of ov16a1q eeprom. Change-Id: Ia98fed8a966c4cfa547dc81aa6f54816a3a7d955 Signed-off-by: tin_minchao.wang_tmp Reviewed-on: https://gerrit.mot.com/2553990 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Yongqin Wan Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 469c78a01ab8..e4cf61c58394 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -435,6 +435,21 @@ }; &cam_cci1 { + /*Front ov16a1q eeprom*/ + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + /*Front ov16a1q*/ qcom,cam-sensor1 { cell-index = <1>; @@ -445,7 +460,7 @@ sensor-position-yaw = <0>; //actuator-src = <&actuator_rear>; //led-flash-src = <&led_flash_rear>; - //eeprom-src = <&eeprom_rear>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_16m_avdd>; cam_vdig-supply = <&camera_ldo_16m_dvdd>; From 1ad71179620617281af063f1f4c7195d768f1b7b Mon Sep 17 00:00:00 2001 From: "tin_yingying.zhang_tmp" Date: Mon, 27 Mar 2023 11:53:20 +0800 Subject: [PATCH 149/183] bangkk: Flash bring up dtsi configure details: add configuration of main&wide sensor flash. Change-Id: I3479fb13e4dbeb6756ef13ef8eb9c4bb426ce4e3 Signed-off-by: tin_yingying.zhang_tmp Reviewed-on: https://gerrit.mot.com/2554069 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Yongqin Wan Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key Reviewed-by: --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 34 +++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index e4cf61c58394..7e278a1a6ccf 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -346,6 +346,36 @@ }; &cam_cci0 { + //Rear 50M FLASH + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; + //WIDE 8m FLASH + led_flash_wide: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + flash-type = <1>; + cci-master = <1>; + status = "ok"; + }; /* Rear s5kgn9*/ qcom,cam-sensor0 { cell-index = <0>; @@ -355,7 +385,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; //actuator-src = <&actuator_rear>; - //led-flash-src = <&led_flash_rear>; + led-flash-src = <&led_flash_rear>; //eeprom-src = <&eeprom_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; @@ -398,7 +428,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; //actuator-src = <&actuator_rear>; - //led-flash-src = <&led_flash_rear>; + led-flash-src = <&led_flash_wide>; //eeprom-src = <&eeprom_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_8m_avdd>; From e1c56d50482630daded2702616666846f672784f Mon Sep 17 00:00:00 2001 From: "tin_yingying.zhang_tmp" Date: Mon, 27 Mar 2023 15:15:48 +0800 Subject: [PATCH 150/183] bangkk: S5k4h7 actuator dtsi configure details: add configuration of s5k4h7 actuator. Change-Id: I69291a0919cbb4423850f22c7ff441e8bc4585c6 Signed-off-by: tin_yingying.zhang_tmp Reviewed-on: https://gerrit.mot.com/2554377 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Yongqin Wan Reviewed-by: Zhichao Chen Reviewed-by: Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 40 ++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 7e278a1a6ccf..524ba7935934 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -92,6 +92,19 @@ pinctrl-names = "default"; pinctrl-0 = <&camera_ldo_8m_dvdd_en>; }; + /* s5k4h7 afvdd */ + camera_ldo_8m_afvdd: gpio-regulator@9 { + compatible = "regulator-fixed"; + reg = <0x09 0x00>; + regulator-name = "camera_ldo_8m_afvdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 50 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_afvdd_en>; + }; qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -343,6 +356,18 @@ drive-strength = <2>; /* 4 MA */ }; }; + camera_ldo_8m_afvdd_en: camera_ldo_8m_afvdd_en { + mux { + pins = "gpio50"; + function = "gpio"; + }; + + config { + pins = "gpio50"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 4 MA */ + }; + }; }; &cam_cci0 { @@ -376,6 +401,19 @@ cci-master = <1>; status = "ok"; }; + actuator_wide: qcom,actuator@1 { + cell-index = <2>; + compatible = "qcom,actuator"; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vaf-supply = <&camera_ldo_8m_afvdd>; + regulator-names = "cam_vio", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000>; + rgltr-max-voltage = <1800000 2800000>; + rgltr-load-current = <120000 100000>; + cci-master = <1>; + status = "ok"; + }; /* Rear s5kgn9*/ qcom,cam-sensor0 { cell-index = <0>; @@ -427,7 +465,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //actuator-src = <&actuator_rear>; + actuator-src = <&actuator_wide>; led-flash-src = <&led_flash_wide>; //eeprom-src = <&eeprom_rear>; cam_vio-supply = <&camera_ldo_dovdd>; From 44afb98eb4133861cc49fca6903f4593d3a2e974 Mon Sep 17 00:00:00 2001 From: tinno_huandong_tmp Date: Tue, 28 Mar 2023 17:53:31 +0800 Subject: [PATCH 151/183] bangkk: S5kgn9 af and ois bring up details: add configuration of main sensor af and ois. Change-Id: I51e200483d4d25213d075035fedcec0850f1425f Signed-off-by: tinno_huandong_tmp Reviewed-on: https://gerrit.mot.com/2556680 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 106 +++++++++++++++++++- 1 file changed, 101 insertions(+), 5 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 524ba7935934..1d982e1c8d53 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -92,6 +92,32 @@ pinctrl-names = "default"; pinctrl-0 = <&camera_ldo_8m_dvdd_en>; }; + /* s5kgn9 afvdd */ + camera_ldo_50m_afvdd: gpio-regulator@7 { + compatible = "regulator-fixed"; + reg = <0x07 0x00>; + regulator-name = "camera_ldo_50m_afvdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 59 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_afvdd_en>; + }; + /* s5kgn9 oisvdd */ + camera_ldo_50m_oisvdd: gpio-regulator@8 { + compatible = "regulator-fixed"; + reg = <0x08 0x00>; + regulator-name = "camera_ldo_50m_oisvdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 87 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_oisvdd_en>; + }; /* s5k4h7 afvdd */ camera_ldo_8m_afvdd: gpio-regulator@9 { compatible = "regulator-fixed"; @@ -356,6 +382,33 @@ drive-strength = <2>; /* 4 MA */ }; }; + + camera_ldo_50m_afvdd_en: camera_ldo_50m_afvdd_en { + mux { + pins = "gpio59"; + function = "gpio"; + }; + + config { + pins = "gpio59"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + camera_ldo_50m_oisvdd_en: camera_ldo_50m_oisvdd_en { + mux { + pins = "gpio87"; + function = "gpio"; + }; + + config { + pins = "gpio87"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + camera_ldo_8m_afvdd_en: camera_ldo_8m_afvdd_en { mux { pins = "gpio50"; @@ -371,6 +424,48 @@ }; &cam_cci0 { + i2c_freq_100Khz_cci0: qcom,i2c_standard_mode { + hw-scl-stretch-en = <1>; + }; + + i2c_freq_400Khz_cci0: qcom,i2c_fast_mode { + hw-scl-stretch-en = <0>; + }; + + i2c_freq_1Mhz_cci0: qcom,i2c_fast_plus_mode { + hw-scl-stretch-en = <1>; + }; + /*Rear 50M AF*/ + actuator_rear_main:qcom,actuator0{ + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vaf-supply = <&camera_ldo_50m_afvdd>; + cam_v_custom1-supply = <&camera_ldo_50m_oisvdd>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 3300000 3300000>; + rgltr-max-voltage = <1800000 3300000 3300000>; + rgltr-load-current = <500 300000 30000>; + status = "ok"; + }; + /* Rear 50M OIS */ + ois_rear_main: qcom,ois@0 { + cell-index = <0>; + compatible = "qcom,ois"; + cci-master = <0>; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vaf-supply = <&camera_ldo_50m_afvdd>; + cam_v_custom1-supply = <&camera_ldo_50m_oisvdd>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 3300000 3300000>; + rgltr-max-voltage = <1800000 3300000 3300000>; + rgltr-load-current = <500 300000 30000>; + status = "ok"; + ois-name = "mot_bangkk_aw86006"; + }; //Rear 50M FLASH led_flash_rear: qcom,camera-flash@0 { cell-index = <0>; @@ -422,19 +517,20 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - //actuator-src = <&actuator_rear>; + actuator-src = <&actuator_rear_main>; + ois-src = <&ois_rear_main>; led-flash-src = <&led_flash_rear>; //eeprom-src = <&eeprom_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", + regulator-names = "cam_vaf", "cam_vio", "cam_vana", "cam_v_custom1", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <3300000 1800000 2800000 3300000 1200000 0>; + rgltr-max-voltage = <3300000 1800000 2800000 3300000 1200000 0>; + rgltr-load-current = <105000 80000 80000 105000 105000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active From f886dedc15aa3871671f0f3fc8b6af042a03045c Mon Sep 17 00:00:00 2001 From: "tin_kailinn.chen_tmp" Date: Mon, 27 Mar 2023 20:03:21 +0800 Subject: [PATCH 152/183] bangkk: S5k4h7 eeprom dtsi configure details: add configuration of s5k4h7 eeprom. Change-Id: I213cf2017bcf8d044b73e6a4e3d1262af052fd75 Signed-off-by: tin_kailinn.chen_tmp Reviewed-on: https://gerrit.mot.com/2555013 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Reviewed-by: Yongqin Wan Reviewed-by: Reviewed-by: Reviewed-by: Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 38 ++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 1d982e1c8d53..3c2eca66f24c 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -554,6 +554,42 @@ }; /*Rear Aux s5k4h7*/ + eeprom_wide: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_dovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_mainaux_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_mainaux_reset_suspend>; + gpios = <&tlmm 31 0>, + <&tlmm 49 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + qcom,cam-sensor2 { cell-index = <2>; compatible = "qcom,cam-sensor"; @@ -563,7 +599,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_wide>; led-flash-src = <&led_flash_wide>; - //eeprom-src = <&eeprom_rear>; + eeprom-src = <&eeprom_wide>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&camera_ldo_8m_dvdd>; From 6eb7ea87e3d3fe7a9fc1f54ac88e403ca45e36d8 Mon Sep 17 00:00:00 2001 From: "tin_minchao.wang_tmp" Date: Tue, 28 Mar 2023 18:25:01 +0800 Subject: [PATCH 153/183] bangkk: S5kgn9 eeprom dtsi configure details: add configuration of s5kgn9 eeprom. Change-Id: Ic6e6df2f905d01e559f4a3252caa2ee0db5a386c Signed-off-by: tin_minchao.wang_tmp Reviewed-on: https://gerrit.mot.com/2556719 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Reviewed-by: Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 31 +++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 3c2eca66f24c..9635080800bd 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -435,7 +435,8 @@ i2c_freq_1Mhz_cci0: qcom,i2c_fast_plus_mode { hw-scl-stretch-en = <1>; }; - /*Rear 50M AF*/ + + /* Rear 50M AF */ actuator_rear_main:qcom,actuator0{ cell-index = <0>; compatible = "qcom,actuator"; @@ -450,6 +451,7 @@ rgltr-load-current = <500 300000 30000>; status = "ok"; }; + /* Rear 50M OIS */ ois_rear_main: qcom,ois@0 { cell-index = <0>; @@ -466,7 +468,8 @@ status = "ok"; ois-name = "mot_bangkk_aw86006"; }; - //Rear 50M FLASH + + /* Rear 50M FLASH */ led_flash_rear: qcom,camera-flash@0 { cell-index = <0>; reg = <0x0>; @@ -481,7 +484,8 @@ cci-master = <1>; status = "ok"; }; - //WIDE 8m FLASH + + /* WIDE 8m FLASH */ led_flash_wide: qcom,camera-flash@2 { cell-index = <2>; reg = <0x2>; @@ -496,6 +500,7 @@ cci-master = <1>; status = "ok"; }; + actuator_wide: qcom,actuator@1 { cell-index = <2>; compatible = "qcom,actuator"; @@ -509,7 +514,23 @@ cci-master = <1>; status = "ok"; }; - /* Rear s5kgn9*/ + + /* Rear s5kgn9 eeprom */ + eeprom_rear: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_dovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + /* Rear s5kgn9 */ qcom,cam-sensor0 { cell-index = <0>; compatible = "qcom,cam-sensor"; @@ -520,7 +541,7 @@ actuator-src = <&actuator_rear_main>; ois-src = <&ois_rear_main>; led-flash-src = <&led_flash_rear>; - //eeprom-src = <&eeprom_rear>; + eeprom-src = <&eeprom_rear>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; From b19bedc0ac0871988faabc7dd4798aa6f6646613 Mon Sep 17 00:00:00 2001 From: "tin_qiquan.zhou_tmp" Date: Mon, 10 Apr 2023 14:17:42 +0800 Subject: [PATCH 154/183] bangkk: Secondary supply flash driver ic compatible details: Add ocp81373 flash dtsi configure. Change-Id: Iab738290ba33a9e84ef48bf687095b0b8dc2349d Signed-off-by: tin_qiquan.zhou_tmp Reviewed-on: https://gerrit.mot.com/2570184 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Yongqin Wan Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 50 ++++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 9635080800bd..af53ed12236a 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -142,6 +142,32 @@ }; &tlmm { + cam_flash_en_active: cam_flash_en_active { + mux { + pins = "gpio24"; + function = "gpio"; + }; + + config { + pins = "gpio24"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_flash_en_suspend: cam_flash_en_suspend { + mux { + pins = "gpio24"; + function = "gpio"; + }; + + config { + pins = "gpio24"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; cam_sensor_mclk0_active: cam_sensor_mclk0_active { mux { pins = "gpio29"; @@ -474,13 +500,23 @@ cell-index = <0>; reg = <0x0>; compatible = "qcom,camera-flash"; + flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; regulator-names = "cam_vio"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; rgltr-max-voltage = <1800000>; rgltr-load-current = <100000>; - flash-type = <1>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active>; + pinctrl-1 = <&cam_flash_en_suspend>; + gpios = <&tlmm 24 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + distinguish-flash-supplier = <0xc6 0x0c 0x0a>; cci-master = <1>; status = "ok"; }; @@ -490,13 +526,23 @@ cell-index = <2>; reg = <0x2>; compatible = "qcom,camera-flash"; + flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; regulator-names = "cam_vio"; rgltr-cntrl-support; rgltr-min-voltage = <1800000>; rgltr-max-voltage = <1800000>; rgltr-load-current = <100000>; - flash-type = <1>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_flash_en_active>; + pinctrl-1 = <&cam_flash_en_suspend>; + gpios = <&tlmm 24 0>; + gpio-custom1 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO1"; + distinguish-flash-supplier = <0xc6 0x0c 0x0a>; cci-master = <1>; status = "ok"; }; From b9b8c418cf863b0b512c2ed3b6e50a766b474770 Mon Sep 17 00:00:00 2001 From: "tin_zhiyuan.liao_tmp" Date: Mon, 15 May 2023 15:43:46 +0800 Subject: [PATCH 155/183] bangkk: disable unnecessary s5kgn9 ois gpio details: disable unnecessary s5kgn9 ois gpio , keep pull down Change-Id: Ie7bd1c5c56f29cbd1fb7a1601ee4f0a7001672e0 Signed-off-by: tin_zhiyuan.liao_tmp Reviewed-on: https://gerrit.mot.com/2607060 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 52 ++++++++++++++++++--- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index af53ed12236a..be01cb9b037d 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -331,7 +331,7 @@ config { pins = "gpio38"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { @@ -343,7 +343,7 @@ config { pins = "gpio6"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; camera_ldo_50m_dvdd_en: camera_ldo_50m_dvdd_en { @@ -367,7 +367,7 @@ config { pins = "gpio37"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -380,7 +380,7 @@ config { pins = "gpio92"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { @@ -392,7 +392,7 @@ config { pins = "gpio36"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -405,7 +405,7 @@ config { pins = "gpio51"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; @@ -444,9 +444,38 @@ config { pins = "gpio50"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 4 MA */ + drive-strength = <2>; /* 2 MA */ }; }; + + cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + mux { + pins = "gpio86"; + function = "gpio"; + }; + + config { + pins = "gpio86"; + bias-pull-down; /* PULL DOWN */ + output-low; + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_ois_vsync_irq_suspend: cam_ois_vsync_irq_suspend { + mux { + pins = "gpio86"; + function = "gpio"; + }; + + config { + pins = "gpio86"; + bias-pull-down; /* PULL DOWN */ + output-low; + drive-strength = <2>; /* 2 MA */ + }; + }; + }; &cam_cci0 { @@ -491,6 +520,15 @@ rgltr-min-voltage = <1800000 3300000 3300000>; rgltr-max-voltage = <1800000 3300000 3300000>; rgltr-load-current = <500 300000 30000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default","cam_suspend"; + pinctrl-0 = <&cam_ois_vsync_irq_default>; + pinctrl-1 = <&cam_ois_vsync_irq_suspend>; + gpios = <&tlmm 86 0>; + gpio-custom2 = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CUSTOM_GPIO2"; status = "ok"; ois-name = "mot_bangkk_aw86006"; }; From b6b9af03f5ad77794910b4aa7027158b7e724713 Mon Sep 17 00:00:00 2001 From: huqian4 Date: Mon, 22 May 2023 11:48:05 +0800 Subject: [PATCH 156/183] arm64/dts: bangkk: add af-drift-support details: support af drift for bangkk main camera actuator, delete useness pinctrl. Change-Id: I80696e5426b74b6ca6a942cbeb212f2cbb78d34d Signed-off-by: huqian4 Reviewed-on: https://gerrit.mot.com/2616210 Reviewed-by: Wang Liu SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index be01cb9b037d..10f2397c47a8 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -134,10 +134,6 @@ qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; - gpios-shared = <407>; - pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend"; - pinctrl-0 = <&cam_flash_hwen_active>; - pinctrl-1 = <&cam_flash_hwen_suspend>; }; }; @@ -504,6 +500,7 @@ rgltr-min-voltage = <1800000 3300000 3300000>; rgltr-max-voltage = <1800000 3300000 3300000>; rgltr-load-current = <500 300000 30000>; + af-drift-support; status = "ok"; }; From 51f08966e264845fafc784b95cfeb98a625f7885 Mon Sep 17 00:00:00 2001 From: "tin_zhiyuan.liao_tmp" Date: Wed, 24 May 2023 13:23:54 +0800 Subject: [PATCH 157/183] bangkk: Fix flash request GPIO-24 failed details: fixed GPIO-24 set shared failed. Change-Id: Ib2b8e1c2b3b35dd9dc61a45b45022b2cd530faf1 Signed-off-by: tin_zhiyuan.liao_tmp Reviewed-on: https://gerrit.mot.com/2618831 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 83 +++++++++------------ 1 file changed, 35 insertions(+), 48 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 10f2397c47a8..d7d3fe1a9a78 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -131,6 +131,20 @@ pinctrl-names = "default"; pinctrl-0 = <&camera_ldo_8m_afvdd_en>; }; + + flash_ldo_dovdd: gpio-regulator@10 { + compatible = "regulator-fixed"; + reg = <0x10 0x00>; + regulator-name = "flash_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 24 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_dovdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -138,7 +152,7 @@ }; &tlmm { - cam_flash_en_active: cam_flash_en_active { + flash_ldo_dovdd_en: flash_ldo_dovdd_en { mux { pins = "gpio24"; function = "gpio"; @@ -151,19 +165,6 @@ }; }; - cam_flash_en_suspend: cam_flash_en_suspend { - mux { - pins = "gpio24"; - function = "gpio"; - }; - - config { - pins = "gpio24"; - bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ - output-low; - }; - }; cam_sensor_mclk0_active: cam_sensor_mclk0_active { mux { pins = "gpio29"; @@ -537,20 +538,12 @@ compatible = "qcom,camera-flash"; flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; - regulator-names = "cam_vio"; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom2"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_flash_en_active>; - pinctrl-1 = <&cam_flash_en_suspend>; - gpios = <&tlmm 24 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <100000 120000>; distinguish-flash-supplier = <0xc6 0x0c 0x0a>; cci-master = <1>; status = "ok"; @@ -563,20 +556,12 @@ compatible = "qcom,camera-flash"; flash-type = ; cam_vio-supply = <&camera_ldo_dovdd>; - regulator-names = "cam_vio"; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom2"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000>; - rgltr-max-voltage = <1800000>; - rgltr-load-current = <100000>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_flash_en_active>; - pinctrl-1 = <&cam_flash_en_suspend>; - gpios = <&tlmm 24 0>; - gpio-custom1 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO1"; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <100000 120000>; distinguish-flash-supplier = <0xc6 0x0c 0x0a>; cci-master = <1>; status = "ok"; @@ -623,16 +608,17 @@ ois-src = <&ois_rear_main>; led-flash-src = <&led_flash_rear>; eeprom-src = <&eeprom_rear>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vaf", "cam_vio", "cam_vana", "cam_v_custom1", "cam_vdig", + regulator-names = "cam_v_custom2","cam_vaf", "cam_vio", "cam_vana", "cam_v_custom1", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <3300000 1800000 2800000 3300000 1200000 0>; - rgltr-max-voltage = <3300000 1800000 2800000 3300000 1200000 0>; - rgltr-load-current = <105000 80000 80000 105000 105000 0>; + rgltr-min-voltage = <1800000 3300000 1800000 2800000 3300000 1200000 0>; + rgltr-max-voltage = <1800000 3300000 1800000 2800000 3300000 1200000 0>; + rgltr-load-current = <120000 105000 80000 80000 105000 105000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active @@ -702,16 +688,17 @@ actuator-src = <&actuator_wide>; led-flash-src = <&led_flash_wide>; eeprom-src = <&eeprom_wide>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; cam_vio-supply = <&camera_ldo_dovdd>; cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&camera_ldo_8m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", + regulator-names = "cam_v_custom2","cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1200000 0>; - rgltr-max-voltage = <1800000 2800000 1200000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 1800000 2800000 1200000 0>; + rgltr-load-current = <120000 120000 80000 1200000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk2_active From e53f167e56049d7f7005e323363bdc8b330b355d Mon Sep 17 00:00:00 2001 From: "tin_yingying.zhang_tmp" Date: Wed, 24 May 2023 21:04:03 +0800 Subject: [PATCH 158/183] bangkk: Modify ois gpio pull down details: Fix ois gpio pull down during opening the phone. Change-Id: Idb90be641bd46c4efc97584c9f530d90064b9951 Signed-off-by: tin_yingying.zhang_tmp Reviewed-on: https://gerrit.mot.com/2619348 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 48 ++++++++------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index d7d3fe1a9a78..b182cb8e36af 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -145,6 +145,19 @@ pinctrl-0 = <&flash_ldo_dovdd_en>; }; + ois_vsync_dovdd: gpio-regulator@11 { + compatible = "regulator-fixed"; + reg = <0x11 0x00>; + regulator-name = "ois_vsync_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 86 0>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_ois_vsync_dovdd_default>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -445,7 +458,7 @@ }; }; - cam_ois_vsync_irq_default: cam_ois_vsync_irq_default { + cam_ois_vsync_dovdd_default: cam_ois_vsync_dovdd_default { mux { pins = "gpio86"; function = "gpio"; @@ -458,21 +471,6 @@ drive-strength = <2>; /* 2 MA */ }; }; - - cam_ois_vsync_irq_suspend: cam_ois_vsync_irq_suspend { - mux { - pins = "gpio86"; - function = "gpio"; - }; - - config { - pins = "gpio86"; - bias-pull-down; /* PULL DOWN */ - output-low; - drive-strength = <2>; /* 2 MA */ - }; - }; - }; &cam_cci0 { @@ -513,20 +511,12 @@ cam_vio-supply = <&camera_ldo_dovdd>; cam_vaf-supply = <&camera_ldo_50m_afvdd>; cam_v_custom1-supply = <&camera_ldo_50m_oisvdd>; - regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1"; + cam_v_custom2-supply = <&ois_vsync_dovdd>; + regulator-names = "cam_vio", "cam_vaf", "cam_v_custom1", "cam_v_custom2"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 3300000 3300000>; - rgltr-max-voltage = <1800000 3300000 3300000>; - rgltr-load-current = <500 300000 30000>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default","cam_suspend"; - pinctrl-0 = <&cam_ois_vsync_irq_default>; - pinctrl-1 = <&cam_ois_vsync_irq_suspend>; - gpios = <&tlmm 86 0>; - gpio-custom2 = <0>; - gpio-req-tbl-num = <0>; - gpio-req-tbl-flags = <0>; - gpio-req-tbl-label = "CUSTOM_GPIO2"; + rgltr-min-voltage = <1800000 3300000 3300000 1800000>; + rgltr-max-voltage = <1800000 3300000 3300000 1800000>; + rgltr-load-current = <500 300000 30000 120000>; status = "ok"; ois-name = "mot_bangkk_aw86006"; }; From b1c1549d7d70f8bff5be9f0a0341689854621855 Mon Sep 17 00:00:00 2001 From: "tin_zhiyuan.liao_tmp" Date: Fri, 26 May 2023 17:37:25 +0800 Subject: [PATCH 159/183] bangkk: change bangkk camera cci mode details: need change bangkk camera cci mode to test hardware test pass Change-Id: I08bef8d49e60674d13a306652a2205ea7f44465b Signed-off-by: tin_zhiyuan.liao_tmp Reviewed-on: https://gerrit.mot.com/2621911 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 265 ++++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index b182cb8e36af..6687248b816b 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -1,6 +1,187 @@ #include #include &soc { + cam_cci0: qcom,cci0 { + cell-index = <0>; + compatible = "qcom,cci", "simple-bus"; + reg = <0x05C1B000 0x1000>; + reg-names = "cci"; + reg-cam-base = <0x1B000>; + interrupt-names = "cci"; + interrupts = ; + status = "ok"; + gdscr-supply = <&gcc_camss_top_gdsc>; + regulator-names = "gdscr"; + clocks = <&gcc GCC_CAMSS_CCI_0_CLK>, + <&gcc GCC_CAMSS_CCI_0_CLK_SRC>; + clock-names = "cci_0_clk", + "cci_0_clk_src"; + src-clock-name = "cci_0_clk_src"; + clock-cntl-level = "svs"; + clock-rates = <0 37500000>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cci0_active &cci1_active>; + pinctrl-1 = <&cci0_suspend &cci1_suspend>; + gpios = <&tlmm 39 0>, + <&tlmm 40 0>, + <&tlmm 41 0>, + <&tlmm 42 0>; + gpio-req-tbl-num = <0 1 2 3>; + gpio-req-tbl-flags = <1 1 1 1>; + gpio-req-tbl-label = "CCI_I2C_DATA0", + "CCI_I2C_CLK0", + "CCI_I2C_DATA1", + "CCI_I2C_CLK1"; + + i2c_freq_100Khz_cci0: qcom,i2c_standard_mode { + hw-thigh = <201>; + hw-tlow = <174>; + hw-tsu-sto = <204>; + hw-tsu-sta = <231>; + hw-thd-dat = <22>; + hw-thd-sta = <162>; + hw-tbuf = <227>; + hw-scl-stretch-en = <0>; + hw-trdhld = <6>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + + i2c_freq_400Khz_cci0: qcom,i2c_fast_mode { + hw-thigh = <38>; + hw-tlow = <56>; + hw-tsu-sto = <40>; + hw-tsu-sta = <40>; + hw-thd-dat = <22>; + hw-thd-sta = <35>; + hw-tbuf = <62>; + hw-scl-stretch-en = <0>; + hw-trdhld = <6>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + + i2c_freq_custom_cci0: qcom,i2c_custom_mode { + hw-thigh = <38>; + hw-tlow = <56>; + hw-tsu-sto = <40>; + hw-tsu-sta = <40>; + hw-thd-dat = <22>; + hw-thd-sta = <35>; + hw-tbuf = <62>; + hw-scl-stretch-en = <1>; + hw-trdhld = <6>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + + i2c_freq_1Mhz_cci0: qcom,i2c_fast_plus_mode { + hw-thigh = <16>; + hw-tlow = <22>; + hw-tsu-sto = <17>; + hw-tsu-sta = <18>; + hw-thd-dat = <16>; + hw-thd-sta = <15>; + hw-tbuf = <24>; + hw-scl-stretch-en = <0>; + hw-trdhld = <3>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + }; + + cam_cci1: qcom,cci1 { + cell-index = <1>; + compatible = "qcom,cci", "simple-bus"; + reg = <0x05C1C000 0x1000>; + reg-names = "cci"; + reg-cam-base = <0x1C000>; + interrupt-names = "cci"; + interrupts = ; + status = "ok"; + gdscr-supply = <&gcc_camss_top_gdsc>; + regulator-names = "gdscr"; + clocks = <&gcc GCC_CAMSS_CCI_1_CLK>, + <&gcc GCC_CAMSS_CCI_1_CLK_SRC>; + clock-names = "cci_1_clk", + "cci_1_clk_src"; + src-clock-name = "cci_1_clk_src"; + clock-cntl-level = "svs"; + clock-rates = <0 37500000>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cci2_active>; + pinctrl-1 = <&cci2_suspend>; + gpios = <&tlmm 43 0>, + <&tlmm 44 0>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 1>; + gpio-req-tbl-label = "CCI_I2C_DATA2", + "CCI_I2C_CLK2"; + + i2c_freq_100Khz_cci1: qcom,i2c_standard_mode { + hw-thigh = <201>; + hw-tlow = <174>; + hw-tsu-sto = <204>; + hw-tsu-sta = <231>; + hw-thd-dat = <22>; + hw-thd-sta = <162>; + hw-tbuf = <227>; + hw-scl-stretch-en = <0>; + hw-trdhld = <6>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + + i2c_freq_400Khz_cci1: qcom,i2c_fast_mode { + hw-thigh = <38>; + hw-tlow = <56>; + hw-tsu-sto = <40>; + hw-tsu-sta = <40>; + hw-thd-dat = <22>; + hw-thd-sta = <35>; + hw-tbuf = <62>; + hw-scl-stretch-en = <0>; + hw-trdhld = <6>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + + i2c_freq_custom_cci1: qcom,i2c_custom_mode { + hw-thigh = <38>; + hw-tlow = <56>; + hw-tsu-sto = <40>; + hw-tsu-sta = <40>; + hw-thd-dat = <22>; + hw-thd-sta = <35>; + hw-tbuf = <62>; + hw-scl-stretch-en = <1>; + hw-trdhld = <6>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + + i2c_freq_1Mhz_cci1: qcom,i2c_fast_plus_mode { + hw-thigh = <16>; + hw-tlow = <22>; + hw-tsu-sto = <17>; + hw-tsu-sta = <18>; + hw-thd-dat = <16>; + hw-thd-sta = <15>; + hw-tbuf = <24>; + hw-scl-stretch-en = <0>; + hw-trdhld = <3>; + hw-tsp = <3>; + cci-clk-src = <37500000>; + status = "ok"; + }; + }; /*s5kgn9 ov16a1a s5k4h7 iovdd*/ camera_ldo_dovdd: gpio-regulator@0 { compatible = "regulator-fixed"; @@ -471,6 +652,90 @@ drive-strength = <2>; /* 2 MA */ }; }; + /* Camera GPIOs CCI*/ + cci0_active: cci0_active { + mux { + /* CLK, DATA */ + pins = "gpio39", "gpio40"; + function = "CCI_I2C"; + }; + + config { + pins = "gpio39", "gpio40"; + bias-disable; /*NOT PULL*/ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cci0_suspend: cci0_suspend { + mux { + /* CLK, DATA */ + pins = "gpio39", "gpio40"; + function = "CCI_I2C"; + }; + + config { + pins = "gpio39", "gpio40"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cci1_active: cci1_active { + mux { + /* CLK, DATA */ + pins = "gpio41", "gpio42"; + function = "CCI_I2C"; + }; + + config { + pins = "gpio41", "gpio42"; + bias-disable; /*NOT PULL*/ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cci1_suspend: cci1_suspend { + mux { + /* CLK, DATA */ + pins = "gpio41", "gpio42"; + function = "CCI_I2C"; + }; + + config { + pins = "gpio41", "gpio42"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cci2_active: cci2_active { + mux { + /* CLK, DATA */ + pins = "gpio43", "gpio44"; + function = "CCI_I2C"; + }; + + config { + pins = "gpio43", "gpio44"; + bias-disable; /*NOT PULL*/ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cci2_suspend: cci2_suspend { + mux { + /* CLK, DATA */ + pins = "gpio43", "gpio44"; + function = "CCI_I2C"; + }; + + config { + pins = "gpio43", "gpio44"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; }; &cam_cci0 { From 35ec4ad2b7bfa0745fcfce991886d788dbe40e0f Mon Sep 17 00:00:00 2001 From: "tin_yingying.zhang_tmp" Date: Tue, 23 May 2023 19:44:23 +0800 Subject: [PATCH 160/183] bangkk: Modify mclk for bangkk details: Modify bangkk sensor mclk. Change-Id: I8610da1b3b2b87e17c86d7be506403b58d0d1f25 Signed-off-by: tin_yingying.zhang_tmp Reviewed-on: https://gerrit.mot.com/2618123 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-bangkk-overlay.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/blair-camera-sensor-mot-bangkk-overlay.dtsi b/blair-camera-sensor-mot-bangkk-overlay.dtsi index 6687248b816b..f696c9d272ae 100644 --- a/blair-camera-sensor-mot-bangkk-overlay.dtsi +++ b/blair-camera-sensor-mot-bangkk-overlay.dtsi @@ -368,7 +368,7 @@ config { pins = "gpio29"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; @@ -381,7 +381,7 @@ config { pins = "gpio29"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; @@ -394,7 +394,7 @@ config { pins = "gpio31"; bias-disable; /* No PULL */ - drive-strength = <2>; + drive-strength = <4>; }; }; @@ -407,7 +407,7 @@ config { pins = "gpio31"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; + drive-strength = <4>; }; }; cam_sensor_mclk3_active: cam_sensor_mclk3_active { @@ -419,7 +419,7 @@ config { pins = "gpio32"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; @@ -432,7 +432,7 @@ config { pins = "gpio32"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; cam_sensor_main_reset_active: cam_sensor_main_reset_active { From ab90b1160c6dcf6b9f037ea4eb9ce47c99db0ad4 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 13 Jun 2023 11:11:27 +0800 Subject: [PATCH 161/183] fogor: Setup camera baseline[1/3] Details: Configure the camera dtsi for fogor Change-Id: Iaf33e7428e25325d9689a568ecc697a6ba67375f Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2641734 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 248 +++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 blair-camera-sensor-mot-fogor-overlay.dtsi diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi new file mode 100644 index 000000000000..7246878a818f --- /dev/null +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -0,0 +1,248 @@ +#include +#include + +/*s5kjns afvdd en*/ + +/*s5kjns s5k4h7 sc202acs iovdd*/ + +/*s5kjns dvdd*/ + + +&soc { + + /*s5kjns avdd*/ + + /*sc202acs avdd*/ + + /*s5k4h7 avdd*/ + + /*s5k4h7 dvdd*/ + + /* s5kjns afvdd */ + + /* flash iovdd */ + + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; +}; + +&tlmm { +/* flash iovdd enable */ + + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; +/* s5kjns avdd enable */ + +/* sc202acs avdd enable */ + +/* s5k4h7 dvdd enable */ + +/* s5k4h7 avdd enable */ + +}; + +&cam_cci0 { + /* Rear 50M AF */ + actuator_rear_main:qcom,actuator@0{ + + }; + + /* Rear 50M FLASH */ + led_flash_rear: qcom,camera-flash@0 { + + }; + + /* MACRO 2m FLASH */ + led_flash_macro: qcom,camera-flash@2 { + + }; + + /* Rear s5kjns eeprom */ + eeprom_rear: qcom,eeprom@0 { + + }; + + /* Rear s5kjns */ + rear_main: qcom,cam-sensor@0 { + + }; + + /* Rear sc202acs otp */ + eeprom_macro: qcom,eeprom@2 { + + }; + + /* Rear sc202acs */ + rear_macro: qcom,cam-sensor@2 { + + }; + +}; + +&cam_cci1 { + /* Front s5k4h7 otp */ + eeprom_front: qcom,eeprom@1 { + + }; + + /*Front s5k4h7*/ + front_main: qcom,cam-sensor@1 { + + }; +}; From c1a2b4e4e38af35b7877dd783099df89f899ad05 Mon Sep 17 00:00:00 2001 From: Simon C Date: Wed, 14 Jun 2023 11:03:48 +0800 Subject: [PATCH 162/183] fogor: Bring up main s5kjns[2/2] Details: Add camera dtsi configuration for s5kjns Change-Id: I89b4b3ee4f99842944747a02c1098c5a1520b66c Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2645032 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Reviewed-by: Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 78 +++++++++++++++++++++- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index 7246878a818f..9ad304ecef03 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -4,13 +4,36 @@ /*s5kjns afvdd en*/ /*s5kjns s5k4h7 sc202acs iovdd*/ +&L13A{ + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,init-voltage = <1800000>; + status = "okay"; +}; /*s5kjns dvdd*/ - +&L3A{ + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + qcom,init-voltage = <1050000>; + status = "okay"; +}; &soc { - /*s5kjns avdd*/ + camera_ldo_50m_avdd: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera_ldo_50m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_avdd_en>; + // vin-supply = <&vph_pwr>; + }; /*sc202acs avdd*/ @@ -187,7 +210,20 @@ output-low; }; }; + /* s5kjns avdd enable */ + camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; /* sc202acs avdd enable */ @@ -220,7 +256,43 @@ /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { - + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + // actuator-src = <&actuator_rear_main>; + // eeprom-src = <&eeprom_rear>; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, + <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; }; /* Rear sc202acs otp */ From 7a1fafef99f02c39ddde77a5329f60456ad00e04 Mon Sep 17 00:00:00 2001 From: yanglp10 Date: Fri, 16 Jun 2023 11:20:31 +0800 Subject: [PATCH 163/183] fogor: Bring up front s5k4h7 details: add camera dtsi configuration for s5k4h7 Change-Id: Ie5ee93512e60f7dedb05be6990235d8a64f95f1e Signed-off-by: yanglp10 Reviewed-on: https://gerrit.mot.com/2645675 Reviewed-by: SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 113 +++++++++++---------- 1 file changed, 60 insertions(+), 53 deletions(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index 9ad304ecef03..3fbfde5e048a 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -1,8 +1,6 @@ #include #include -/*s5kjns afvdd en*/ - /*s5kjns s5k4h7 sc202acs iovdd*/ &L13A{ regulator-min-microvolt = <1800000>; @@ -35,15 +33,19 @@ // vin-supply = <&vph_pwr>; }; - /*sc202acs avdd*/ - - /*s5k4h7 avdd*/ - /*s5k4h7 dvdd*/ - - /* s5kjns afvdd */ - - /* flash iovdd */ + camera_ldo_8m_dvdd: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x01 0x00>; + regulator-name = "camera_ldo_8m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_dvdd_en>; + }; qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; @@ -52,8 +54,6 @@ }; &tlmm { -/* flash iovdd enable */ - cam_sensor_mclk0_active: cam_sensor_mclk0_active { mux { pins = "gpio29"; @@ -225,35 +225,22 @@ }; }; -/* sc202acs avdd enable */ - /* s5k4h7 dvdd enable */ + camera_ldo_8m_dvdd_en: camera_ldo_8m_dvdd_en { + mux { + pins = "gpio6"; + function = "gpio"; + }; -/* s5k4h7 avdd enable */ - + config { + pins = "gpio6"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; }; &cam_cci0 { - /* Rear 50M AF */ - actuator_rear_main:qcom,actuator@0{ - - }; - - /* Rear 50M FLASH */ - led_flash_rear: qcom,camera-flash@0 { - - }; - - /* MACRO 2m FLASH */ - led_flash_macro: qcom,camera-flash@2 { - - }; - - /* Rear s5kjns eeprom */ - eeprom_rear: qcom,eeprom@0 { - - }; - /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { cell-index = <0>; @@ -294,27 +281,47 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - /* Rear sc202acs otp */ - eeprom_macro: qcom,eeprom@2 { - - }; - - /* Rear sc202acs */ - rear_macro: qcom,cam-sensor@2 { - - }; - }; &cam_cci1 { - /* Front s5k4h7 otp */ - eeprom_front: qcom,eeprom@1 { - - }; - /*Front s5k4h7*/ front_main: qcom,cam-sensor@1 { - + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + //eeprom-src = <&eeprom_front>; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 30 0>, + <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK1", + "CAM_RESET0"; + sensor-mode = <1>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; }; }; From 7b764d6aebfd4e4215e08de21e025d97cb3183c8 Mon Sep 17 00:00:00 2001 From: LeiJing1 Date: Fri, 16 Jun 2023 20:29:14 +0800 Subject: [PATCH 164/183] fogor: Bring up macro sc202acs details: add camera dtsi configuration for sc202acs Change-Id: Ic4721715a90d32602a7d328b1e54474a557ff3eb Signed-off-by: LeiJing1 Reviewed-on: https://gerrit.mot.com/2646555 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index 3fbfde5e048a..f242dbbee5fe 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -281,6 +281,40 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + + /* Rear sc202acs */ + rear_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; &cam_cci1 { From 0cc644f539c44ad44b441c2ba8e11ae6194623f4 Mon Sep 17 00:00:00 2001 From: Simon C Date: Fri, 16 Jun 2023 13:24:17 +0800 Subject: [PATCH 165/183] fogor: Bring up actuator of main camera[1/2] Details: Configure camera dtsi for main actuator Change-Id: Ice38cc4ff8e908e28393e781954bb551f52201f3 Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2645803 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 65 +++++++++++++++++----- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index f242dbbee5fe..a7bbf116a295 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -1,6 +1,18 @@ #include #include +&pm6125_gpios { + camera_ldo_50m_afvdd_en: camera_ldo_50m_afvdd_en { + pins = "gpio5"; + function = "normal"; + input-disable; + output-enable; + bias-pull-down; /* PULL DOWN */ + power-source = <0>; /* 1.8V */ + qcom,drive-strength = <2>; /* Medium */ + }; +}; + /*s5kjns s5k4h7 sc202acs iovdd*/ &L13A{ regulator-min-microvolt = <1800000>; @@ -30,7 +42,6 @@ gpio = <&tlmm 38 0>; pinctrl-names = "default"; pinctrl-0 = <&camera_ldo_50m_avdd_en>; - // vin-supply = <&vph_pwr>; }; /*s5k4h7 dvdd*/ @@ -47,6 +58,20 @@ pinctrl-0 = <&camera_ldo_8m_dvdd_en>; }; + camera_ldo_50m_afvdd: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x02 0x00>; + regulator-name = "camera_ldo_50m_afvdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&pm6125_gpios 5 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_afvdd_en>; + }; + + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -241,6 +266,20 @@ }; &cam_cci0 { + /* Rear 50M AF */ + actuator_rear_main: qcom,actuator@0{ + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&camera_ldo_50m_afvdd>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <103000>; + status = "ok"; + }; + /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { cell-index = <0>; @@ -249,31 +288,27 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - // actuator-src = <&actuator_rear_main>; + actuator-src = <&actuator_rear_main>; // eeprom-src = <&eeprom_rear>; cam_vio-supply = <&L13A>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&L3A>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names ="cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + cam_vaf-supply = <&camera_ldo_50m_afvdd>; + regulator-names ="cam_vio", "cam_vana", "cam_vdig", "cam_clk", "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; - rgltr-load-current = <120000 80000 1200000 0>; + rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 80000 1200000 0 103000>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk0_active - &cam_sensor_main_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_main_reset_suspend>; - gpios = <&tlmm 29 0>, - <&tlmm 35 0>; + pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, <&tlmm 35 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK0", - "CAM_RESET1"; + gpio-req-tbl-label = "CAMIF_MCLK0", "CAM_RESET1"; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; From b0a3f0343f44ffe2f8ab5a8b3d8aa9ab65f1eab6 Mon Sep 17 00:00:00 2001 From: Simon C Date: Fri, 16 Jun 2023 16:59:41 +0800 Subject: [PATCH 166/183] fogor: Bring up eeprom of main camera[1/2] Details: Configure camera dtsi for main eeprom Change-Id: I0aced399b2d3f5ca2abe8f73a4c6f3bc3c83ac02 Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2646175 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index a7bbf116a295..e9ea8ab8bf5a 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -280,6 +280,21 @@ status = "ok"; }; + /* Rear s5kjns eeprom */ + eeprom_rear: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L13A>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { cell-index = <0>; @@ -289,7 +304,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_rear_main>; - // eeprom-src = <&eeprom_rear>; + eeprom-src = <&eeprom_rear>; cam_vio-supply = <&L13A>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&L3A>; From a6eede787d6dbfc1de0df9dfce193a6a58796cfb Mon Sep 17 00:00:00 2001 From: yanglp10 Date: Tue, 20 Jun 2023 20:01:30 +0800 Subject: [PATCH 167/183] fogor: Bring up eeprom of front camera[2/2] details: Configure camera dtsi for front eeprom Change-Id: I4ba671e9f9db15233cbe6bbd7b1b0c4c1538d971 Signed-off-by: yanglp10 Reviewed-on: https://gerrit.mot.com/2649625 Reviewed-by: Reviewed-by: SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 49 +++++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index e9ea8ab8bf5a..1e64eb23fa67 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -368,6 +368,38 @@ }; &cam_cci1 { + /* Front s5k4h7 otp */ + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 30 0>, <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET0"; + sensor-mode = <1>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /*Front s5k4h7*/ front_main: qcom,cam-sensor@1 { cell-index = <1>; @@ -376,30 +408,25 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <0>; - //eeprom-src = <&eeprom_front>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&L13A>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&camera_ldo_8m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk"; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 1200000 0>; rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_front_reset_suspend>; - gpios = <&tlmm 30 0>, - <&tlmm 34 0>; + pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 30 0>, <&tlmm 34 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1 >; gpio-req-tbl-flags = <1 0 >; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET0"; + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET0"; sensor-mode = <1>; cci-master = <0>; status = "ok"; From cc83320ee100c28b86de5e4f2eb88093b6f16a05 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 20 Jun 2023 19:02:12 +0800 Subject: [PATCH 168/183] fogor: Bring up flash[2/2] Details: Configure camera dtsi Change-Id: Id59bc4a2dc0a16293160b127f9553915889a84f2 Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2649558 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 82 +++++++++++++++++++--- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index 1e64eb23fa67..abbfd5e0dba9 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -71,6 +71,18 @@ pinctrl-0 = <&camera_ldo_50m_afvdd_en>; }; + flash_ldo_dovdd: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "flash_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 24 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_dovdd_en>; + }; qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; @@ -79,6 +91,19 @@ }; &tlmm { + flash_ldo_dovdd_en: flash_ldo_dovdd_en { + mux { + pins = "gpio24"; + function = "gpio"; + }; + + config { + pins = "gpio24"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + cam_sensor_mclk0_active: cam_sensor_mclk0_active { mux { pins = "gpio29"; @@ -280,6 +305,43 @@ status = "ok"; }; + + /* Rear s5kjns FLASH */ + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + flash-type = ; + cam_vio-supply = <&L13A>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <100000 120000>; + distinguish-flash-supplier = <0xc6 0x0c 0x3a>; + cci-master = <1>; + status = "ok"; + }; + + /* MACRO sc202acs FLASH */ + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + flash-type = ; + cam_vio-supply = <&L13A>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <100000 120000>; + distinguish-flash-supplier = <0xc6 0x0c 0x3a>; + cci-master = <1>; + status = "ok"; + }; + /* Rear s5kjns eeprom */ eeprom_rear: qcom,eeprom@0 { cell-index = <0>; @@ -305,16 +367,18 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_rear_main>; eeprom-src = <&eeprom_rear>; + led-flash-src = <&led_flash_rear>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; cam_vio-supply = <&L13A>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&L3A>; cam_clk-supply = <&gcc_camss_top_gdsc>; cam_vaf-supply = <&camera_ldo_50m_afvdd>; - regulator-names ="cam_vio", "cam_vana", "cam_vdig", "cam_clk", "cam_vaf"; + regulator-names ="cam_v_custom2", "cam_vio", "cam_vana", "cam_vdig", "cam_clk", "cam_vaf"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; - rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; - rgltr-load-current = <120000 80000 1200000 0 103000>; + rgltr-min-voltage = <1800000 1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 120000 80000 1200000 0 103000>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_main_reset_active>; @@ -340,14 +404,16 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + led-flash-src = <&led_flash_macro>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; cam_vio-supply = <&L13A>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_clk"; + regulator-names = "cam_v_custom2", "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; - rgltr-min-voltage = <1800000 2800000 0>; - rgltr-max-voltage = <1800000 2800000 0>; - rgltr-load-current = <120000 80000 0>; + rgltr-min-voltage = <1800000 1800000 2800000 0>; + rgltr-max-voltage = <1800000 1800000 2800000 0>; + rgltr-load-current = <120000 120000 80000 0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; From 8da6236aa0edda4469e7e24880d4b09e555fa490 Mon Sep 17 00:00:00 2001 From: LeiJing1 Date: Wed, 21 Jun 2023 17:16:01 +0800 Subject: [PATCH 169/183] fogor: Bring up eeprom of macro sc202acs details: Configure camera dtsi for front eeprom Change-Id: I3ace2a2d494f78f426991af3c9ce854256e94f40 Signed-off-by: LeiJing1 Reviewed-on: https://gerrit.mot.com/2651022 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index abbfd5e0dba9..226154627260 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -357,6 +357,36 @@ status = "ok"; }; + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { cell-index = <0>; @@ -404,6 +434,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; led-flash-src = <&led_flash_macro>; cam_v_custom2-supply = <&flash_ldo_dovdd>; cam_vio-supply = <&L13A>; From 7b663468ea8b9a1353b464ef5625f6675ef6838b Mon Sep 17 00:00:00 2001 From: yanglp10 Date: Wed, 21 Jun 2023 20:42:50 +0800 Subject: [PATCH 170/183] fogor: Update the power pins of avdd Details: Update the power pins of avdd due to the new SCH. Change-Id: Iafeb8c97ce01c7fc6bcd8625a52a7cef72a82070 Signed-off-by: yanglp10 Reviewed-on: https://gerrit.mot.com/2651515 Reviewed-by: Zhichao Chen SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 37 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index 226154627260..93fd85e5701e 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -39,7 +39,7 @@ regulator-max-microvolt = <2800000>; regulator-enable-ramp-delay = <233>; enable-active-high; - gpio = <&tlmm 38 0>; + gpio = <&tlmm 8 0>; pinctrl-names = "default"; pinctrl-0 = <&camera_ldo_50m_avdd_en>; }; @@ -84,6 +84,19 @@ pinctrl-0 = <&flash_ldo_dovdd_en>; }; + camera_ldo_8m_avdd: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera_ldo_8m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_avdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -263,6 +276,19 @@ /* s5kjns avdd enable */ camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { + mux { + pins = "gpio8"; + function = "gpio"; + }; + + config { + pins = "gpio8"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { mux { pins = "gpio38"; function = "gpio"; @@ -357,12 +383,13 @@ status = "ok"; }; + /* Rear sc202acs eeprom */ eeprom_macro: qcom,eeprom@2 { cell-index = <2>; reg = <0x2>; compatible = "qcom,eeprom"; cam_vio-supply = <&L13A>; - cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; @@ -438,7 +465,7 @@ led-flash-src = <&led_flash_macro>; cam_v_custom2-supply = <&flash_ldo_dovdd>; cam_vio-supply = <&L13A>; - cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_v_custom2", "cam_vio", "cam_vana", "cam_clk"; rgltr-cntrl-support; @@ -471,7 +498,7 @@ reg = <0x1>; compatible = "qcom,eeprom"; cam_vio-supply = <&L13A>; - cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&camera_ldo_8m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; @@ -507,7 +534,7 @@ sensor-position-yaw = <0>; eeprom-src = <&eeprom_front>; cam_vio-supply = <&L13A>; - cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&camera_ldo_8m_dvdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; From 7de1e16904bf349cd15aed25bf62ca187c9ce6d0 Mon Sep 17 00:00:00 2001 From: Simon C Date: Thu, 6 Jul 2023 19:31:13 +0800 Subject: [PATCH 171/183] fogo: Setup camera driver baseline[2/3] Details: Configure the camera dtsi for fogo Change-Id: Idaae62515321b72cdeffceb72e03cefed5c0a6ef Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2667806 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 blair-camera-sensor-mot-fogo-overlay.dtsi diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi new file mode 100644 index 000000000000..61c6e6fa443f --- /dev/null +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -0,0 +1,22 @@ +#include +#include + +&tlmm { + +}; + +&soc { + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; + +}; + +&cam_cci0 { + +}; + +&cam_cci1 { + +}; From 1f4bc063f2e58dcc07a4c048f5ed32512ecac6c1 Mon Sep 17 00:00:00 2001 From: Simon C Date: Mon, 10 Jul 2023 15:42:38 +0800 Subject: [PATCH 172/183] fogo: Bring up main s5kjns Details: Add camera dtsi configuration for s5kjns Change-Id: I2210314f7277bf4c098f994abbbcdc3577e60489 Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2670426 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 169 +++++++++++++++++++++- 1 file changed, 167 insertions(+), 2 deletions(-) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index 61c6e6fa443f..3f677585ccb8 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -2,19 +2,184 @@ #include &tlmm { + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + + camera_ldo_iovdd_en: camera_ldo_iovdd_en { + mux { + pins = "gpio33"; + function = "gpio"; + }; + + config { + pins = "gpio33"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + /* s5kjns avdd enable */ + camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { + mux { + pins = "gpio36"; + function = "gpio"; + }; + + config { + pins = "gpio36"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + /* s5kjns dvdd enable */ + camera_ldo_50m_dvdd_en: camera_ldo_50m_dvdd_en { + mux { + pins = "gpio49"; + function = "gpio"; + }; + + config { + pins = "gpio49"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; }; &soc { + /*s5kjns s5k4h7 sc202acs iovdd*/ + camera_ldo_iovdd: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera_ldo_iovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 33 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_iovdd_en>; + }; + + /*s5kjns avdd*/ + camera_ldo_50m_avdd: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x01 0x00>; + regulator-name = "camera_ldo_50m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 36 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_avdd_en>; + }; + + /*s5kjns dvdd*/ + camera_ldo_50m_dvdd: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x02 0x00>; + regulator-name = "camera_ldo_50m_dvdd"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 49 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_dvdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; }; - }; &cam_cci0 { - + /* Rear s5kjns */ + rear_main: qcom,cam-sensor@0 { + 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 = <&camera_ldo_iovdd>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vdig-supply = <&camera_ldo_50m_dvdd>; + cam_clk-supply = <&gcc_camss_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_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; &cam_cci1 { From 56e2b3f32fa95d48b48c40c30581ad10c95bb73e Mon Sep 17 00:00:00 2001 From: LeiJing1 Date: Tue, 11 Jul 2023 18:48:32 +0800 Subject: [PATCH 173/183] fogo: Bring up macro sc202acs details: add camera dtsi configuration for sc202acs Change-Id: I2fd8690ba3703a59893b0337f503a74fb1168575 Signed-off-by: LeiJing1 Reviewed-on: https://gerrit.mot.com/2672336 Reviewed-by: SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 115 ++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index 3f677585ccb8..5301995f0128 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -28,6 +28,32 @@ }; }; + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + cam_sensor_main_reset_active: cam_sensor_main_reset_active { mux { pins = "gpio35"; @@ -55,6 +81,33 @@ }; }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + camera_ldo_iovdd_en: camera_ldo_iovdd_en { mux { pins = "gpio33"; @@ -95,6 +148,20 @@ drive-strength = <2>; /* 2 MA */ }; }; + + /*sc202acs AVDD enable*/ + camera_ldo_2m_avdd_en: camera_ldo_2m_avdd_en { + mux { + pins = "gpio51"; + function = "gpio"; + }; + + config { + pins = "gpio51"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; }; &soc { @@ -140,6 +207,20 @@ pinctrl-0 = <&camera_ldo_50m_dvdd_en>; }; + /*sc202acs avdd*/ + camera_ldo_2m_avdd: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "camera_ldo_2m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 51 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_2m_avdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -180,6 +261,40 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; + + /*Macro sc202acs*/ + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&camera_ldo_iovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; + sensor-mode = <1>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; &cam_cci1 { From 7455b9ea9c296227dd449bf0d55e9e88838c17d3 Mon Sep 17 00:00:00 2001 From: yanglp10 Date: Tue, 11 Jul 2023 21:26:08 +0800 Subject: [PATCH 174/183] fogo: Bring up front s5k4h7[2/2] details: Add camera dtsi configuration for s5k4h7 Change-Id: I7c2ad97c95b96f7e8a2ac8059d41d9f17eabba4b Signed-off-by: yanglp10 Reviewed-on: https://gerrit.mot.com/2672527 Reviewed-by: Reviewed-by: Simon C SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 124 +++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index 5301995f0128..e38b3f8b3cd8 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -1,6 +1,14 @@ #include #include +/*s5k4h7 dvdd*/ +&L3A{ + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + qcom,init-voltage = <1200000>; + status = "okay"; +}; + &tlmm { cam_sensor_mclk0_active: cam_sensor_mclk0_active { mux { @@ -28,6 +36,32 @@ }; }; + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + cam_sensor_mclk2_active: cam_sensor_mclk2_active { mux { pins = "gpio31"; @@ -81,6 +115,33 @@ }; }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { mux { pins = "gpio37"; @@ -149,6 +210,20 @@ }; }; + /*s5k4h7 avdd enable*/ + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + /*sc202acs AVDD enable*/ camera_ldo_2m_avdd_en: camera_ldo_2m_avdd_en { mux { @@ -221,6 +296,20 @@ pinctrl-0 = <&camera_ldo_2m_avdd_en>; }; + /*s5k4h7 avdd*/ + camera_ldo_8m_avdd: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera_ldo_8m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_avdd_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -298,5 +387,38 @@ }; &cam_cci1 { - + /*Front s5k4h7*/ + front_main: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_vio-supply = <&camera_ldo_iovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 30 0>, <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET0"; + sensor-mode = <1>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; }; From 59728ff2c00b69eb242a0abd29b5ed1e5ebab0e4 Mon Sep 17 00:00:00 2001 From: Simon C Date: Wed, 12 Jul 2023 17:39:14 +0800 Subject: [PATCH 175/183] fogo: Bring up actuator of main camera[1/2] Details: Configure camera dtsi for main actuator Change-Id: I9d05d0f2262e3c8dd5558a9119a78fb00cafbb7c Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2673726 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index e38b3f8b3cd8..1fdf229bb4c2 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -9,6 +9,14 @@ status = "okay"; }; +/*s5kjns afvdd*/ +&L21A{ + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + qcom,init-voltage = <2800000>; + status = "okay"; +}; + &tlmm { cam_sensor_mclk0_active: cam_sensor_mclk0_active { mux { @@ -317,6 +325,20 @@ }; &cam_cci0 { + /* Rear 50M AF */ + actuator_rear_main: qcom,actuator@0{ + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&L21A>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <103000>; + status = "ok"; + }; + /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { cell-index = <0>; @@ -325,6 +347,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + actuator-src = <&actuator_rear_main>; cam_vio-supply = <&camera_ldo_iovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; From 162abcf7ce07e21d231e41662488a0ef1a549a47 Mon Sep 17 00:00:00 2001 From: LeiJing1 Date: Thu, 13 Jul 2023 09:56:02 +0800 Subject: [PATCH 176/183] fogo: Bring up macro sc202acs otp details: add camera dtsi configuration for sc202acs otp Change-Id: I5b29739e629e01d898ece34091ff42ef0ac2aebb Signed-off-by: LeiJing1 Reviewed-on: https://gerrit.mot.com/2674537 Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 32 ++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index 1fdf229bb4c2..2e0c1af4d0b0 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -339,6 +339,36 @@ status = "ok"; }; + /*Macro sc202acs eeprom*/ + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_iovdd>; + cam_vana-supply = <&camera_ldo_2m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana","cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { cell-index = <0>; @@ -382,6 +412,7 @@ sensor-position-roll = <90>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; cam_vio-supply = <&camera_ldo_iovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; @@ -399,7 +430,6 @@ gpio-req-tbl-num = <0 1 >; gpio-req-tbl-flags = <1 0 >; gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; - sensor-mode = <1>; cci-master = <1>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; From e1d80806ab9d4ed2fa97d13fceb7ab543d131275 Mon Sep 17 00:00:00 2001 From: yanglp10 Date: Thu, 13 Jul 2023 13:26:05 +0800 Subject: [PATCH 177/183] fogo: Bring up s5k4h7 otp[2/2] details: Add camera dtsi configuration for s5k4h7 otp Change-Id: Ie06c0de47e321ad95cf771ec44855b7d7f37068e Signed-off-by: yanglp10 Reviewed-on: https://gerrit.mot.com/2674814 Reviewed-by: Reviewed-by: SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 47 +++++++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index 2e0c1af4d0b0..560f5f098a22 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -440,14 +440,46 @@ }; &cam_cci1 { - /*Front s5k4h7*/ - front_main: qcom,cam-sensor@1 { + /*Front s5k4h7 otp*/ + eeprom_front: qcom,eeprom@1 { cell-index = <1>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <3>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <0>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_iovdd>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 30 0>, <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET0"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /*Front s5k4h7*/ + front_main: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; cam_vio-supply = <&camera_ldo_iovdd>; cam_vana-supply = <&camera_ldo_8m_avdd>; cam_vdig-supply = <&L3A>; @@ -466,7 +498,6 @@ gpio-req-tbl-num = <0 1 >; gpio-req-tbl-flags = <1 0 >; gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET0"; - sensor-mode = <1>; cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; From 11aed8fb7a70e13af389d51e799ce1cdb8a26fd2 Mon Sep 17 00:00:00 2001 From: Simon C Date: Thu, 13 Jul 2023 14:49:59 +0800 Subject: [PATCH 178/183] fogo: Bring up flash[1/3] Details: Configure camera dtsi Change-Id: I35cea0b40b6e4904a9d17b7eb6264361d563915e Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2674927 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 86 +++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index 560f5f098a22..fa500e827dbb 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -245,6 +245,32 @@ drive-strength = <2>; /* 2 MA */ }; }; + + flash_ldo_torch_en: flash_ldo_torch_en { + mux { + pins = "gpio24"; + function = "gpio"; + }; + + config { + pins = "gpio24"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + flash_ldo_tx_en: flash_ldo_tx_en { + mux { + pins = "gpio97"; + function = "gpio"; + }; + + config { + pins = "gpio97"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; }; &soc { @@ -318,6 +344,32 @@ pinctrl-0 = <&camera_ldo_8m_avdd_en>; }; + flash_ldo_torch: gpio-regulator@5 { + compatible = "regulator-fixed"; + reg = <0x05 0x00>; + regulator-name = "flash_ldo_torch"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 24 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_torch_en>; + }; + + flash_ldo_tx: gpio-regulator@6 { + compatible = "regulator-fixed"; + reg = <0x06 0x00>; + regulator-name = "flash_ldo_tx"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 97 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_tx_en>; + }; + qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; @@ -369,6 +421,38 @@ clock-rates = <24000000>; }; + /* Rear s5kjns FLASH */ + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + flash-type = ; + cam_vio-supply = <&camera_ldo_iovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + cci-master = <1>; + status = "ok"; + }; + + /* MACRO sc202acs FLASH */ + led_flash_macro: qcom,camera-flash@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,camera-flash"; + flash-type = ; + cam_vio-supply = <&camera_ldo_iovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <100000>; + cci-master = <1>; + status = "ok"; + }; + /* Rear s5kjns */ rear_main: qcom,cam-sensor@0 { cell-index = <0>; @@ -378,6 +462,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; actuator-src = <&actuator_rear_main>; + led-flash-src = <&led_flash_rear>; cam_vio-supply = <&camera_ldo_iovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; @@ -413,6 +498,7 @@ sensor-position-pitch = <0>; sensor-position-yaw = <180>; eeprom-src = <&eeprom_macro>; + led-flash-src = <&led_flash_macro>; cam_vio-supply = <&camera_ldo_iovdd>; cam_vana-supply = <&camera_ldo_2m_avdd>; cam_clk-supply = <&gcc_camss_top_gdsc>; From d77d457188a61e19d20a60ef657cdc5bec6806b3 Mon Sep 17 00:00:00 2001 From: Simon C Date: Wed, 12 Jul 2023 20:32:27 +0800 Subject: [PATCH 179/183] fogo: Bring up eeprom of main camera[1/2] Details: Configure camera dtsi for main eeprom Change-Id: I1e4738bd1cfa794b81e01e6cc141231a052a5231 Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2673926 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogo-overlay.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/blair-camera-sensor-mot-fogo-overlay.dtsi b/blair-camera-sensor-mot-fogo-overlay.dtsi index fa500e827dbb..cbbc29a03125 100644 --- a/blair-camera-sensor-mot-fogo-overlay.dtsi +++ b/blair-camera-sensor-mot-fogo-overlay.dtsi @@ -391,6 +391,21 @@ status = "ok"; }; + /* Rear s5kjns eeprom */ + eeprom_rear: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&camera_ldo_iovdd>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + /*Macro sc202acs eeprom*/ eeprom_macro: qcom,eeprom@2 { cell-index = <2>; @@ -463,6 +478,7 @@ sensor-position-yaw = <180>; actuator-src = <&actuator_rear_main>; led-flash-src = <&led_flash_rear>; + eeprom-src = <&eeprom_rear>; cam_vio-supply = <&camera_ldo_iovdd>; cam_vana-supply = <&camera_ldo_50m_avdd>; cam_vdig-supply = <&camera_ldo_50m_dvdd>; From d68fa33bd650e2b47595d40500ec0782334018f1 Mon Sep 17 00:00:00 2001 From: Franz Wang Date: Fri, 21 Jul 2023 15:25:41 +0800 Subject: [PATCH 180/183] camera-devicetree: add init file for fogos bringup add the missing configuraiton for fogos bringup when we configure fogos project DTB correctly build error: /home/wangxf14/work/2021/sm6375_s/vendor/kernel/msm-5.4/arch/arm64/boot/dts/vendor/qcom/blair-fogos-common-overlay.dtsi:23:10: fatal error: 'camera/blair-camera-sensor-mot-fogos-overlay.dtsi' file not found Change-Id: Id67c8b5439e57fa052290bd29957070b2ddf7431 Signed-off-by: Franz Wang Reviewed-on: https://gerrit.mot.com/2684392 Reviewed-by: Xiaojun Ji SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Huosheng Liao Submit-Approved: Jira Key Reviewed-by: Tested-by: Jira Key --- blair-camera-sensor-mot-fogos-overlay.dtsi | 562 +++++++++++++++++++++ 1 file changed, 562 insertions(+) create mode 100644 blair-camera-sensor-mot-fogos-overlay.dtsi diff --git a/blair-camera-sensor-mot-fogos-overlay.dtsi b/blair-camera-sensor-mot-fogos-overlay.dtsi new file mode 100644 index 000000000000..93fd85e5701e --- /dev/null +++ b/blair-camera-sensor-mot-fogos-overlay.dtsi @@ -0,0 +1,562 @@ +#include +#include + +&pm6125_gpios { + camera_ldo_50m_afvdd_en: camera_ldo_50m_afvdd_en { + pins = "gpio5"; + function = "normal"; + input-disable; + output-enable; + bias-pull-down; /* PULL DOWN */ + power-source = <0>; /* 1.8V */ + qcom,drive-strength = <2>; /* Medium */ + }; +}; + +/*s5kjns s5k4h7 sc202acs iovdd*/ +&L13A{ + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,init-voltage = <1800000>; + status = "okay"; +}; + +/*s5kjns dvdd*/ +&L3A{ + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + qcom,init-voltage = <1050000>; + status = "okay"; +}; + +&soc { + /*s5kjns avdd*/ + camera_ldo_50m_avdd: gpio-regulator@0 { + compatible = "regulator-fixed"; + reg = <0x00 0x00>; + regulator-name = "camera_ldo_50m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 8 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_avdd_en>; + }; + + /*s5k4h7 dvdd*/ + camera_ldo_8m_dvdd: gpio-regulator@1 { + compatible = "regulator-fixed"; + reg = <0x01 0x00>; + regulator-name = "camera_ldo_8m_dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_dvdd_en>; + }; + + camera_ldo_50m_afvdd: gpio-regulator@2 { + compatible = "regulator-fixed"; + reg = <0x02 0x00>; + regulator-name = "camera_ldo_50m_afvdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&pm6125_gpios 5 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_50m_afvdd_en>; + }; + + flash_ldo_dovdd: gpio-regulator@3 { + compatible = "regulator-fixed"; + reg = <0x03 0x00>; + regulator-name = "flash_ldo_dovdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 24 0>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_ldo_dovdd_en>; + }; + + camera_ldo_8m_avdd: gpio-regulator@4 { + compatible = "regulator-fixed"; + reg = <0x04 0x00>; + regulator-name = "camera_ldo_8m_avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-enable-ramp-delay = <233>; + enable-active-high; + gpio = <&tlmm 38 0>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_ldo_8m_avdd_en>; + }; + + qcom,cam-res-mgr { + compatible = "qcom,cam-res-mgr"; + status = "ok"; + }; +}; + +&tlmm { + flash_ldo_dovdd_en: flash_ldo_dovdd_en { + mux { + pins = "gpio24"; + function = "gpio"; + }; + + config { + pins = "gpio24"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_active: cam_sensor_mclk0_active { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { + mux { + pins = "gpio29"; + function = "cam_mclk"; + }; + + config { + pins = "gpio29"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_active: cam_sensor_mclk1_active { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { + mux { + pins = "gpio30"; + function = "cam_mclk"; + }; + + config { + pins = "gpio30"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_mclk2_active: cam_sensor_mclk2_active { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-disable; /* No PULL */ + drive-strength = <2>; + }; + }; + + cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { + mux { + pins = "gpio31"; + function = "cam_mclk"; + }; + + config { + pins = "gpio31"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; + }; + }; + + cam_sensor_main_reset_active: cam_sensor_main_reset_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_main_reset_suspend: cam_sensor_main_reset_suspend { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_macro_reset_active: cam_sensor_macro_reset_active { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_macro_reset_suspend: cam_sensor_macro_reset_suspend { + mux { + pins = "gpio37"; + function = "gpio"; + }; + + config { + pins = "gpio37"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + cam_sensor_front_reset_active: cam_sensor_front_reset_active { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + cam_sensor_front_reset_suspend: cam_sensor_front_reset_suspend { + mux { + pins = "gpio34"; + function = "gpio"; + }; + + config { + pins = "gpio34"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; + }; + +/* s5kjns avdd enable */ + camera_ldo_50m_avdd_en: camera_ldo_50m_avdd_en { + mux { + pins = "gpio8"; + function = "gpio"; + }; + + config { + pins = "gpio8"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + + camera_ldo_8m_avdd_en: camera_ldo_8m_avdd_en { + mux { + pins = "gpio38"; + function = "gpio"; + }; + + config { + pins = "gpio38"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; + +/* s5k4h7 dvdd enable */ + camera_ldo_8m_dvdd_en: camera_ldo_8m_dvdd_en { + mux { + pins = "gpio6"; + function = "gpio"; + }; + + config { + pins = "gpio6"; + bias-disable; /* No PULL */ + drive-strength = <2>; /* 2 MA */ + }; + }; +}; + +&cam_cci0 { + /* Rear 50M AF */ + actuator_rear_main: qcom,actuator@0{ + cell-index = <0>; + compatible = "qcom,actuator"; + cci-master = <0>; + cam_vaf-supply = <&camera_ldo_50m_afvdd>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2800000>; + rgltr-max-voltage = <2800000>; + rgltr-load-current = <103000>; + status = "ok"; + }; + + + /* Rear s5kjns FLASH */ + led_flash_rear: qcom,camera-flash@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,camera-flash"; + flash-type = ; + cam_vio-supply = <&L13A>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <100000 120000>; + distinguish-flash-supplier = <0xc6 0x0c 0x3a>; + cci-master = <1>; + status = "ok"; + }; + + /* MACRO sc202acs FLASH */ + led_flash_macro: qcom,camera-flash@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,camera-flash"; + flash-type = ; + cam_vio-supply = <&L13A>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + regulator-names = "cam_vio","cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1800000>; + rgltr-max-voltage = <1800000 1800000>; + rgltr-load-current = <100000 120000>; + distinguish-flash-supplier = <0xc6 0x0c 0x3a>; + cci-master = <1>; + status = "ok"; + }; + + /* Rear s5kjns eeprom */ + eeprom_rear: qcom,eeprom@0 { + cell-index = <0>; + reg = <0x0>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L13A>; + regulator-names = "cam_vio"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000>; + rgltr-max-voltage = <1800000>; + rgltr-load-current = <120000>; + cci-master = <0>; + status = "ok"; + }; + + /* Rear sc202acs eeprom */ + eeprom_macro: qcom,eeprom@2 { + cell-index = <2>; + reg = <0x2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 0>; + rgltr-max-voltage = <1800000 2800000 0>; + rgltr-load-current = <120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /* Rear s5kjns */ + rear_main: qcom,cam-sensor@0 { + cell-index = <0>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + actuator-src = <&actuator_rear_main>; + eeprom-src = <&eeprom_rear>; + led-flash-src = <&led_flash_rear>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_50m_avdd>; + cam_vdig-supply = <&L3A>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + cam_vaf-supply = <&camera_ldo_50m_afvdd>; + regulator-names ="cam_v_custom2", "cam_vio", "cam_vana", "cam_vdig", "cam_clk", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1800000 2800000 1050000 0 2800000>; + rgltr-max-voltage = <1800000 1800000 2800000 1050000 0 2800000>; + rgltr-load-current = <120000 120000 80000 1200000 0 103000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_main_reset_active>; + pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_main_reset_suspend>; + gpios = <&tlmm 29 0>, <&tlmm 35 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK0", "CAM_RESET1"; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /* Rear sc202acs */ + rear_macro: qcom,cam-sensor@2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_macro>; + led-flash-src = <&led_flash_macro>; + cam_v_custom2-supply = <&flash_ldo_dovdd>; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_v_custom2", "cam_vio", "cam_vana", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1800000 2800000 0>; + rgltr-max-voltage = <1800000 1800000 2800000 0>; + rgltr-load-current = <120000 120000 80000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_macro_reset_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_macro_reset_suspend>; + gpios = <&tlmm 31 0>, <&tlmm 37 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK2", "CAM_RESET3"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; + +&cam_cci1 { + /* Front s5k4h7 otp */ + eeprom_front: qcom,eeprom@1 { + cell-index = <1>; + reg = <0x1>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 30 0>, <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET0"; + sensor-mode = <1>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /*Front s5k4h7*/ + front_main: qcom,cam-sensor@1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&L13A>; + cam_vana-supply = <&camera_ldo_8m_avdd>; + cam_vdig-supply = <&camera_ldo_8m_dvdd>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1200000 0>; + rgltr-max-voltage = <1800000 2800000 1200000 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_front_reset_active>; + pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_front_reset_suspend>; + gpios = <&tlmm 30 0>, <&tlmm 34 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1 >; + gpio-req-tbl-flags = <1 0 >; + gpio-req-tbl-label = "CAMIF_MCLK1", "CAM_RESET0"; + sensor-mode = <1>; + cci-master = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; +}; From 8df6ef15d2676c897afb6126be0db28dac881dd7 Mon Sep 17 00:00:00 2001 From: Simon C Date: Wed, 28 Jun 2023 20:14:55 +0800 Subject: [PATCH 181/183] fogor: Actuator noise reduction[1/2] Details: Add flag multi-user-support in actuator, leverage from penang. Change-Id: I955b85d50ed743020239645548239bf9feec7032 Signed-off-by: Simon C Reviewed-on: https://gerrit.mot.com/2659044 Reviewed-by: SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index 93fd85e5701e..82c0821e293f 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -101,6 +101,11 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; }; &tlmm { @@ -329,6 +334,7 @@ rgltr-max-voltage = <2800000>; rgltr-load-current = <103000>; status = "ok"; + multi-user-support; }; From 43588840cb58aa7fa541b6c2b5085fb1e61f45a7 Mon Sep 17 00:00:00 2001 From: yanglp10 Date: Tue, 1 Aug 2023 19:21:47 +0800 Subject: [PATCH 182/183] fogor: Modify mclk for s5k4h7 details: modify the current of MCLK1 from 2mA to 4mA Change-Id: I548ee862c1668f509440583f279dd2f4fd9cba2c Signed-off-by: yanglp10 Reviewed-on: https://gerrit.mot.com/2696162 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Simon C Reviewed-by: Reviewed-by: Reviewed-by: Long Cheng Reviewed-by: Zhuoran Xu Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogor-overlay.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blair-camera-sensor-mot-fogor-overlay.dtsi b/blair-camera-sensor-mot-fogor-overlay.dtsi index 82c0821e293f..7d64a8903dbf 100644 --- a/blair-camera-sensor-mot-fogor-overlay.dtsi +++ b/blair-camera-sensor-mot-fogor-overlay.dtsi @@ -157,7 +157,7 @@ config { pins = "gpio30"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; @@ -170,7 +170,7 @@ config { pins = "gpio30"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; From 2639599f001bd44776afe25bac900e2a78245f8e Mon Sep 17 00:00:00 2001 From: huqian4 Date: Fri, 18 Aug 2023 15:31:34 +0800 Subject: [PATCH 183/183] fogos: Actuator noise reduction[1/2] Details: Sync from fogor dtsi. Change-Id: I84b266a6c032b05457de70e01c61fd4dcc22a983 Signed-off-by: huqian4 Reviewed-on: https://gerrit.mot.com/2713194 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Simon C Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- blair-camera-sensor-mot-fogos-overlay.dtsi | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/blair-camera-sensor-mot-fogos-overlay.dtsi b/blair-camera-sensor-mot-fogos-overlay.dtsi index 93fd85e5701e..7d64a8903dbf 100644 --- a/blair-camera-sensor-mot-fogos-overlay.dtsi +++ b/blair-camera-sensor-mot-fogos-overlay.dtsi @@ -101,6 +101,11 @@ compatible = "qcom,cam-res-mgr"; status = "ok"; }; + + mot,cam-actuator { + compatible = "mot,actuator"; + status = "ok"; + }; }; &tlmm { @@ -152,7 +157,7 @@ config { pins = "gpio30"; bias-disable; /* No PULL */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; @@ -165,7 +170,7 @@ config { pins = "gpio30"; bias-pull-down; /* PULL DOWN */ - drive-strength = <2>; /* 2 MA */ + drive-strength = <4>; /* 4 MA */ }; }; @@ -329,6 +334,7 @@ rgltr-max-voltage = <2800000>; rgltr-load-current = <103000>; status = "ok"; + multi-user-support; };