Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,44 +15,33 @@
};

&{/} {
camera0_pwdn_gpio: camera0-pwdn-gpio {
compatible = "regulator-fixed";
regulator-name = "camera0_pwdn_gpio";
regulator-always-on;
regulator-boot-on;
enable-active-high;
gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cam0_pwdn_gpio>;
};

clk_cam0_24m: external-camera-clock-24m {
clk_cam0_25m: external-camera-clock-25m {
compatible = "fixed-clock";
clock-frequency = <24000000>;
clock-output-names = "clk_cam0_24m";
clock-frequency = <25000000>;
clock-output-names = "clk_cam0_25m";
#clock-cells = <0>;
};

};

&i2c2 {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
camera0_imx219: camera0-imx219@10 {
compatible = "sony,imx219";
reg = <0x10>;

clocks = <&clk_cam0_24m>;
clock-names = "xvclk";

ov5647: ov5647@36 {
status = "okay";
compatible = "ovti,ov5647";
reg = <0x36>;
clocks = <&clk_cam0_25m>;
pwdn-gpios = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
clock-names = "ext_cam_clk";
rockchip,camera-module-index = <1>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "rpi-camera-v2";
rockchip,camera-module-facing = "front";
rockchip,camera-module-name = "OKDO-5MP";
rockchip,camera-module-lens-name = "default";

port {
imx219_out0: endpoint {
ov5647_out0: endpoint {
remote-endpoint = <&mipidcphy0_in_ucam0>;
data-lanes = <1 2>;
};
Expand All @@ -78,7 +67,7 @@

mipidcphy0_in_ucam0: endpoint@2 {
reg = <2>;
remote-endpoint = <&imx219_out0>;
remote-endpoint = <&ov5647_out0>;
data-lanes = <1 2>;
};
};
Expand Down Expand Up @@ -131,17 +120,19 @@
status = "okay";
};

&rkcif_mipi_lvds {
&rkcif_mipi_lvds {
status = "okay";

port {
cif_mipi0_in0: endpoint {
remote-endpoint = <&mipi0_csi2_output>;
};
};
};

&rkcif_mipi_lvds_sditf {
&rkcif_mipi_lvds_sditf {
status = "okay";

port {
mipi_lvds_sditf: endpoint {
remote-endpoint = <&isp1_vir0>;
Expand All @@ -150,7 +141,7 @@
};

&rkcif_mmu {
status = "okay";
status = "okay";
};

&isp1_mmu {
Expand All @@ -174,11 +165,3 @@
};
};
};

&pinctrl {
camera {
cam0_pwdn_gpio: cam0-pwdn-gpio {
rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -15,51 +15,40 @@
};

&{/} {
camera0_pwdn_gpio: camera0-pwdn-gpio {
compatible = "regulator-fixed";
regulator-name = "camera0_pwdn_gpio";
regulator-always-on;
regulator-boot-on;
enable-active-high;
gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cam0_pwdn_gpio>;
};

clk_cam0_24m: external-camera-clock-24m {
compatible = "fixed-clock";
clock-frequency = <24000000>;
clock-output-names = "clk_cam0_24m";
#clock-cells = <0>;
};
clk_cam1_25m: external-camera-clock-25m-1 {
compatible = "fixed-clock";
clock-frequency = <25000000>;
clock-output-names = "clk_cam1_25m";
#clock-cells = <0>;
};
};

&i2c6 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&i2c6m0_xfer>;
#address-cells = <1>;
#size-cells = <0>;

camera0_imx219: camera0-imx219@10 {
compatible = "sony,imx219";
reg = <0x10>;

clocks = <&clk_cam0_24m>;
clock-names = "xvclk";

rockchip,camera-module-index = <1>;
pinctrl-names = "default";
pinctrl-0 = <&i2c6m0_xfer>;

ov564_1: ov5647-1@36 {
status = "okay";
compatible = "ovti,ov5647";
reg = <0x36>;
clocks = <&clk_cam1_25m>;
pwdn-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_LOW>;
clock-names = "ext_cam_clk_1";
rockchip,camera-module-index = <2>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "rpi-camera-v2";
rockchip,camera-module-name = "OKDO-5MP";
rockchip,camera-module-lens-name = "default";

port {
imx219_out0: endpoint {
remote-endpoint = <&mipidcphy0_in_ucam0>;
ov5647_out1: endpoint {
remote-endpoint = <&mipidcphy1_in_ucam1>;
data-lanes = <1 2>;
};
};
};
};
};

&mipi_dcphy1 {
Expand All @@ -78,9 +67,9 @@
#address-cells = <1>;
#size-cells = <0>;

mipidcphy0_in_ucam0: endpoint@2 {
mipidcphy1_in_ucam1: endpoint@2 {
reg = <2>;
remote-endpoint = <&imx219_out0>;
remote-endpoint = <&ov5647_out1>;
data-lanes = <1 2>;
};
};
Expand All @@ -90,9 +79,9 @@
#address-cells = <1>;
#size-cells = <0>;

csidcphy0_out: endpoint@0 {
csidcphy1_out: endpoint@0 {
reg = <0>;
remote-endpoint = <&mipi0_csi2_input>;
remote-endpoint = <&mipi1_csi2_input>;
};
};
};
Expand All @@ -110,9 +99,9 @@
#address-cells = <1>;
#size-cells = <0>;

mipi0_csi2_input: endpoint@1 {
mipi1_csi2_input: endpoint@1 {
reg = <1>;
remote-endpoint = <&csidcphy0_out>;
remote-endpoint = <&csidcphy1_out>;
};
};

Expand All @@ -121,9 +110,9 @@
#address-cells = <1>;
#size-cells = <0>;

mipi0_csi2_output: endpoint@0 {
mipi1_csi2_output: endpoint@0 {
reg = <0>;
remote-endpoint = <&cif_mipi0_in0>;
remote-endpoint = <&cif_mipi1_in0>;
};
};
};
Expand All @@ -137,8 +126,8 @@
status = "okay";

port {
cif_mipi0_in0: endpoint {
remote-endpoint = <&mipi0_csi2_output>;
cif_mipi1_in0: endpoint {
remote-endpoint = <&mipi1_csi2_output>;
};
};
};
Expand All @@ -147,8 +136,8 @@
status = "okay";

port {
mipi_lvds_sditf: endpoint {
remote-endpoint = <&isp1_vir0>;
mipi_lvds1_sditf: endpoint {
remote-endpoint = <&isp1_vir1>;
};
};
};
Expand All @@ -165,24 +154,16 @@
status = "okay";
};

&rkisp1_vir0 {
&rkisp1_vir1 {
status = "okay";

port {
#address-cells = <1>;
#size-cells = <0>;

isp1_vir0: endpoint@0 {
isp1_vir1: endpoint@0 {
reg = <0>;
remote-endpoint = <&mipi_lvds_sditf>;
};
};
};

&pinctrl {
camera {
cam0_pwdn_gpio: cam0-pwdn-gpio {
rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
remote-endpoint = <&mipi_lvds1_sditf>;
};
};
};
Loading
Loading