fixup: Fix DTB for Spiri camera base

This commit is contained in:
dchvs 2021-02-05 16:57:47 -06:00
parent 93ce796351
commit 3bc59f8975
2 changed files with 63 additions and 148 deletions

View File

@ -19,35 +19,26 @@ include this file in any baord specific camera files */
tpg_max_iso = <3916800>;
};
/* set camera gpio direction to output */
/* gpio@2200000 {
camera-control-output-low {
gpio-hog;
output-low;
gpios = <CAM0_RST_L 0 CAM0_PWDN 0
CAM1_RST_L 0 CAM1_PWDN 0>;
label = "cam0-rst", "cam0-pwdn",
"cam1-rst", "cam1-pwdn";
};
};*/
/* all cameras are disabled by default */
/* host1x {
// all cameras are disabled by default
host1x {
vi_base: vi@15700000 {
num-channels = <6>;
num-channels = <6>;
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
vi_port0: port@0 {
status = "okay";
reg = <0>;
status = "disabled";
vi_in0: endpoint {
status = "disabled";
status = "okay";
};
};
};
vi_port1: port@1 {
reg = <1>;
status = "disabled";
status = "okay";
vi_in1: endpoint {
status = "disabled";
};
@ -80,8 +71,9 @@ include this file in any baord specific camera files */
status = "disabled";
};
};
};
}; */
};
csi_base: nvcsi@150c0000 {
#address-cells = <1>;
@ -222,98 +214,7 @@ include this file in any baord specific camera files */
};
};
};
};
i2c@3180000 {
e3326_cam0: ov5693_c@36 {
status = "disabled";
};
e3323_cam0: ov23850_a@10 {
status = "disabled";
};
e3323_vcm0: lc898212@72 {
status = "disabled";
};
tca6408@21 {
status = "disabled";
};
tca9548@77 {
status = "disabled";
i2c@0 {
e3333_cam0: ov5693_a@36 {
status = "disabled";
};
e3322_cam0: imx219_a@10 {
status = "disabled";
};
};
i2c@1 {
e3333_cam1: ov5693_b@36 {
status = "disabled";
};
e3322_cam1: imx219_b@10 {
status = "disabled";
};
};
i2c@2 {
e3333_cam2: ov5693_c@36 {
status = "disabled";
};
e3322_cam2: imx219_c@10 {
status = "disabled";
};
};
i2c@3 {
e3333_cam3: ov5693_d@36 {
status = "disabled";
};
e3322_cam3: imx219_d@10 {
status = "disabled";
};
};
i2c@4 {
e3333_cam4: ov5693_e@36 {
status = "disabled";
};
e3322_cam4: imx219_e@10 {
status = "disabled";
};
};
i2c@5 {
e3333_cam5: ov5693_f@36 {
status = "disabled";
};
e3322_cam5: imx219_f@10 {
status = "disabled";
};
};
};
tca9546_70: tca9546@70 {
status = "disabled";
i2c@0 {
imx185_cam0: imx185_a@1a {
status = "disabled";
};
};
};
tca9546_70: tca9546@70 {
status = "disabled";
i2c@0 {
imx274_cam0: imx274_a@1a {
status = "disabled";
};
};
};
};
i2c@c240000 {
e3323_cam1: ov23850_c@36 {
status = "disabled";
};
e3323_vcm1: lc898212@72 {
status = "disabled";
};
};
};
tcp: tegra-camera-platform {
compatible = "nvidia, tegra-camera-platform";

View File

@ -18,7 +18,7 @@
#define CAM0_RST TEGRA_MAIN_GPIO(R, 5)
#define CAM1_RST TEGRA_MAIN_GPIO(R, 1)
#define CAM0_PWDN TEGRA_MAIN_GPIO(R, 0)
#define CAM1_PWDN TEGRA_MAIN_GPIO(N, 2)
#define CAM1_PWDN TEGRA_MAIN_GPIO(N, 2)
/*
@ -35,16 +35,19 @@ i2c7 = "/i2c@c250000";
i2c8 = "/i2c@31e0000";
*/
/ {
gpio@2200000 {
camera-control-output-low {
gpio-hog;
output-low;
gpios = <CAM0_RST 0 CAM0_PWDN 0 CAM1_RST 0 CAM1_PWDN 0>;
label = "cam0-rst", "cam0-pwdn, cam1-rst, cam1-pwdn";
status = "okay";
};
};
gpio@2200000 {
camera-control-output-low {
gpio-hog;
output-low;
gpios = <CAM0_RST 0 CAM0_PWDN 0 CAM1_RST 0 CAM1_PWDN 0>;
label = "cam0-rst", "cam0-pwdn, cam1-rst, cam1-pwdn";
status = "okay";
};
};
i2c@c240000 {
status = "okay";
#address-cells = <1>;
@ -53,28 +56,28 @@ i2c8 = "/i2c@31e0000";
mt9m021_b@10 {
compatible = "nvidia,mt9m021";
/* I2C device address */
// I2C device address
reg = <0x10>;
/* Physical dimensions of sensor */
// Physical dimensions of sensor
physical_w = "10";
physical_h = "10";
/* Sensor Model */
// Sensor Model
sensor_model ="mt9m021";
/* slave or master mode */
// slave or master mode
trigger_mode = "slave";
/* input clock for the device in MHz*/
// input clock for the device in MHz
clocks = <&tegra_car TEGRA186_CLK_EXTPERIPH2>,
<&tegra_car TEGRA186_CLK_PLLP_OUT0>;
clock-names = "extperiph2", "pllp_grtba";
clock-frequency = <24000000>;
mclk = "extperiph2";
/* gpios */
reset-gpios = <&tegra_main_gpio CAM1_RST GPIO_ACTIVE_HIGH>;
// gpios
// reset-gpios = <&tegra_main_gpio CAM1_RST GPIO_ACTIVE_HIGH>;
mode0 {
mclk_khz = "24000";
@ -108,25 +111,29 @@ i2c8 = "/i2c@31e0000";
min_framerate = "2000000";
max_framerate = "60000000";
step_framerate = "1";
default_framerate = "6000000"; /* 60.0 fps */
default_framerate = "6000000"; // 60.0 fps
min_exp_time = "23"; /* us */
max_exp_time = "14933"; /* us */
min_exp_time = "23"; // us
max_exp_time = "14933"; // us
step_exp_time = "1";
default_exp_time = "10000"; /* us */
default_exp_time = "10000"; // us
};
ports {
ports {
#address-cells = <0x1>;
#size-cells = <0x0>;
port@0 {
reg = <0x0>;
// daniel's
status="okay";
mt9m021_slave: endpoint {
port-index = <0x1>;
bus-width = <0x1>;
remote-endpoint = <&mt9m021_slave_nvcsi_port0>;
};
};
};
};
};
};
@ -136,31 +143,32 @@ i2c8 = "/i2c@31e0000";
#address-cells = <1>;
#size-cells = <0>;
mt9m021_a@10 {
compatible = "nvidia,mt9m021";
/* I2C device address */
// I2C device address
reg = <0x10>;
/* Physical dimensions of sensor */
// Physical dimensions of sensor
physical_w = "10";
physical_h = "10";
/* Sensor Model */
// Sensor Model /
sensor_model ="mt9m021";
/* slave or master mode */
// slave or master mode //
trigger_mode = "master";
/* input clock for the device in MHz*/
// input clock for the device in MHz
clocks = <&tegra_car TEGRA186_CLK_EXTPERIPH1>,
<&tegra_car TEGRA186_CLK_PLLP_OUT0>;
clock-names = "extperiph1", "pllp_grtba";
clock-frequency = <24000000>;
mclk = "extperiph1";
/* gpios */
reset-gpios = <&tegra_main_gpio CAM0_RST GPIO_ACTIVE_HIGH>;
// gpios
// reset-gpios = <&tegra_main_gpio CAM0_RST GPIO_ACTIVE_HIGH>;
mode0 {
mclk_khz = "24000";
@ -194,14 +202,14 @@ i2c8 = "/i2c@31e0000";
min_framerate = "2000000";
max_framerate = "60000000";
step_framerate = "1";
default_framerate = "6000000"; /* 60.0 fps */
default_framerate = "6000000"; // 60.0 fps
min_exp_time = "23"; /* us */
max_exp_time = "14933"; /* us */
min_exp_time = "23"; // us
max_exp_time = "14933"; // us
step_exp_time = "1";
default_exp_time = "10000"; /* us */
default_exp_time = "10000"; // us
};
ports {
ports {
#address-cells = <0x1>;
#size-cells = <0x0>;
@ -213,8 +221,10 @@ i2c8 = "/i2c@31e0000";
remote-endpoint = <&mt9m021_master_nvcsi_port0>;
};
};
};
};
};
host1x {
@ -223,6 +233,7 @@ i2c8 = "/i2c@31e0000";
ports {
#address-cells = <0x1>;
#size-cells = <0x0>;
status = "okay";
port@0 {
reg = <0x0>;
status = "okay";
@ -246,6 +257,8 @@ i2c8 = "/i2c@31e0000";
};
};
nvcsi@150c0000 {
status = "okay";
num-channels = <0x2>;
@ -304,7 +317,7 @@ i2c8 = "/i2c@31e0000";
};
};
};
};
};
tegra-camera-platform {
compatible = "nvidia, tegra-camera-platform";
@ -344,4 +357,5 @@ i2c8 = "/i2c@31e0000";
};
};
};
};