diff --git a/bengal-camera-sensor-idp.dtsi b/bengal-camera-sensor-idp.dtsi index 48f40a98c4a5..b52eee3e7d84 100644 --- a/bengal-camera-sensor-idp.dtsi +++ b/bengal-camera-sensor-idp.dtsi @@ -1,88 +1,162 @@ #include &soc { - led_flash_rear: qcom,camera-flash@0 { - cell-index = <0>; - compatible = "qcom,camera-flash"; - flash-source = <&pmi632_flash0 &pmi632_flash1>; - torch-source = <&pmi632_torch0 &pmi632_torch1>; - switch-source = <&pmi632_switch0 &pmi632_switch0>; - status = "ok"; - }; - - led_flash_rear_aux: qcom,camera-flash@1 { - cell-index = <1>; - compatible = "qcom,camera-flash"; - flash-source = <&pmi632_flash0 &pmi632_flash1>; - torch-source = <&pmi632_torch0 &pmi632_torch1>; - switch-source = <&pmi632_switch0 &pmi632_switch0>; - status = "ok"; - }; - - led_flash_rear_aux2: qcom,camera-flash@2 { - cell-index = <2>; - compatible = "qcom,camera-flash"; - flash-source = <&pmi632_flash0 &pmi632_flash1>; - torch-source = <&pmi632_torch0 &pmi632_torch1>; - switch-source = <&pmi632_switch0 &pmi632_switch0>; - status = "ok"; - }; - qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; + gpios-shared-pinctrl = <480>; + shared-pctrl-gpio-names = "gmsl"; + pinctrl-names = "gmsl_active", "gmsl_suspend"; + pinctrl-0 = <&cam_sensor_gmsl_active>; + pinctrl-1 = <&cam_sensor_gmsl_suspend>; + }; +}; + +&tlmm { + cam_sensor_gmsl_active: cam_sensor_active_gmsl { + /* RESET */ + mux { + pins = "gpio81"; + function = "gpio"; + }; + + config { + pins = "gpio81"; + bias-pull-up; + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + + cam_sensor_gmsl_suspend: cam_sensor_suspend_gmsl { + /* RESET */ + mux { + pins = "gpio81"; + function = "gpio"; + }; + + config { + pins = "gpio81"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; }; }; &cam_cci0 { - actuator_rear: qcom,actuator0 { - cell-index = <0>; - compatible = "qcom,actuator"; - cci-master = <0>; - cam_vaf-supply = <&L5P>; - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - status = "ok"; - }; - actuator_rear_aux: qcom,actuator1 { - cell-index = <1>; - compatible = "qcom,actuator"; - cci-master = <1>; - cam_vaf-supply = <&L5P>; - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - status = "ok"; - }; - - eeprom_rear: qcom,eeprom0 { + /* CAM0A */ + qcom,cam-sensor0 { cell-index = <0>; - compatible = "qcom,eeprom"; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; cam_vio-supply = <&L7P>; - cam_vana-supply = <&L4P>; - cam_vdig-supply = <&L2P>; - cam_vaf-supply = <&L5P>; + cam_vana-supply = <&L3P>; + cam_vdig-supply = <&L1P>; + cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; + "cam_clk"; rgltr-cntrl-support; pwm-switch; - rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>; - rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>; - rgltr-load-current = <120000 80000 1200000 0 100000>; + 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_active_rst0>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_suspend_rst0>; + gpios = <&tlmm 28 0>, + <&tlmm 18 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET0"; + sensor-mode = <0>; + cci-master = <1>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /* CAM1 */ + qcom,cam-sensor1 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&L7P>; + cam_vana-supply = <&L5P>; + cam_vdig-supply = <&L2P>; + + 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_mclk1_active + &cam_sensor_active_rst1>; + pinctrl-1 = <&cam_sensor_mclk1_suspend + &cam_sensor_suspend_rst1>; + gpios = <&tlmm 21 0>, + <&tlmm 24 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 = <0>; + status = "ok"; + clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; + + /* CAM0B */ + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&L7P>; + cam_vana-supply = <&L4P>; + cam_vdig-supply = <&L1P>; + + 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_rear0_reset_active>; + &cam_sensor_active_rst2>; pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear0_reset_suspend>; + &cam_sensor_suspend_rst2>; gpios = <&tlmm 20 0>, - <&tlmm 18 0>; + <&tlmm 44 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; @@ -94,68 +168,95 @@ clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; - clock-rates = <19200000>; + clock-rates = <24000000>; }; - eeprom_rear_aux: qcom,eeprom1 { - cell-index = <1>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L3P>; - cam_vdig-supply = <&L1P>; - cam_vaf-supply = <&L5P>; + /* GMSL-1 */ + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; + regulator-names = "cam_clk"; rgltr-cntrl-support; pwm-switch; - rgltr-min-voltage = <1800000 2800000 1200000 0 2800000>; - rgltr-max-voltage = <1800000 2800000 1200000 0 2800000>; - rgltr-load-current = <120000 80000 1200000 0 100000>; + rgltr-min-voltage = <0>; + rgltr-max-voltage = <0>; + rgltr-load-current = <0>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_rear1_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_rear1_reset_suspend>; - gpios = <&tlmm 21 0>, - <&tlmm 19 0>; - gpio-reset = <1>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET1"; + pinctrl-0 = <&cam_sensor_gmsl_active>; + pinctrl-1 = <&cam_sensor_gmsl_suspend>; + gpios = <&tlmm 81 0>; + gpio-reset = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CAM_RESET2"; sensor-mode = <0>; - cci-master = <1>; + cci-master = <0>; status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <19200000>; }; - eeprom_front: qcom,eeprom2 { - cell-index = <2>; - compatible = "qcom,eeprom"; + /* GMSL-2 */ + qcom,cam-sensor4 { + cell-index = <4>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <0>; + rgltr-max-voltage = <0>; + rgltr-load-current = <0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_gmsl_active>; + pinctrl-1 = <&cam_sensor_gmsl_suspend>; + gpios = <&tlmm 81 0>; + gpio-reset = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CAM_RESET2"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + }; + + /* CAM2 */ + qcom,cam-sensor5 { + cell-index = <5>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; cam_vio-supply = <&L7P>; cam_vana-supply = <&L6P>; cam_vdig-supply = <&L2P>; + 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 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; - rgltr-load-current = <0 80000 105000 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_mclk2_active - &cam_sensor_front0_reset_active>; + &cam_sensor_active_rst5>; pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front0_reset_suspend>; + &cam_sensor_suspend_rst5>; gpios = <&tlmm 27 0>, - <&tlmm 24 0>; + <&tlmm 19 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; @@ -169,233 +270,4 @@ clock-cntl-level = "turbo"; clock-rates = <24000000>; }; - - eeprom_rear_aux2: qcom,eeprom3 { - cell-index = <3>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L6P>; - cam_vdig-supply = <&L1P>; - 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_mclk3_active - &cam_sensor_rear2_reset_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_rear2_reset_suspend>; - gpios = <&tlmm 28 0>, - <&tlmm 65 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 = <19200000>; - }; - - /* Rear*/ - qcom,cam-sensor0 { - cell-index = <0>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <0>; - sensor-position-roll = <270>; - 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 = <&L7P>; - cam_vana-supply = <&L4P>; - cam_vdig-supply = <&L2P>; - 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 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_rear0_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear0_reset_suspend>; - gpios = <&tlmm 20 0>, - <&tlmm 18 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 = <19200000>; - }; - - /*Rear Aux*/ - qcom,cam-sensor1 { - cell-index = <1>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - actuator-src = <&actuator_rear_aux>; - led-flash-src = <&led_flash_rear_aux>; - eeprom-src = <&eeprom_rear_aux>; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L3P>; - cam_vdig-supply = <&L1P>; - 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_mclk1_active - &cam_sensor_rear1_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_rear1_reset_suspend>; - gpios = <&tlmm 21 0>, - <&tlmm 19 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 = <19200000>; - }; - - /*Front*/ - 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 = <0>; - eeprom-src = <&eeprom_front>; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L6P>; - cam_vdig-supply = <&L2P>; - 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 1050000 0>; - rgltr-max-voltage = <1800000 2800000 1050000 0>; - rgltr-load-current = <0 80000 105000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active - &cam_sensor_front0_reset_active - &cam_sensor_csi_mux_oe_active - &cam_sensor_csi_mux_sel_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front0_reset_suspend - &cam_sensor_csi_mux_oe_suspend - &cam_sensor_csi_mux_sel_suspend>; - gpios = <&tlmm 27 0>, - <&tlmm 24 0>, - <&tlmm 66 0>, - <&tlmm 67 0>; - gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-custom2 = <3>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET2", - "CAM_CSIMUX_OE0", - "CAM_CSIMUX_SEL0"; - 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 Aux2*/ - qcom,cam-sensor3 { - cell-index = <3>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <2>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - led-flash-src = <&led_flash_rear_aux2>; - eeprom-src = <&eeprom_rear_aux2>; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L6P>; - cam_vdig-supply = <&L1P>; - 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_mclk3_active - &cam_sensor_rear2_reset_active - &cam_sensor_csi_mux_oe_active - &cam_sensor_csi_mux_sel_active>; - pinctrl-1 = <&cam_sensor_mclk3_suspend - &cam_sensor_rear2_reset_suspend - &cam_sensor_csi_mux_oe_suspend - &cam_sensor_csi_mux_sel_suspend>; - gpios = <&tlmm 28 0>, - <&tlmm 65 0>, - <&tlmm 66 0>, - <&tlmm 67 0>; - gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-custom2 = <3>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK3", - "CAM_RESET3", - "CAM_CSIMUX_OE1", - "CAM_CSIMUX_SEL1"; - sensor-mode = <0>; - cci-master = <0>; - status = "ok"; - clocks = <&gcc GCC_CAMSS_MCLK3_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <19200000>; - }; }; diff --git a/bengal-camera.dtsi b/bengal-camera.dtsi index 32e146f7d05c..c1d85c009b86 100644 --- a/bengal-camera.dtsi +++ b/bengal-camera.dtsi @@ -38,7 +38,6 @@ <240000000 0 200000000 0>, <341330000 0 200000000 0>, <384000000 0 268800000 0>; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; status = "ok"; }; @@ -69,7 +68,6 @@ <240000000 0 200000000 0>, <341330000 0 200000000 0>, <384000000 0 268800000 0>; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; status = "ok"; }; @@ -100,7 +98,6 @@ <240000000 0 200000000 0>, <341330000 0 200000000 0>, <384000000 0 268800000 0>; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; status = "ok"; }; @@ -277,13 +274,13 @@ reg = <0x5c11000 0x1000>, <0x5c13000 0x4000>; reg-cam-base = <0x11000 0x13000>; + cam_hw_fuse = ; interrupt-names = "cpas_camnoc"; interrupts = ; - camnoc-axi-min-ib-bw = <3000000000>; /*Need to be verified*/ + camnoc-axi-min-ib-bw = <3000000000>; regulator-names = "camss-vdd"; camss-vdd-supply = <&gcc_camss_top_gdsc>; clock-names = - "gcc_camss_ahb_clk", "gcc_camss_top_ahb_clk", "gcc_camss_top_ahb_clk_src", "gcc_camss_axi_clk", @@ -291,7 +288,6 @@ "gcc_camss_nrt_axi_clk", "gcc_camss_rt_axi_clk"; clocks = - <&gcc GCC_CAMERA_AHB_CLK>, <&gcc GCC_CAMSS_TOP_AHB_CLK>, <&gcc GCC_CAMSS_TOP_AHB_CLK_SRC>, <&gcc GCC_CAMSS_AXI_CLK>, @@ -300,47 +296,37 @@ <&gcc GCC_CAMSS_RT_AXI_CLK>; src-clock-name = "gcc_camss_axi_clk_src"; clock-rates = - <0 0 0 0 0 0 0>, - <0 0 80000000 0 19200000 0 0>, - <0 0 80000000 0 150000000 0 0>, - <0 0 80000000 0 200000000 0 0>, - <0 0 80000000 0 300000000 0 0>, - <0 0 80000000 0 300000000 0 0>, - <0 0 80000000 0 300000000 0 0>; - clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs", - "svs_l1", "nominal", "turbo"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; + <0 0 0 0 0 0>, + <0 19200000 0 19200000 0 0>, + <0 80000000 0 150000000 0 0>, + <0 80000000 0 200000000 0 0>, + <0 80000000 0 300000000 0 0>, + <0 80000000 0 300000000 0 0>, + <0 80000000 0 300000000 0 0>; + clock-cntl-level = "suspend", "lowsvs", "svs", + "svs_l1", "nominal", "nominal_l1", "turbo"; control-camnoc-axi-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <20>; - qcom,msm-bus,name = "cam_ahb"; - qcom,msm-bus,num-cases = <7>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - , - , - , - , - , - , - ; - vdd-corners = ; + interconnect-names = "cam_ahb"; + interconnects =<&bimc MASTER_AMPSS_M0 + &config_noc SLAVE_CAMERA_CFG>; + cam-ahb-num-cases = <7>; + cam-ahb-bw-KBps = + <0 0>, <0 133333>, <0 150000>, <0 150000>, + <0 300000>, <0 300000>, <0 300000>; + vdd-corners = ; vdd-corner-ahb-mapping = "suspend", "minsvs", "lowsvs", "svs", "svs_l1", "nominal", "nominal", "nominal", @@ -360,19 +346,12 @@ node-name = "level2-rt0-rd-wr-sum"; traffic-merge-type = ; - qcom,axi-port-name = "cam_hf_0"; ib-bw-voting-needed; qcom,axi-port-mnoc { - qcom,msm-bus,name = - "cam_hf_0_mnoc"; - qcom,msm-bus-vector-dyn-vote; - qcom,msm-bus,num-cases = <2>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - , - ; + interconnect-names = "cam_hf_0"; + interconnects = + <&mmrt_virt MASTER_CAMNOC_HF + &bimc SLAVE_EBI_CH0>; }; }; @@ -381,18 +360,11 @@ node-name = "level2-nrt0-rd-wr-sum"; traffic-merge-type = ; - qcom,axi-port-name = "cam_sf_0"; qcom,axi-port-mnoc { - qcom,msm-bus,name = - "cam_sf_0_mnoc"; - qcom,msm-bus-vector-dyn-vote; - qcom,msm-bus,num-cases = <2>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - , - ; + interconnect-names = "cam_sf_0"; + interconnects = + <&mmnrt_virt MASTER_CAMNOC_SF + &bimc SLAVE_EBI_CH0>; }; }; }; @@ -594,8 +566,8 @@ compatible = "qcom,csid530"; reg-names = "csid", "top", "camnoc"; reg = <0x5c6e000 0x5000>, - <0x5c11000 0x1000>, - <0x5c13000 0x4000>; + <0x5c11000 0x1000>, + <0x5c13000 0x4000>; reg-cam-base = <0x6e000 0x11000 0x13000>; interrupt-names = "csid0"; interrupts = ; @@ -622,7 +594,6 @@ clock-cntl-level = "svs", "svs_l1", "turbo"; src-clock-name = "tfe_csid_clk_src"; clock-control-debugfs = "true"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; status = "ok"; }; @@ -649,7 +620,6 @@ clock-cntl-level = "svs", "svs_l1", "turbo"; src-clock-name = "tfe_clk_src"; clock-control-debugfs = "true"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; cam_hw_pid = <4>; status = "ok"; }; @@ -659,8 +629,8 @@ compatible = "qcom,csid530"; reg-names = "csid", "top", "camnoc"; reg = <0x5c75000 0x5000>, - <0x5c11000 0x1000>, - <0x5c13000 0x4000>; + <0x5c11000 0x1000>, + <0x5c13000 0x4000>; reg-cam-base = <0x75000 0x11000 0x13000>; interrupt-names = "csid1"; interrupts = ; @@ -687,7 +657,6 @@ clock-cntl-level = "svs", "svs_l1", "turbo"; src-clock-name = "tfe_csid_clk_src"; clock-control-debugfs = "true"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; status = "ok"; }; @@ -714,7 +683,6 @@ clock-cntl-level = "svs", "svs_l1", "turbo"; src-clock-name = "tfe_clk_src"; clock-control-debugfs = "true"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; cam_hw_pid = <5>; status = "ok"; }; @@ -724,8 +692,8 @@ compatible = "qcom,csid530"; reg-names = "csid", "top", "camnoc"; reg = <0x5c7c000 0x5000>, - <0x5c11000 0x1000>, - <0x5c13000 0x4000>; + <0x5c11000 0x1000>, + <0x5c13000 0x4000>; reg-cam-base = <0x7c000 0x11000 0x13000>; interrupt-names = "csid2"; interrupts = ; @@ -752,7 +720,6 @@ clock-cntl-level = "svs", "svs_l1", "turbo"; src-clock-name = "tfe_csid_clk_src"; clock-control-debugfs = "true"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; status = "ok"; }; @@ -779,7 +746,6 @@ clock-cntl-level = "svs", "svs_l1", "turbo"; src-clock-name = "tfe_clk_src"; clock-control-debugfs = "true"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; cam_hw_pid = <6>; status = "ok"; }; @@ -814,7 +780,7 @@ cam_tfe_tpg1: qcom,tpg1@5c68000 { cell-index = <1>; compatible = "qcom,tpg101"; - reg-names = "tpg0", "top"; + reg-names = "tpg1", "top"; reg = <0x5c68000 0x400>, <0x5c11000 0x1000>; reg-cam-base = <0x68000 0x11000>; @@ -868,21 +834,22 @@ regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; clock-names = + "ope_ahb_clk_src", "ope_ahb_clk", "ope_clk_src", "ope_clk"; clocks = + <&gcc GCC_CAMSS_OPE_AHB_CLK_SRC>, <&gcc GCC_CAMSS_OPE_AHB_CLK>, <&gcc GCC_CAMSS_OPE_CLK_SRC>, <&gcc GCC_CAMSS_OPE_CLK>; clock-rates = - <171428571 200000000 0>, - <171428571 266600000 0>, - <240000000 465000000 0>, - <240000000 580000000 0>; + <19200000 0 19200000 0>, + <171428571 0 200000000 0>, + <240000000 0 465000000 0>, + <240000000 0 580000000 0>; clock-cntl-level = "svs", "svs_l1", "nominal", "turbo"; src-clock-name = "ope_clk_src"; - qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; status = "ok"; }; }; diff --git a/qrb2210-rb1-camera-sensor-idp.dtsi b/qrb2210-rb1-camera-sensor-idp.dtsi deleted file mode 100644 index 225701809a35..000000000000 --- a/qrb2210-rb1-camera-sensor-idp.dtsi +++ /dev/null @@ -1,293 +0,0 @@ -#include -&soc { - qcom,cam-res-mgr { - compatible = "qcom,cam-res-mgr"; - status = "ok"; - }; -}; - -&cam_cci0 { - actuator_rear: qcom,actuator0 { - cell-index = <0>; - compatible = "qcom,actuator"; - cci-master = <0>; - cam_vaf-supply = <&L5P>; - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - status = "disabled"; - }; - - actuator_rear_aux: qcom,actuator1 { - cell-index = <1>; - compatible = "qcom,actuator"; - cci-master = <1>; - cam_vaf-supply = <&L5P>; - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - status = "disabled"; - }; - - eeprom_rear: qcom,eeprom0 { - cell-index = <0>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L4P>; - cam_vdig-supply = <&L2P>; - cam_vaf-supply = <&L5P>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; - rgltr-cntrl-support; - pwm-switch; - 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_rear0_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear0_reset_suspend>; - gpios = <&tlmm 20 0>, - <&tlmm 18 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 = "disabled"; - clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <19200000>; - }; - - eeprom_rear_aux: qcom,eeprom1 { - cell-index = <1>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L3P>; - cam_vdig-supply = <&L1P>; - cam_vaf-supply = <&L5P>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; - rgltr-cntrl-support; - pwm-switch; - rgltr-min-voltage = <1800000 2800000 1200000 0 2800000>; - rgltr-max-voltage = <1800000 2800000 1200000 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_rear1_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_rear1_reset_suspend>; - gpios = <&tlmm 21 0>, - <&tlmm 19 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 = "disabled"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <19200000>; - }; - - eeprom_front: qcom,eeprom2 { - cell-index = <2>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L6P>; - cam_vdig-supply = <&L2P>; - 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 1056000 0>; - rgltr-max-voltage = <1800000 2800000 1056000 0>; - rgltr-load-current = <0 80000 105000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active - &cam_sensor_front0_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front0_reset_suspend>; - gpios = <&tlmm 27 0>, - <&tlmm 24 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>; - }; - - /* Rear*/ - qcom,cam-sensor0 { - cell-index = <0>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <0>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - actuator-src = <&actuator_rear>; - eeprom-src = <&eeprom_rear>; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L4P>; - cam_vdig-supply = <&L2P>; - 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 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_rear0_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear0_reset_suspend>; - gpios = <&tlmm 20 0>, - <&tlmm 18 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 = "disabled"; - clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <19200000>; - }; - - /*Rear Aux*/ - qcom,cam-sensor1 { - cell-index = <1>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; - sensor-position-roll = <270>; - sensor-position-pitch = <0>; - sensor-position-yaw = <180>; - actuator-src = <&actuator_rear_aux>; - eeprom-src = <&eeprom_rear_aux>; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L3P>; - cam_vdig-supply = <&L1P>; - 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_mclk1_active - &cam_sensor_rear1_reset_active - &cam_sensor_csi_mux_oe_active - &cam_sensor_csi_mux_sel_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_rear1_reset_suspend - &cam_sensor_csi_mux_oe_suspend - &cam_sensor_csi_mux_sel_suspend>; - gpios = <&tlmm 21 0>, - <&tlmm 19 0>, - <&tlmm 113 0>, - <&tlmm 114 0>; - gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-custom2 = <3>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET1", - "CAM_CSIMUX_OE0", - "CAM_CSIMUX_SEL0"; - sensor-mode = <0>; - cci-master = <1>; - status = "disabled"; - clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; - clock-names = "cam_clk"; - clock-cntl-level = "turbo"; - clock-rates = <19200000>; - }; - - /*Front*/ - qcom,cam-sensor2 { - cell-index = <2>; - 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 = <&L7P>; - cam_vana-supply = <&L6P>; - cam_vdig-supply = <&L2P>; - 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 1056000 0>; - rgltr-max-voltage = <1800000 2800000 1056000 0>; - rgltr-load-current = <0 80000 105000 0>; - gpio-no-mux = <0>; - pinctrl-names = "cam_default", "cam_suspend"; - pinctrl-0 = <&cam_sensor_mclk2_active - &cam_sensor_front0_reset_active - &cam_sensor_csi_mux_oe_active - &cam_sensor_csi_mux_sel_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front0_reset_suspend - &cam_sensor_csi_mux_oe_suspend - &cam_sensor_csi_mux_sel_suspend>; - gpios = <&tlmm 27 0>, - <&tlmm 24 0>, - <&tlmm 113 0>, - <&tlmm 114 0>; - gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-custom2 = <3>; - gpio-req-tbl-num = <0 1>; - gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET2", - "CAM_CSIMUX_OE0", - "CAM_CSIMUX_SEL0"; - 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>; - }; -}; diff --git a/qrb2210-rb1-camera.dtsi b/qrb2210-rb1-camera.dtsi deleted file mode 100644 index 97eeb826a117..000000000000 --- a/qrb2210-rb1-camera.dtsi +++ /dev/null @@ -1,747 +0,0 @@ -#include - -&soc { - qcom,cam-req-mgr { - compatible = "qcom,cam-req-mgr"; - status = "ok"; - }; - - qcom,cam-sync { - compatible = "qcom,cam-sync"; - status = "ok"; - }; - - cam_csiphy0: qcom,csiphy0 { - cell-index = <0>; - compatible = "qcom,csiphy-v2.0", "qcom,csiphy"; - reg = <0x05C52000 0x1000>; - reg-names = "csiphy"; - reg-cam-base = <0x52000>; - interrupts = ; - interrupt-names = "csiphy"; - regulator-names = "gdscr"; - gdscr-supply = <&gcc_camss_top_gdsc>; - csi-vdd-voltage = <1200000>; - mipi-csi-vdd-supply = <&L5A>; - clocks = <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, - <&gcc GCC_CAMSS_CPHY_0_CLK>, - <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK_SRC>, - <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>; - clock-names = "cphy_rx_clk_src", - "csiphy0_clk", - "csi0phytimer_clk_src", - "csi0phytimer_clk"; - src-clock-name = "csi0phytimer_clk_src"; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "turbo"; - clock-rates = - <19200000 0 19200000 0>, - <341330000 0 200000000 0>, - <341330000 0 200000000 0>, - <384000000 0 268800000 0>; - status = "ok"; - }; - - cam_csiphy1: qcom,csiphy1 { - cell-index = <1>; - compatible = "qcom,csiphy-v2.0", "qcom,csiphy"; - reg = <0x05C53000 0x1000>; - reg-names = "csiphy"; - reg-cam-base = <0x53000>; - interrupts = ; - interrupt-names = "csiphy"; - regulator-names = "gdscr"; - gdscr-supply = <&gcc_camss_top_gdsc>; - csi-vdd-voltage = <1200000>; - mipi-csi-vdd-supply = <&L5A>; - clocks = <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, - <&gcc GCC_CAMSS_CPHY_1_CLK>, - <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK_SRC>, - <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>; - clock-names = "cphy_rx_clk_src", - "csiphy1_clk", - "csi1phytimer_clk_src", - "csi1phytimer_clk"; - src-clock-name = "csi1phytimer_clk_src"; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "turbo"; - clock-rates = - <19200000 0 19200000 0>, - <341330000 0 200000000 0>, - <341330000 0 200000000 0>, - <384000000 0 268800000 0>; - status = "ok"; - }; - - cam_cci0: qcom,cci0 { - cell-index = <0>; - compatible = "qcom,cci", "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - 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_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 22 0>, - <&tlmm 23 0>, - <&tlmm 29 0>, - <&tlmm 30 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"; - }; - }; - - qcom,cam_smmu { - compatible = "qcom,msm-cam-smmu", "simple-bus"; - status = "ok"; - - msm_cam_smmu_tfe { - compatible = "qcom,msm-cam-smmu-cb"; - iommus = <&apps_smmu 0x400 0x000>; - qcom,iommu-faults = "non-fatal"; - qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>; - cam-smmu-label = "tfe"; - tfe_iova_mem_map: iova-mem-map { - /* IO region is approximately 3.4 GB */ - iova-mem-region-io { - iova-region-name = "io"; - iova-region-start = <0x7400000>; - iova-region-len = <0xd8c00000>; - iova-region-id = <0x3>; - status = "ok"; - }; - }; - }; - - msm_cam_smmu_ope { - compatible = "qcom,msm-cam-smmu-cb"; - iommus = <&apps_smmu 0x820 0x000>, - <&apps_smmu 0x840 0x000>; - qcom,iommu-faults = "non-fatal"; - multiple-client-devices; - qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>; - cam-smmu-label = "ope", "ope-cdm"; - ope_iova_mem_map: iova-mem-map { - /* IO region is approximately 3.4 GB */ - iova-mem-region-io { - iova-region-name = "io"; - iova-region-start = <0x7400000>; - iova-region-len = <0xd8c00000>; - iova-region-id = <0x3>; - status = "ok"; - }; - }; - }; - - msm_cam_smmu_cpas_cdm { - compatible = "qcom,msm-cam-smmu-cb"; - iommus = <&apps_smmu 0x800 0x000>; - cam-smmu-label = "cpas-cdm"; - qcom,iommu-faults = "non-fatal"; - qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>; - cpas_cdm_iova_mem_map: iova-mem-map { - iova-mem-region-io { - /* IO region is approximately 3.4 GB */ - iova-region-name = "io"; - iova-region-start = <0x7400000>; - iova-region-len = <0xd8c00000>; - iova-region-id = <0x3>; - status = "ok"; - }; - }; - }; - - msm_cam_smmu_secure { - compatible = "qcom,msm-cam-smmu-cb"; - cam-smmu-label = "cam-secure"; - qcom,secure-cb; - }; - }; - - qcom,cam-cpas@5c11000 { - cell-index = <0>; - compatible = "qcom,cam-cpas", "simple-bus"; - label = "cpas"; - arch-compat = "cpas_top"; - status = "ok"; - reg-names = "cam_cpas_top", "cam_camnoc"; - reg = <0x5c11000 0x1000>, - <0x5c13000 0x4000>; - reg-cam-base = <0x11000 0x13000>; - cam_hw_fuse = ; - interrupt-names = "cpas_camnoc"; - interrupts = ; - camnoc-axi-min-ib-bw = <3000000000>; - regulator-names = "camss-vdd"; - camss-vdd-supply = <&gcc_camss_top_gdsc>; - clock-names = - "gcc_camss_ahb_clk", - "gcc_camss_top_ahb_clk", - "gcc_camss_top_ahb_clk_src", - "gcc_camss_axi_clk", - "gcc_camss_axi_clk_src", - "gcc_camss_nrt_axi_clk", - "gcc_camss_rt_axi_clk"; - clocks = - <&gcc GCC_CAMERA_AHB_CLK>, - <&gcc GCC_CAMSS_TOP_AHB_CLK>, - <&gcc GCC_CAMSS_TOP_AHB_CLK_SRC>, - <&gcc GCC_CAMSS_AXI_CLK>, - <&gcc GCC_CAMSS_AXI_CLK_SRC>, - <&gcc GCC_CAMSS_NRT_AXI_CLK>, - <&gcc GCC_CAMSS_RT_AXI_CLK>; - src-clock-name = "gcc_camss_axi_clk_src"; - clock-rates = - <0 0 0 0 0 0 0>, - <0 0 19200000 0 19200000 0 0>, - <0 0 80000000 0 150000000 0 0>, - <0 0 80000000 0 200000000 0 0>, - <0 0 80000000 0 300000000 0 0>, - <0 0 80000000 0 300000000 0 0>, - <0 0 80000000 0 300000000 0 0>; - // clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs", - clock-cntl-level = "suspend", "lowsvs", "svs", - "svs_l1", "nominal", "nominal_l1", "turbo"; - // qcom,cx-ipeak-gpu-limit = <921600000>; - control-camnoc-axi-clk; - camnoc-bus-width = <32>; - camnoc-axi-clk-bw-margin-perc = <20>; - interconnect-names = "cam_ahb"; - interconnects =<&bimc MASTER_AMPSS_M0 - &config_noc SLAVE_CAMERA_CFG>; - cam-ahb-num-cases = <7>; - cam-ahb-bw-KBps = - <0 0>, <0 133333>, <0 150000>, <0 150000>, - <0 300000>, <0 300000>, <0 300000>; - vdd-corners = ; - vdd-corner-ahb-mapping = "suspend", "lowsvs", "lowsvs", - "lowsvs", "lowsvs", "svs", "svs_l1", "svs_l1", - "svs_l1", "nominal", "nominal", "nominal", - "turbo", "turbo"; - client-id-based; - client-names = - "csiphy0", "csiphy1", "cci0", - "csid0", "csid1", "tfe0", - "tfe1", "ope0", "cam-cdm-intf0", - "cpas-cdm0", "ope-cdm0", "tpg0", "tpg1"; - - camera-bus-nodes { - level2-nodes { - level-index = <2>; - level2_rt0_rd_wr_sum: level2-rt0-rd-wr-sum { - cell-index = <0>; - node-name = "level2-rt0-rd-wr-sum"; - traffic-merge-type = - ; - ib-bw-voting-needed; - qcom,axi-port-mnoc { - interconnect-names = "cam_hf_0"; - interconnects = - <&mmrt_virt MASTER_CAMNOC_HF - &bimc SLAVE_EBI_CH0>; - }; - }; - - level2_nrt0_rd_wr_sum: level2-nrt0-rd-wr-sum { - cell-index = <1>; - node-name = "level2-nrt0-rd-wr-sum"; - traffic-merge-type = - ; - qcom,axi-port-mnoc { - interconnect-names = "cam_sf_0"; - interconnects = - <&mmnrt_virt MASTER_CAMNOC_SF - &bimc SLAVE_EBI_CH0>; - }; - }; - }; - - level1-nodes { - level-index = <1>; - camnoc-max-needed; - level1_rt0_wr: level1-rt0-wr { - cell-index = <2>; - node-name = "level1-rt0-wr"; - parent-node = <&level2_rt0_rd_wr_sum>; - traffic-merge-type = - ; - }; - - level1_nrt0_rd_wr: level1-nrt0-rd-wr { - cell-index = <3>; - node-name = "level1-nrt0-rd-wr"; - parent-node = <&level2_nrt0_rd_wr_sum>; - traffic-merge-type = - ; - }; - }; - - level0-nodes { - level-index = <0>; - ope0_all_wr: ope0-all-wr { - cell-index = <4>; - node-name = "ope0-all-wr"; - client-name = "ope0"; - traffic-data = ; - traffic-transaction-type = - ; - constituent-paths = - ; - parent-node = <&level1_nrt0_rd_wr>; - }; - - ope0_all_rd: ope0-all-rd { - cell-index = <5>; - node-name = "ope0-all-rd"; - client-name = "ope0"; - traffic-data = ; - traffic-transaction-type = - ; - constituent-paths = - ; - parent-node = <&level1_nrt0_rd_wr>; - }; - - tfe0_all_wr: tfe0-all-wr { - cell-index = <6>; - node-name = "tfe0-all-wr"; - client-name = "tfe0"; - traffic-data = ; - traffic-transaction-type = - ; - constituent-paths = - ; - parent-node = <&level1_rt0_wr>; - }; - - tfe1_all_wr: tfe1-all-wr { - cell-index = <7>; - node-name = "tfe1-all-wr"; - client-name = "tfe1"; - traffic-data = ; - traffic-transaction-type = - ; - constituent-paths = - ; - parent-node = <&level1_rt0_wr>; - }; - - cpas_cdm0_all_rd: cpas-cdm0-all-rd { - cell-index = <9>; - node-name = "cpas-cdm0-all-rd"; - client-name = "cpas-cdm0"; - traffic-data = ; - traffic-transaction-type = - ; - parent-node = <&level1_nrt0_rd_wr>; - }; - - ope_cdm0_all_rd: ope-cdm0-all-rd { - cell-index = <10>; - node-name = "ope-cdm0-all-rd"; - client-name = "ope-cdm0"; - traffic-data = ; - traffic-transaction-type = - ; - parent-node = <&level1_nrt0_rd_wr>; - }; - }; - }; - }; - - qcom,cam-cdm-intf { - compatible = "qcom,cam-cdm-intf"; - cell-index = <0>; - label = "cam-cdm-intf"; - num-hw-cdm = <2>; - cdm-client-names = "vfe"; - status = "ok"; - }; - - cam_cpas_cdm: qcom,cpas-cdm0@5c23000 { - cell-index = <0>; - compatible = "qcom,cam-cpas-cdm2_0"; - label = "cpas-cdm"; - reg = <0x5c23000 0x400>; - reg-names = "cpas-cdm0"; - reg-cam-base = <0x23000>; - interrupts = ; - interrupt-names = "cpas-cdm0"; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = "cam_cc_cpas_top_ahb_clk"; - clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>; - clock-rates = <0>; - clock-cntl-level = "svs"; - cdm-client-names = "tfe0", "tfe1"; - config-fifo; - fifo-depths = <64 64 64 64>; - status = "ok"; - }; - - cam_ope_cdm: qcom,ope-cdm0@5c42000 { - cell-index = <0>; - compatible = "qcom,cam-ope-cdm2_1"; - label = "ope-cdm"; - reg = <0x5c42000 0x400>; - reg-names = "ope-cdm0"; - reg-cam-base = <0x42000>; - interrupts = ; - interrupt-names = "ope-cdm0"; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "ope_ahb_clk", - "ope_clk_src", - "ope_clk"; - clocks = - <&gcc GCC_CAMSS_OPE_AHB_CLK>, - <&gcc GCC_CAMSS_OPE_CLK_SRC>, - <&gcc GCC_CAMSS_OPE_CLK>; - clock-rates = <0 0 0>, - <0 0 0>, - <0 0 0>, - <0 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "turbo"; - cdm-client-names = "ope"; - config-fifo; - fifo-depths = <64 64 64 64>; - status = "ok"; - }; - - qcom,cam-isp { - compatible = "qcom,cam-isp"; - arch-compat = "tfe"; - status = "ok"; - }; - - cam_tfe_csid0: qcom,tfe_csid0@5c6e000 { - cell-index = <0>; - compatible = "qcom,csid530"; - reg-names = "csid", "top", "camnoc"; - reg = <0x5c6e000 0x1000>, - <0x5c11000 0x1000>, - <0x5c13000 0x4000>; - reg-cam-base = <0x6e000 0x11000 0x13000>; - interrupt-names = "csid0"; - interrupts = ; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "tfe_csid_clk_src", - "tfe_csid_clk", - "cphy_rx_clk_src", - "tfe_cphy_rx_clk", - "tfe_clk_src", - "tfe_clk"; - clocks = - <&gcc GCC_CAMSS_TFE_0_CSID_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_0_CSID_CLK>, - <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_0_CPHY_RX_CLK>, - <&gcc GCC_CAMSS_TFE_0_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_0_CLK>; - clock-rates = - <240000000 0 0 0 256000000 0>, - <384000000 0 0 0 460800000 0>, - <426400000 0 0 0 576000000 0>; - clock-cntl-level = "svs", "svs_l1", "turbo"; - src-clock-name = "tfe_csid_clk_src"; - clock-control-debugfs = "true"; - status = "ok"; - }; - - cam_tfe0: qcom,tfe0@5c6e000 { - cell-index = <0>; - compatible = "qcom,tfe530"; - reg-names = "tfe0"; - reg = <0x5c6e000 0x5000>; - reg-cam-base = <0x6e000>; - interrupt-names = "tfe0"; - interrupts = ; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "tfe_clk_src", - "tfe_clk"; - clocks = - <&gcc GCC_CAMSS_TFE_0_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_0_CLK>; - clock-rates = - <256000000 0>, - <460800000 0>, - <576000000 0>; - clock-cntl-level = "svs", "svs_l1", "turbo"; - src-clock-name = "tfe_clk_src"; - clock-control-debugfs = "true"; - cam_hw_pid = <4>; - status = "ok"; - }; - - cam_tfe_csid1: qcom,tfe_csid1@5c75000 { - cell-index = <1>; - compatible = "qcom,csid530"; - reg-names = "csid", "top", "camnoc"; - reg = <0x5c75000 0x1000>, - <0x5c11000 0x1000>, - <0x5c13000 0x4000>; - reg-cam-base = <0x75000 0x11000 0x13000>; - interrupt-names = "csid1"; - interrupts = ; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "tfe_csid_clk_src", - "tfe_csid_clk", - "cphy_rx_clk_src", - "tfe_cphy_rx_clk", - "tfe_clk_src", - "tfe_clk"; - clocks = - <&gcc GCC_CAMSS_TFE_1_CSID_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_1_CSID_CLK>, - <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_1_CPHY_RX_CLK>, - <&gcc GCC_CAMSS_TFE_1_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_1_CLK>; - clock-rates = - <240000000 0 240000000 0 256000000 0>, - <384000000 0 341333333 0 460800000 0>, - <426400000 0 384000000 0 576000000 0>; - clock-cntl-level = "svs", "svs_l1", "turbo"; - src-clock-name = "tfe_csid_clk_src"; - clock-control-debugfs = "true"; - status = "ok"; - }; - - cam_tfe1: qcom,tfe1@5c75000 { - cell-index = <1>; - compatible = "qcom,tfe530"; - reg-names = "tfe1"; - reg = <0x5c75000 0x5000>; - reg-cam-base = <0x75000>; - interrupt-names = "tfe1"; - interrupts = ; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "tfe_clk_src", - "tfe_clk"; - clocks = - <&gcc GCC_CAMSS_TFE_1_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_1_CLK>; - clock-rates = - <256000000 0>, - <460800000 0>, - <576000000 0>; - clock-cntl-level = "svs", "svs_l1", "turbo"; - src-clock-name = "tfe_clk_src"; - clock-control-debugfs = "true"; - cam_hw_pid = <5>; - status = "ok"; - }; - - cam_tfe_tpg0: qcom,tpg0@5c66000 { - cell-index = <0>; - compatible = "qcom,tpg101"; - reg-names = "tpg0", "top"; - reg = <0x5c66000 0x400>, - <0x5c11000 0x1000>; - reg-cam-base = <0x66000 0x11000>; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "cphy_rx_clk_src", - "tfe_0_cphy_rx_clk", - "gcc_camss_cphy_0_clk"; - clocks = - <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_0_CPHY_RX_CLK>, - <&gcc GCC_CAMSS_CPHY_0_CLK>; - clock-rates = - <240000000 0 0>, - <341333333 0 0>, - <384000000 0 0>; - clock-cntl-level = "svs", "svs_l1", "turbo"; - src-clock-name = "cphy_rx_clk_src"; - clock-control-debugfs = "false"; - status = "ok"; - }; - - cam_tfe_tpg1: qcom,tpg1@5c68000 { - cell-index = <1>; - compatible = "qcom,tpg101"; - reg-names = "tpg1", "top"; - reg = <0x5c68000 0x400>, - <0x5c11000 0x1000>; - reg-cam-base = <0x68000 0x11000>; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "cphy_rx_clk_src", - "tfe_1_cphy_rx_clk", - "gcc_camss_cphy_1_clk"; - clocks = - <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, - <&gcc GCC_CAMSS_TFE_1_CPHY_RX_CLK>, - <&gcc GCC_CAMSS_CPHY_1_CLK>; - clock-rates = - <240000000 0 0>, - <341333333 0 0>, - <384000000 0 0>; - clock-cntl-level = "svs", "svs_l1", "turbo"; - src-clock-name = "cphy_rx_clk_src"; - clock-control-debugfs = "false"; - status = "ok"; - }; - - qcom,cam-ope { - compatible = "qcom,cam-ope"; - compat-hw-name = "qcom,ope"; - num-ope = <1>; - status = "ok"; - }; - - ope: qcom,ope@0x5c42000 { - cell-index = <0>; - compatible = "qcom,ope"; - reg = - <0x5c42000 0x400>, - <0x5c42400 0x200>, - <0x5c42600 0x200>, - <0x5c42800 0x4400>, - <0x5c46c00 0x190>, - <0x5c46d90 0xA00>; - reg-names = - "ope_cdm", - "ope_top", - "ope_qos", - "ope_pp", - "ope_bus_rd", - "ope_bus_wr"; - reg-cam-base = <0x42000 0x42400 0x42600 0x42800 0x46c00 0x46d90>; - interrupts = ; - interrupt-names = "ope"; - regulator-names = "camss"; - camss-supply = <&gcc_camss_top_gdsc>; - clock-names = - "ope_ahb_clk_src", - "ope_ahb_clk", - "ope_clk_src", - "ope_clk"; - clocks = - <&gcc GCC_CAMSS_OPE_AHB_CLK_SRC>, - <&gcc GCC_CAMSS_OPE_AHB_CLK>, - <&gcc GCC_CAMSS_OPE_CLK_SRC>, - <&gcc GCC_CAMSS_OPE_CLK>; - clock-rates = - <19200000 0 19200000 0>, - <171428571 0 200000000 0>, - <240000000 0 465000000 0>, - <240000000 0 580000000 0>; - clock-cntl-level = "lowsvs", "svs", "nominal", "turbo"; - src-clock-name = "ope_clk_src"; - status = "ok"; - }; -}; diff --git a/scuba-camera-sensor-idp.dtsi b/scuba-camera-sensor-idp.dtsi index 6c7655b20cd8..8aac96ba7f9e 100644 --- a/scuba-camera-sensor-idp.dtsi +++ b/scuba-camera-sensor-idp.dtsi @@ -1,211 +1,93 @@ #include &soc { - led_flash_rear: qcom,camera-flash@0 { - cell-index = <0>; - compatible = "qcom,camera-flash"; - flash-source = <&pm2250_flash0>; - torch-source = <&pm2250_torch0>; - switch-source = <&pm2250_switch0>; - status = "ok"; - }; - - led_flash_rear_aux: qcom,camera-flash@1 { - cell-index = <1>; - compatible = "qcom,camera-flash"; - flash-source = <&pm2250_flash0>; - torch-source = <&pm2250_torch0>; - switch-source = <&pm2250_switch0>; - status = "ok"; - }; - qcom,cam-res-mgr { compatible = "qcom,cam-res-mgr"; status = "ok"; + gpios-shared-pinctrl = <466>; + shared-pctrl-gpio-names = "gmsl"; + pinctrl-names = "gmsl_active", "gmsl_suspend"; + pinctrl-0 = <&cam_sensor_gmsl_active>; + pinctrl-1 = <&cam_sensor_gmsl_suspend>; + }; +}; + +&tlmm { + cam_sensor_gmsl_active: cam_sensor_active_gmsl { + /* RESET */ + mux { + pins = "gpio81"; + function = "gpio"; + }; + + config { + pins = "gpio81"; + bias-pull-up; + drive-strength = <2>; /* 2 MA */ + output-high; + }; + }; + + cam_sensor_gmsl_suspend: cam_sensor_suspend_gmsl { + /* RESET */ + mux { + pins = "gpio81"; + function = "gpio"; + }; + + config { + pins = "gpio81"; + bias-pull-down; /* PULL DOWN */ + drive-strength = <2>; /* 2 MA */ + output-low; + }; }; }; &cam_cci0 { - actuator_rear: qcom,actuator0 { + + /* CAM0A */ + qcom,cam-sensor0 { cell-index = <0>; - compatible = "qcom,actuator"; - cci-master = <0>; - cam_vaf-supply = <&L5P>; - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - status = "ok"; - }; - - actuator_rear_aux: qcom,actuator1 { - cell-index = <1>; - compatible = "qcom,actuator"; - cci-master = <1>; - cam_vaf-supply = <&L5P>; - regulator-names = "cam_vaf"; - rgltr-cntrl-support; - rgltr-min-voltage = <2800000>; - rgltr-max-voltage = <2800000>; - rgltr-load-current = <100000>; - status = "ok"; - }; - - eeprom_rear: qcom,eeprom0 { - cell-index = <0>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L4P>; - cam_vdig-supply = <&L2P>; - cam_vaf-supply = <&L5P>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; - rgltr-cntrl-support; - pwm-switch; - 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_rear0_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear0_reset_suspend>; - gpios = <&tlmm 20 0>, - <&tlmm 18 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 = <19200000>; - }; - - eeprom_rear_aux: qcom,eeprom1 { - cell-index = <1>; - compatible = "qcom,eeprom"; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; cam_vio-supply = <&L7P>; cam_vana-supply = <&L3P>; cam_vdig-supply = <&L1P>; - cam_vaf-supply = <&L5P>; - cam_clk-supply = <&gcc_camss_top_gdsc>; - regulator-names = "cam_vio", "cam_vana", "cam_vdig", - "cam_clk", "cam_vaf"; - rgltr-cntrl-support; - pwm-switch; - rgltr-min-voltage = <1800000 2800000 1200000 0 2800000>; - rgltr-max-voltage = <1800000 2800000 1200000 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_rear1_reset_active>; - pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_rear1_reset_suspend>; - gpios = <&tlmm 21 0>, - <&tlmm 19 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 = <19200000>; - }; - eeprom_front: qcom,eeprom2 { - cell-index = <2>; - compatible = "qcom,eeprom"; - cam_vio-supply = <&L7P>; - cam_vana-supply = <&L6P>; - cam_vdig-supply = <&L2P>; 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 1056000 0>; - rgltr-max-voltage = <1800000 2800000 1056000 0>; - rgltr-load-current = <0 80000 105000 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_mclk2_active - &cam_sensor_front0_reset_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front0_reset_suspend>; - gpios = <&tlmm 27 0>, - <&tlmm 24 0>; + pinctrl-0 = <&cam_sensor_mclk3_active + &cam_sensor_active_rst0>; + pinctrl-1 = <&cam_sensor_mclk3_suspend + &cam_sensor_suspend_rst0>; + gpios = <&tlmm 28 0>, + <&tlmm 18 0>; gpio-reset = <1>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET2"; + gpio-req-tbl-label = "CAMIF_MCLK3", + "CAM_RESET0"; sensor-mode = <0>; cci-master = <1>; 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>; }; - /* Rear*/ - qcom,cam-sensor0 { - cell-index = <0>; - compatible = "qcom,cam-sensor"; - csiphy-sd-index = <0>; - sensor-position-roll = <270>; - 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 = <&L7P>; - cam_vana-supply = <&L4P>; - cam_vdig-supply = <&L2P>; - 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 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_rear0_reset_active>; - pinctrl-1 = <&cam_sensor_mclk0_suspend - &cam_sensor_rear0_reset_suspend>; - gpios = <&tlmm 20 0>, - <&tlmm 18 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 = <19200000>; - }; - - /*Rear Aux*/ + /* CAM1 */ qcom,cam-sensor1 { cell-index = <1>; compatible = "qcom,cam-sensor"; @@ -213,12 +95,10 @@ sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; - actuator-src = <&actuator_rear_aux>; - led-flash-src = <&led_flash_rear_aux>; - eeprom-src = <&eeprom_rear_aux>; cam_vio-supply = <&L7P>; - cam_vana-supply = <&L3P>; - cam_vdig-supply = <&L1P>; + cam_vana-supply = <&L5P>; + cam_vdig-supply = <&L2P>; + cam_clk-supply = <&gcc_camss_top_gdsc>; regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; @@ -230,84 +110,123 @@ gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active - &cam_sensor_rear1_reset_active - &cam_sensor_csi_mux_oe_active - &cam_sensor_csi_mux_sel_active>; + &cam_sensor_active_rst1>; pinctrl-1 = <&cam_sensor_mclk1_suspend - &cam_sensor_rear1_reset_suspend - &cam_sensor_csi_mux_oe_suspend - &cam_sensor_csi_mux_sel_suspend>; + &cam_sensor_suspend_rst1>; gpios = <&tlmm 21 0>, - <&tlmm 19 0>, - <&tlmm 113 0>, - <&tlmm 114 0>; + <&tlmm 24 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-custom2 = <3>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; gpio-req-tbl-label = "CAMIF_MCLK1", - "CAM_RESET1", - "CAM_CSIMUX_OE0", - "CAM_CSIMUX_SEL0"; + "CAM_RESET1"; sensor-mode = <0>; - cci-master = <1>; + cci-master = <0>; status = "ok"; clocks = <&gcc GCC_CAMSS_MCLK1_CLK>; clock-names = "cam_clk"; clock-cntl-level = "turbo"; - clock-rates = <19200000>; + clock-rates = <24000000>; }; - /*Front*/ + /* CAM0B */ qcom,cam-sensor2 { cell-index = <2>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <1>; + csiphy-sd-index = <0>; sensor-position-roll = <270>; sensor-position-pitch = <0>; - sensor-position-yaw = <0>; - eeprom-src = <&eeprom_front>; + sensor-position-yaw = <180>; cam_vio-supply = <&L7P>; - cam_vana-supply = <&L6P>; - cam_vdig-supply = <&L2P>; + cam_vana-supply = <&L4P>; + cam_vdig-supply = <&L1P>; + 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 1056000 0>; - rgltr-max-voltage = <1800000 2800000 1056000 0>; - rgltr-load-current = <0 80000 105000 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_mclk2_active - &cam_sensor_front0_reset_active - &cam_sensor_csi_mux_oe_active - &cam_sensor_csi_mux_sel_active>; - pinctrl-1 = <&cam_sensor_mclk2_suspend - &cam_sensor_front0_reset_suspend - &cam_sensor_csi_mux_oe_suspend - &cam_sensor_csi_mux_sel_suspend>; - gpios = <&tlmm 27 0>, - <&tlmm 24 0>, - <&tlmm 113 0>, - <&tlmm 114 0>; + pinctrl-0 = <&cam_sensor_mclk0_active + &cam_sensor_active_rst2>; + pinctrl-1 = <&cam_sensor_mclk0_suspend + &cam_sensor_suspend_rst2>; + gpios = <&tlmm 20 0>, + <&tlmm 44 0>; gpio-reset = <1>; - gpio-custom1 = <2>; - gpio-custom2 = <3>; gpio-req-tbl-num = <0 1>; gpio-req-tbl-flags = <1 0>; - gpio-req-tbl-label = "CAMIF_MCLK2", - "CAM_RESET2", - "CAM_CSIMUX_OE0", - "CAM_CSIMUX_SEL0"; + gpio-req-tbl-label = "CAMIF_MCLK0", + "CAM_RESET0"; sensor-mode = <0>; - cci-master = <1>; + 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>; }; + + /* GMSL-1 */ + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <0>; + rgltr-max-voltage = <0>; + rgltr-load-current = <0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_gmsl_active>; + pinctrl-1 = <&cam_sensor_gmsl_suspend>; + gpios = <&tlmm 81 0>; + gpio-reset = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CAM_RESET2"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + }; + + /* GMSL-2 */ + qcom,cam-sensor4 { + cell-index = <4>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + cam_clk-supply = <&gcc_camss_top_gdsc>; + regulator-names = "cam_clk"; + rgltr-cntrl-support; + pwm-switch; + rgltr-min-voltage = <0>; + rgltr-max-voltage = <0>; + rgltr-load-current = <0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_gmsl_active>; + pinctrl-1 = <&cam_sensor_gmsl_suspend>; + gpios = <&tlmm 81 0>; + gpio-reset = <0>; + gpio-req-tbl-num = <0>; + gpio-req-tbl-flags = <0>; + gpio-req-tbl-label = "CAM_RESET2"; + sensor-mode = <0>; + cci-master = <0>; + status = "ok"; + }; + }; diff --git a/scuba-camera.dtsi b/scuba-camera.dtsi index 8fd5fc199820..c020e4fcaa82 100644 --- a/scuba-camera.dtsi +++ b/scuba-camera.dtsi @@ -6,6 +6,11 @@ status = "ok"; }; + qcom,cam-sync { + compatible = "qcom,cam-sync"; + status = "ok"; + }; + cam_csiphy0: qcom,csiphy0 { cell-index = <0>; compatible = "qcom,csiphy-v2.0", "qcom,csiphy"; @@ -68,7 +73,7 @@ cam_cci0: qcom,cci0 { cell-index = <0>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; #address-cells = <1>; #size-cells = <0>; reg = <0x05C1B000 0x1000>; @@ -162,7 +167,7 @@ }; qcom,cam_smmu { - compatible = "qcom,msm-cam-smmu"; + compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; msm_cam_smmu_tfe { @@ -190,7 +195,7 @@ qcom,iommu-faults = "non-fatal"; multiple-client-devices; qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>; - cam-smmu-label = "ope", "ope-cdm0"; + cam-smmu-label = "ope", "ope-cdm"; ope_iova_mem_map: iova-mem-map { /* IO region is approximately 3.4 GB */ iova-mem-region-io { @@ -206,7 +211,7 @@ msm_cam_smmu_cpas_cdm { compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_smmu 0x800 0x000>; - cam-smmu-label = "cpas-cdm0"; + cam-smmu-label = "cpas-cdm"; qcom,iommu-faults = "non-fatal"; qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>; cpas_cdm_iova_mem_map: iova-mem-map { @@ -226,12 +231,11 @@ cam-smmu-label = "cam-secure"; qcom,secure-cb; }; - }; qcom,cam-cpas@5c11000 { cell-index = <0>; - compatible = "qcom,cam-cpas"; + compatible = "qcom,cam-cpas", "simple-bus"; label = "cpas"; arch-compat = "cpas_top"; status = "ok"; @@ -239,13 +243,13 @@ reg = <0x5c11000 0x1000>, <0x5c13000 0x4000>; reg-cam-base = <0x11000 0x13000>; + cam_hw_fuse = ; interrupt-names = "cpas_camnoc"; interrupts = ; camnoc-axi-min-ib-bw = <3000000000>; regulator-names = "camss-vdd"; camss-vdd-supply = <&gcc_camss_top_gdsc>; clock-names = - "gcc_camss_ahb_clk", "gcc_camss_top_ahb_clk", "gcc_camss_top_ahb_clk_src", "gcc_camss_axi_clk", @@ -253,7 +257,6 @@ "gcc_camss_nrt_axi_clk", "gcc_camss_rt_axi_clk"; clocks = - <&gcc GCC_CAMERA_AHB_CLK>, <&gcc GCC_CAMSS_TOP_AHB_CLK>, <&gcc GCC_CAMSS_TOP_AHB_CLK_SRC>, <&gcc GCC_CAMSS_AXI_CLK>, @@ -262,51 +265,37 @@ <&gcc GCC_CAMSS_RT_AXI_CLK>; src-clock-name = "gcc_camss_axi_clk_src"; clock-rates = - <0 0 0 0 0 0 0>, - <0 0 80000000 0 19200000 0 0>, - <0 0 80000000 0 150000000 0 0>, - <0 0 80000000 0 200000000 0 0>, - <0 0 80000000 0 300000000 0 0>, - <0 0 80000000 0 300000000 0 0>, - <0 0 80000000 0 300000000 0 0>; - clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs", - "svs_l1", "nominal", "turbo"; - qcom,cx-ipeak-gpu-limit = <921600000>; + <0 0 0 0 0 0>, + <0 19200000 0 19200000 0 0>, + <0 80000000 0 150000000 0 0>, + <0 80000000 0 200000000 0 0>, + <0 80000000 0 300000000 0 0>, + <0 80000000 0 300000000 0 0>, + <0 80000000 0 300000000 0 0>; + clock-cntl-level = "suspend", "lowsvs", "svs", + "svs_l1", "nominal", "nominal_l1", "turbo"; control-camnoc-axi-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <20>; - qcom,msm-bus,name = "cam_ahb"; - qcom,msm-bus,num-cases = <7>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - , - , - , - , - , - , - ; - vdd-corners = ; + interconnect-names = "cam_ahb"; + interconnects =<&bimc MASTER_AMPSS_M0 + &config_noc SLAVE_CAMERA_CFG>; + cam-ahb-num-cases = <7>; + cam-ahb-bw-KBps = + <0 0>, <0 133333>, <0 150000>, <0 150000>, + <0 300000>, <0 300000>, <0 300000>; + vdd-corners = ; vdd-corner-ahb-mapping = "suspend", "lowsvs", "lowsvs", "lowsvs", "lowsvs", "svs", "svs_l1", "svs_l1", "svs_l1", "nominal", "nominal", "nominal", @@ -326,19 +315,12 @@ node-name = "level2-rt0-rd-wr-sum"; traffic-merge-type = ; - qcom,axi-port-name = "cam_hf_0"; ib-bw-voting-needed; qcom,axi-port-mnoc { - qcom,msm-bus,name = - "cam_hf_0_mnoc"; - qcom,msm-bus-vector-dyn-vote; - qcom,msm-bus,num-cases = <2>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - , - ; + interconnect-names = "cam_hf_0"; + interconnects = + <&mmrt_virt MASTER_CAMNOC_HF + &bimc SLAVE_EBI_CH0>; }; }; @@ -347,18 +329,11 @@ node-name = "level2-nrt0-rd-wr-sum"; traffic-merge-type = ; - qcom,axi-port-name = "cam_sf_0"; qcom,axi-port-mnoc { - qcom,msm-bus,name = - "cam_sf_0_mnoc"; - qcom,msm-bus-vector-dyn-vote; - qcom,msm-bus,num-cases = <2>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - , - ; + interconnect-names = "cam_sf_0"; + interconnects = + <&mmnrt_virt MASTER_CAMNOC_SF + &bimc SLAVE_EBI_CH0>; }; }; }; @@ -503,7 +478,7 @@ cam_ope_cdm: qcom,ope-cdm0@5c42000 { cell-index = <0>; - compatible = "qcom,cam-ope-cdm2_0"; + compatible = "qcom,cam-ope-cdm2_1"; label = "ope-cdm"; reg = <0x5c42000 0x400>; reg-names = "ope-cdm0"; @@ -665,7 +640,7 @@ cam_tfe_tpg0: qcom,tpg0@5c66000 { cell-index = <0>; - compatible = "qcom,tpgv1"; + compatible = "qcom,tpg101"; reg-names = "tpg0", "top"; reg = <0x5c66000 0x400>, <0x5c11000 0x1000>; @@ -690,10 +665,10 @@ status = "ok"; }; - cam_tfe_tpg1: qcom,tpg0@5c68000 { + cam_tfe_tpg1: qcom,tpg1@5c68000 { cell-index = <1>; - compatible = "qcom,tpgv1"; - reg-names = "tpg0", "top"; + compatible = "qcom,tpg101"; + reg-names = "tpg1", "top"; reg = <0x5c68000 0x400>, <0x5c11000 0x1000>; reg-cam-base = <0x68000 0x11000>;