From abe974ed464c843e2c2c8b32ffff8640a1ebca01 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 26 Nov 2020 16:58:31 +0200 Subject: overlays: apalis-imx6: simplify ov5640 v1.1a cam As it was decided, move all definitions back to the main devicetree. Rename the overlay according to approved naming scheme. Related-to: ELB-3240 Signed-off-by: Oleksandr Suvorov --- overlays/Makefile | 2 +- overlays/apalis-imx6_ov5640-v11a_overlay.dts | 25 +++++++ overlays/apalis-imx6_ov5640_v11a_overlay.dts | 98 ---------------------------- 3 files changed, 26 insertions(+), 99 deletions(-) create mode 100644 overlays/apalis-imx6_ov5640-v11a_overlay.dts delete mode 100644 overlays/apalis-imx6_ov5640_v11a_overlay.dts diff --git a/overlays/Makefile b/overlays/Makefile index 5d02f74..050be41 100644 --- a/overlays/Makefile +++ b/overlays/Makefile @@ -24,7 +24,7 @@ dtb-y += apalis-imx6_atmel-mxt_overlay.dtbo dtb-y += apalis-imx6_hdmi_overlay.dtbo dtb-y += apalis-imx6_lvds_overlay.dtbo dtb-y += apalis-imx6_ov5640_overlay.dtbo -dtb-y += apalis-imx6_ov5640_v11a_overlay.dtbo +dtb-y += apalis-imx6_ov5640-v11a_overlay.dtbo dtb-y += apalis-imx6_parallel-rgb_overlay.dtbo dtb-y += apalis-imx6_stmpe-ts_overlay.dtbo dtb-y += apalis-imx6_vga_overlay.dtbo diff --git a/overlays/apalis-imx6_ov5640-v11a_overlay.dts b/overlays/apalis-imx6_ov5640-v11a_overlay.dts new file mode 100644 index 0000000..53e83b0 --- /dev/null +++ b/overlays/apalis-imx6_ov5640-v11a_overlay.dts @@ -0,0 +1,25 @@ +// CSI Camera Module 5MP OV5640 v1.1A (with external mclk) orderable at Toradex. + +/dts-v1/; +/plugin/; + +#include + +/ { + compatible = "toradex,apalis_imx6q"; +}; + +&i2c1 { + status = "okay"; +}; + +&ov5640_csi_cam { + /* external mclk */ + clocks = <&clks IMX6QDL_CLK_CKO2>; + status = "okay"; +}; + +&mipi_csi { + status = "okay"; +}; + diff --git a/overlays/apalis-imx6_ov5640_v11a_overlay.dts b/overlays/apalis-imx6_ov5640_v11a_overlay.dts deleted file mode 100644 index dbbd09a..0000000 --- a/overlays/apalis-imx6_ov5640_v11a_overlay.dts +++ /dev/null @@ -1,98 +0,0 @@ -// CSI Camera Module 5MP OV5640 orderable at Toradex. - -/dts-v1/; -/plugin/; - -#include -#include -#include - -/ { - compatible = "toradex,apalis_imx6q"; - - reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd { - compatible = "regulator-fixed"; - regulator-name = "DOVDD/DVDD_1.8V"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - vin-supply = <®_3v3_sw>; - }; - - reg_ov5640_2v8_a_vdd: regulator-ov5640-2v8-a-vdd { - compatible = "regulator-fixed"; - regulator-name = "AVDD/AFVDD_2.8V"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - regulator-always-on; - vin-supply = <®_3v3_sw>; - }; -}; - -&i2c1 { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - ov5640_mipi@3c { - compatible = "ovti,ov5640"; - reg = <0x3c>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_cam_mclk &pinctrl_apalis_gpio1 &pinctrl_csi_reset>; - clocks = <&clks IMX6QDL_CLK_CKO2>; - clock-names = "xclk"; - DOVDD-supply = <®_ov5640_1v8_d_o_vdd>; - AVDD-supply = <®_ov5640_2v8_a_vdd>; - DVDD-supply = <®_ov5640_1v8_d_o_vdd>; - powerdown-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; - status = "okay"; - - port { - /* MIPI CSI bus endpoint */ - ov5640_to_mipi_csi2: endpoint { - remote-endpoint = <&mipi_csi_from_ov5640>; - clock-lanes = <0>; - data-lanes = <1 2>; - }; - }; - }; -}; - -&mipi_csi { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - port@0 { - reg = <0>; - - mipi_csi_from_ov5640: endpoint { - remote-endpoint = <&ov5640_to_mipi_csi2>; - clock-lanes = <0>; - data-lanes = <1 2>; - }; - }; -}; - -&iomuxc { - pinctrl-0 = <&pinctrl_apalis_gpio2 &pinctrl_apalis_gpio3 - &pinctrl_apalis_gpio4 &pinctrl_apalis_gpio5 - &pinctrl_apalis_gpio6 &pinctrl_apalis_gpio7 - &pinctrl_apalis_gpio8 - >; - - pinctrl_cam_mclk: cammclkgrp { - fsl,pins = < - /* CAM sys_mclk */ - MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x00b0 - >; - }; - - pinctrl_csi_reset: csiresetgrp { - fsl,pins = < - MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 /* reset */ - >; - }; -}; - -- cgit v1.2.3