Update device tree to enable weston.
Update I2C bus assignment for both DSI adaptor and CSI.
Bug: 143503253
Test: Build, flash, GUI shows up!
Change-Id: I1933796707692d46cc2129033d5f0e3de349d9ec
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts
index 293a3f8..0a5c66f 100755
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts
@@ -134,7 +134,6 @@
pinctrl_csi_rst: csi_rst_grp {
fsl,pins = <
MX8MM_IOMUXC_GPIO1_IO06_GPIO1_IO6 0x19
- MX8MM_IOMUXC_GPIO1_IO14_CCMSRCGPCMIX_CLKO1 0x59
>;
};
@@ -650,16 +649,23 @@
pinctrl-0 = <&pinctrl_i2c2>;
status = "okay";
- adv_bridge: adv7535@3d {
- compatible = "adi,adv7533";
- reg = <0x3d>;
- adi,addr-cec = <0x3b>;
- adi,dsi-lanes = <4>;
+ ov5645_mipi: ov5645_mipi@3c {
+ compatible = "ovti,ov5645_mipi";
+ reg = <0x3c>;
status = "okay";
-
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_csi_pwn>, <&pinctrl_csi_rst>;
+ clocks = <&clk IMX8MM_CLK_DUMMY>;
+ clock-names = "csi_mclk";
+ csi_id = <0>;
+ pwn-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+ rst-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+ mclk = <20000000>;
+ mclk_source = <0>;
+ ae_target = <52>;
port {
- adv7535_from_dsim: endpoint {
- remote-endpoint = <&dsim_to_adv7535>;
+ ov5645_mipi1_ep: endpoint {
+ remote-endpoint = <&mipi1_sensor_ep>;
};
};
};
@@ -671,7 +677,7 @@
status = "okay";
port {
mipi1_sensor_ep: endpoint1 {
- remote-endpoint = <&ov5640_mipi1_ep>;
+ remote-endpoint = <&ov5645_mipi1_ep>;
data-lanes = <2>;
csis-hs-settle = <13>;
csis-clk-settle = <2>;
@@ -697,25 +703,15 @@
#gpio-cells = <2>;
};
- ov5640_mipi: ov5640_mipi@3c {
- compatible = "ovti,ov5640_mipi";
- reg = <0x3c>;
+ adv_bridge: adv7535@39 {
+ compatible = "adi,adv7533";
+ reg = <0x39>;
+ adi,dsi-lanes = <4>;
status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_csi_pwn>, <&pinctrl_csi_rst>;
- clocks = <&clk IMX8MM_CLK_CLKO1_DIV>;
- clock-names = "csi_mclk";
- assigned-clocks = <&clk IMX8MM_CLK_CLKO1_SRC>,
- <&clk IMX8MM_CLK_CLKO1_DIV>;
- assigned-clock-parents = <&clk IMX8MM_CLK_24M>;
- assigned-clock-rates = <0>, <24000000>;
- csi_id = <0>;
- pwn-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
- mclk = <24000000>;
- mclk_source = <0>;
- port {
- ov5640_mipi1_ep: endpoint {
- remote-endpoint = <&mipi1_sensor_ep>;
+
+ hdmi_disp: port {
+ adv7535_from_dsim: endpoint {
+ remote-endpoint = <&dsim_to_adv7535>;
};
};
};
