t23x: overlay: enable IMX219 autodetection

1 Enable dual IMX219 by default for autodetection.
2 Rename the overlay configs.
3 Fix the IMX477 4 lane overlay.

Bug 4547993

Change-Id: Iaeb1b1d2be6bbda589d5fd6fedb410ce310f09cb
Signed-off-by: Ankur Pawar <ankurp@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3092357
cherry-picked from <0aa4389b319cf59e9000598e34d099d344536360>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3100285
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Praveen AC <pac@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Ankur Pawar
2024-03-08 11:05:24 +00:00
committed by mobile promotions
parent 7ed49f085b
commit 8e5951e652
12 changed files with 139 additions and 34 deletions

View File

@@ -53,14 +53,14 @@ dtbo-y += tegra234-p3767-camera-p3768-imx477-imx219.dtbo
dtbo-y += tegra234-p3737-camera-eCAM130A-overlay.dtbo
dtbo-y += tegra234-p3737-camera-dual-hawk-ar0234-e3653-overlay.dtbo
dtbo-y += tegra234-p3737-camera-imx390-overlay.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx219-cam0.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx219-cam1.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx219-C.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx219-A.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx219-imx477.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx477-cam0.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx477-cam1.dtbo
dtbo-y += tegra234-p3740-0002+p3701-0008-hdr20.dtbo
dtbo-y += tegra234-p3740-0002+p3701-0008-m2ke.dtbo
dtbo-y += tegra234-p3740-0002+p3701-0008-m2kb.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx477-C.dtbo
dtbo-y += tegra234-p3767-camera-p3768-imx477-A.dtbo
ifneq ($(dtb-y),)
dtb-y := $(addprefix $(makefile-path)/,$(dtb-y))

View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#include <dt-bindings/clock/tegra234-clock.h>
#include <dt-bindings/gpio/tegra234-gpio.h>
@@ -664,7 +664,6 @@
port@0 {
reg = <0>;
rbpcv2_imx219_out1: endpoint {
status = "okay";
port-index = <2>;
bus-width = <2>;
remote-endpoint = <&rbpcv2_imx219_csi_in1>;

View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION. All rights reserved.
// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/dts-v1/;
/plugin/;
@@ -12,11 +12,11 @@
#include <dt-bindings/tegra234-p3767-0000-common.h>
/ {
overlay-name = "Camera IMX219-cam1";
overlay-name = "Camera IMX219-A";
jetson-header-name = "Jetson 24pin CSI Connector";
compatible = JETSON_COMPATIBLE_P3768;
/* IMX219 sensor module on CSI PORT A */
/* IMX219 sensor module on CSI PORT A / cam1 */
fragment@0 {
target-path = "/";
__overlay__ {
@@ -435,6 +435,11 @@
};
};
};
i2c@1 {
rbpcv2_imx219_c@10 {
status = "disabled";
};
};
};
lens_imx219@RBPCV2 {
min_focus_distance = "0.0";

View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION. All rights reserved.
// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/dts-v1/;
/plugin/;
@@ -12,11 +12,11 @@
#include <dt-bindings/tegra234-p3767-0000-common.h>
/ {
overlay-name = "Camera IMX219-cam0";
overlay-name = "Camera IMX219-C";
jetson-header-name = "Jetson 24pin CSI Connector";
compatible = JETSON_COMPATIBLE_P3768;
/* IMX219 sensor module on CSI PORT B */
/* IMX219 sensor module on CSI PORT B / cam0 */
fragment@0 {
target-path = "/";
__overlay__ {
@@ -109,7 +109,7 @@
#size-cells = <0>;
csi_chan1_port0: port@0 {
reg = <0>;
rbpcv2_imx219_csi_in1: endpoint@0 {
rbpcv2_imx219_csi_in1: endpoint@2 {
port-index = <2>;
bus-width = <2>;
remote-endpoint = <&rbpcv2_imx219_out1>;
@@ -117,7 +117,7 @@
};
csi_chan1_port1: port@1 {
reg = <1>;
rbpcv2_imx219_csi_out1: endpoint@1 {
rbpcv2_imx219_csi_out1: endpoint@3 {
remote-endpoint = <&rbpcv2_imx219_vi_in1>;
};
};
@@ -132,6 +132,11 @@
#size-cells = <0>;
mux-gpios = <&gpio_aon CAM_I2C_MUX GPIO_ACTIVE_HIGH>;
i2c-parent = <&cam_i2c>;
i2c@0 {
rbpcv2_imx219_a@10 {
status = "disabled";
};
};
i2c@1 {
status = "okay";
reg = <1>;

View File

@@ -12,9 +12,10 @@
#include <dt-bindings/tegra234-p3767-0000-common.h>
/ {
overlay-name = "Camera IMX219-cam1 and IMX477-cam0";
overlay-name = "Camera IMX219-A and IMX477-C";
jetson-header-name = "Jetson 24pin CSI Connector";
compatible = JETSON_COMPATIBLE_P3768;
/* IMX477 connected on cam0 and IMX219 connected on cam1 port */
fragment@0 {
target-path = "/";
@@ -145,7 +146,7 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
port@2 {
port@0 {
reg = <0>;
rbpcv3_imx477_csi_in1: endpoint@2 {
port-index = <2>;
@@ -153,7 +154,7 @@
remote-endpoint = <&rbpcv3_imx477_out1>;
};
};
port@3 {
port@1 {
reg = <1>;
rbpcv3_imx477_csi_out1: endpoint@3 {
remote-endpoint = <&rbpcv3_imx477_vi_in1>;
@@ -477,6 +478,9 @@
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_c@10 {
status = "disabled";
};
rbpcv3_imx477_c@1a {
reset-gpios = <&gpio CAM1_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";

View File

@@ -11,9 +11,10 @@
#include <dt-bindings/tegra234-p3767-0000-common.h>
/ {
overlay-name = "Camera IMX477-cam1";
overlay-name = "Camera IMX477-A";
jetson-header-name = "Jetson 24pin CSI Connector";
compatible = JETSON_COMPATIBLE_P3768;
/* IMX477 connected to cam1 port */
fragment@0 {
target-path = "/";
@@ -131,6 +132,9 @@
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_a@10 {
status = "disabled";
};
rbpcv3_imx477_a@1a {
reset-gpios = <&gpio CAM0_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";
@@ -323,6 +327,11 @@
};
};
};
i2c@1 {
rbpcv2_imx219_c@10 {
status = "disabled";
};
};
};
gpio@6000d000 {
camera-control-output-low {

View File

@@ -11,9 +11,10 @@
#include <dt-bindings/tegra234-p3767-0000-common.h>
/ {
overlay-name = "Camera IMX477-cam0";
overlay-name = "Camera IMX477-C";
jetson-header-name = "Jetson 24pin CSI Connector";
compatible = JETSON_COMPATIBLE_P3768;
/*IMX477 connected on cam0 port */
fragment@0 {
target-path = "/";
@@ -23,7 +24,7 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
rbpcv3_imx477_vi_in1: endpoint {
port-index = <2>;
@@ -96,12 +97,12 @@
num-channels = <1>;
#address-cells = <1>;
#size-cells = <0>;
channel@1 {
channel@0 {
reg = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@2 {
port@0 {
reg = <0>;
rbpcv3_imx477_csi_in1: endpoint@0 {
port-index = <2>;
@@ -109,7 +110,7 @@
remote-endpoint = <&rbpcv3_imx477_out1>;
};
};
port@3 {
port@1 {
reg = <1>;
rbpcv3_imx477_csi_out1: endpoint@1 {
remote-endpoint = <&rbpcv3_imx477_vi_in1>;
@@ -126,11 +127,19 @@
#size-cells = <0>;
mux-gpios = <&gpio_aon CAM_I2C_MUX GPIO_ACTIVE_HIGH>;
i2c-parent = <&cam_i2c>;
i2c@0 {
rbpcv2_imx219_a@10 {
status = "disabled";
};
};
i2c@1 {
status = "okay";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_c@10 {
status = "disabled";
};
rbpcv3_imx477_c@1a {
reset-gpios = <&gpio CAM1_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";

View File

@@ -27,7 +27,7 @@
reg = <0>;
rbpcv3_imx477_vi_in0: endpoint {
port-index = <1>;
bus-width = <2>;
bus-width = <4>;
remote-endpoint = <&rbpcv3_imx477_csi_out0>;
};
};
@@ -35,7 +35,7 @@
reg = <1>;
rbpcv3_imx477_vi_in1: endpoint {
port-index = <2>;
bus-width = <4>;
bus-width = <2>;
remote-endpoint = <&rbpcv3_imx477_csi_out1>;
};
};
@@ -122,7 +122,7 @@
reg = <0>;
rbpcv3_imx477_csi_in0: endpoint@0 {
port-index = <1>;
bus-width = <2>;
bus-width = <4>;
remote-endpoint = <&rbpcv3_imx477_out0>;
};
};
@@ -139,15 +139,15 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
port@2 {
port@0 {
reg = <0>;
rbpcv3_imx477_csi_in1: endpoint@2 {
port-index = <2>;
bus-width = <4>;
bus-width = <2>;
remote-endpoint = <&rbpcv3_imx477_out1>;
};
};
port@3 {
port@1 {
reg = <1>;
rbpcv3_imx477_csi_out1: endpoint@3 {
remote-endpoint = <&rbpcv3_imx477_vi_in1>;
@@ -169,6 +169,9 @@
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_a@10 {
status = "disabled";
};
rbpcv3_imx477_a@1a {
reset-gpios = <&gpio CAM0_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";
@@ -354,7 +357,7 @@
reg = <0>;
rbpcv3_imx477_out0: endpoint {
port-index = <1>;
bus-width = <2>;
bus-width = <4>;
remote-endpoint = <&rbpcv3_imx477_csi_in0>;
};
};
@@ -366,6 +369,9 @@
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_c@10 {
status = "disabled";
};
rbpcv3_imx477_c@1a {
reset-gpios = <&gpio CAM1_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";
@@ -461,7 +467,7 @@
reg = <0>;
rbpcv3_imx477_out1: endpoint {
port-index = <2>;
bus-width = <4>;
bus-width = <2>;
remote-endpoint = <&rbpcv3_imx477_csi_in1>;
};
};

View File

@@ -139,7 +139,7 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
port@2 {
port@0 {
reg = <0>;
rbpcv3_imx477_csi_in1: endpoint@2 {
port-index = <2>;
@@ -147,7 +147,7 @@
remote-endpoint = <&rbpcv3_imx477_out1>;
};
};
port@3 {
port@1 {
reg = <1>;
rbpcv3_imx477_csi_out1: endpoint@3 {
remote-endpoint = <&rbpcv3_imx477_vi_in1>;
@@ -169,6 +169,9 @@
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_a@10 {
status = "disabled";
};
rbpcv3_imx477_a@1a {
reset-gpios = <&gpio CAM0_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";
@@ -353,6 +356,7 @@
port@0 {
reg = <0>;
rbpcv3_imx477_out0: endpoint {
status = "okay";
port-index = <1>;
bus-width = <2>;
remote-endpoint = <&rbpcv3_imx477_csi_in0>;
@@ -366,6 +370,9 @@
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_c@10 {
status = "disabled";
};
rbpcv3_imx477_c@1a {
reset-gpios = <&gpio CAM1_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";
@@ -460,6 +467,7 @@
port@0 {
reg = <0>;
rbpcv3_imx477_out1: endpoint {
status = "okay";
port-index = <2>;
bus-width = <2>;
remote-endpoint = <&rbpcv3_imx477_csi_in1>;

View File

@@ -180,6 +180,9 @@
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_a@10 {
status = "disabled";
};
rbpcv3_imx477_a@1a {
reset-gpios = <&gpio CAM0_PWDN GPIO_ACTIVE_HIGH>;
compatible = "ridgerun,imx477";
@@ -364,6 +367,7 @@
port@0 {
reg = <0>;
rbpcv3_imx477_out0: endpoint {
status = "okay";
port-index = <1>;
bus-width = <2>;
remote-endpoint = <&rbpcv3_imx477_csi_in0>;

View File

@@ -1,9 +1,11 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/dts-v1/;
/plugin/;
#include "tegra234-p3768-camera-rbpcv2-imx219.dtsi"
/ {
overlay-name = "Tegra234 p3768-0000+p3767-xxxx Dynamic Overlay";
};

View File

@@ -0,0 +1,54 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#define CAM0_RST TEGRA234_MAIN_GPIO(H, 3)
#define CAM0_PWDN TEGRA234_MAIN_GPIO(H, 6)
#define CAM1_PWDN TEGRA234_MAIN_GPIO(AC, 0)
#define CAM_I2C_MUX TEGRA234_AON_GPIO(CC, 3)
#include <dt-bindings/tegra234-p3767-0000-common.h>
#include "tegra234-camera-rbpcv2-imx219.dtsi"
/ {
fragment-camera-imx219@0 {
target-path = "/";
__overlay__ {
bus@0 {
cam_i2cmux{
status = "okay";
compatible = "i2c-mux-gpio";
#address-cells = <1>;
#size-cells = <0>;
i2c-parent = <&cam_i2c>;
mux-gpios = <&gpio_aon CAM_I2C_MUX GPIO_ACTIVE_HIGH>;
i2c@0 {
status = "okay";
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_a@10 {
reset-gpios = <&gpio CAM0_PWDN GPIO_ACTIVE_HIGH>;
};
};
i2c@1 {
status = "okay";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
rbpcv2_imx219_c@10 {
reset-gpios = <&gpio CAM1_PWDN GPIO_ACTIVE_HIGH>;
};
};
};
gpio@2200000 {
camera-control-output-low {
gpio-hog;
output-low;
gpios = <CAM0_RST 0>;
label = "cam0-rst";
};
};
};
};
};
};