Commit d724145c authored by Martin Kepplinger's avatar Martin Kepplinger
Browse files

arm64: dts: imx8mq / librem5 / devkit: use mainline csi1 and mipi_csi1 drivers

TODO: test the devkit cam that now uses the mainline csi drivers.
parent cac7617b
......@@ -997,35 +997,23 @@
status = "okay";
};
&csi1_bridge {
fsl,mipi-mode;
fsl,two-8bit-sensor-mode;
&csi1 {
status = "okay";
port {
csi1_ep: endpoint {
remote-endpoint = <&csi1_mipi_ep>;
};
};
};
&mipi_csi_1 {
&mipi_csi1 {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
port {
#address-cells = <1>;
#size-cells = <0>;
mipi1_sensor_ep: endpoint@1 {
reg = <1>;
remote-endpoint = <&ov5640_mipi1_ep>;
data-lanes = <1 2>;
};
ports {
port@0 {
reg = <0>;
csi1_mipi_ep: endpoint@2 {
reg = <2>;
remote-endpoint = <&csi1_ep>;
mipi1_sensor_ep: endpoint {
remote-endpoint = <&ov5640_mipi1_ep>;
data-lanes = <1 2>;
};
};
};
};
......
......@@ -408,15 +408,8 @@
cpu-supply = <&buck2_reg>;
};
&csi1_bridge {
fsl,mipi-mode;
&csi1 {
status = "okay";
port {
csi1_ep: endpoint {
remote-endpoint = <&csi1_mipi_ep>;
};
};
};
&csi2_bridge {
......@@ -1476,23 +1469,19 @@
status = "okay";
};
&mipi_csi_1 {
&mipi_csi1 {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
port {
#address-cells = <1>;
#size-cells = <0>;
mipi1_sensor_ep: endpoint@1 {
reg = <1>;
remote-endpoint = <&camera1_ep>;
data-lanes = <1 2>;
};
ports {
port@0 {
reg = <0>;
csi1_mipi_ep: endpoint@2 {
reg = <2>;
remote-endpoint = <&csi1_ep>;
mipi1_sensor_ep: endpoint {
remote-endpoint = <&camera1_ep>;
data-lanes = <1 2>;
};
};
};
};
......
......@@ -21,8 +21,8 @@
#size-cells = <2>;
aliases {
csi0 = &mipi_csi_1;
csi1 = &mipi_csi_2;
csi0 = &mipi_csi1;
ethernet0 = &fec1;
gpio0 = &gpio1;
gpio1 = &gpio2;
......@@ -1170,15 +1170,14 @@
#mbox-cells = <2>;
};
mipi_csi_1: mipi_csi1@30a70000 {
compatible = "fsl,mxc-mipi-csi2_yav";
mipi_csi1: csi@30a70000 {
compatible = "fsl,imx8mq-mipi-csi2";
reg = <0x30a70000 0x1000>; /* MIPI CSI1 Controller base addr */
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk IMX8MQ_CLK_CSI1_CORE>,
<&clk IMX8MQ_CLK_CSI1_ESC>,
<&clk IMX8MQ_CLK_CSI1_PHY_REF>,
<&clk IMX8MQ_CLK_CLKO2>;
clock-names = "clk_core", "clk_esc", "clk_pxl", "clk_clko2";
<&clk IMX8MQ_CLK_CSI1_PHY_REF>;
clock-names = "core", "esc", "ui";
assigned-clocks = <&clk IMX8MQ_CLK_CSI1_CORE>,
<&clk IMX8MQ_CLK_CSI1_PHY_REF>,
<&clk IMX8MQ_CLK_CSI1_ESC>;
......@@ -1187,22 +1186,42 @@
<&clk IMX8MQ_SYS2_PLL_1000M>,
<&clk IMX8MQ_SYS1_PLL_800M>;
power-domains = <&pgc_mipi_csi1>;
csis-phy-reset = <&src 0x4c 7>;
phy-gpr = <&iomuxc_gpr 0x88>;
reset = <&src>;
resets = <&src IMX8MQ_RESET_MIPI_CSI1_CORE_RESET>,
<&src IMX8MQ_RESET_MIPI_CSI1_PHY_REF_RESET>,
<&src IMX8MQ_RESET_MIPI_CSI1_ESC_RESET>;
fsl,mipi-phy-gpr = <&iomuxc_gpr 0x88>;
interconnects = <&noc IMX8MQ_ICM_CSI1 &noc IMX8MQ_ICS_DRAM>;
interconnect-names = "dram";
status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
reg = <1>;
csi1_mipi_ep: endpoint {
remote-endpoint = <&csi1_ep>;
};
};
};
};
csi1_bridge: csi1_bridge@30a90000 {
compatible = "fsl,imx8mq-csi", "fsl,imx6s-csi";
csi1: csi@30a90000 {
compatible = "fsl,imx8mq-csi", "fsl,imx7-csi";
reg = <0x30a90000 0x10000>;
interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk IMX8MQ_CLK_DUMMY>,
<&clk IMX8MQ_CLK_CSI1_ROOT>,
<&clk IMX8MQ_CLK_DUMMY>;
clock-names = "disp-axi", "csi_mclk", "disp_dcic";
power-domains = <&pgc_mipi_csi1>;
interconnects = <&noc IMX8MQ_ICM_CSI1 &noc IMX8MQ_ICS_DRAM>;
clocks = <&clk IMX8MQ_CLK_CSI1_ROOT>;
clock-names = "mclk";
status = "disabled";
port {
csi1_ep: endpoint {
remote-endpoint = <&csi1_mipi_ep>;
};
};
};
mipi_csi_2: mipi_csi2@30b60000 {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment