Skip to content
Snippets Groups Projects
Commit 6406245c authored by Gianfranco Mariotti's avatar Gianfranco Mariotti
Browse files

[928] fix video output

* move setting of mxcfb properties to overlays
* change hdmi disp_id to not conflict on hdmi+lvds, lvds+hdmi configurations
* use same lvds-channel crtc ipu for the imx6q and imx6dl configurations
parent a46060d4
No related merge requests found
......@@ -8,6 +8,8 @@
target = <&mxcfb2>;
__overlay__ {
disp_dev = "ldb";
interface_pix_fmt = "RGB666";
default_bpp = <16>;
status = "okay";
};
};
......@@ -15,12 +17,11 @@
fragment@1 {
target = <&mxcfb1>;
__overlay__ {
disp_dev = "hdmi";
status = "okay";
mode_str = "1920x1080M@60";
disp_dev = "hdmi";
interface_pix_fmt = "RGB24";
mode_str ="1920x1080M@60";
default_bpp = <24>;
int_clk = <0>;
late_init = <0>;
status = "okay";
};
};
......
......@@ -7,12 +7,11 @@
fragment@0 {
target = <&mxcfb1>;
__overlay__ {
disp_dev = "hdmi";
status = "okay";
mode_str = "1920x1080M@60";
disp_dev = "hdmi";
interface_pix_fmt = "RGB24";
mode_str ="1920x1080M@60";
default_bpp = <24>;
int_clk = <0>;
late_init = <0>;
status = "okay";
};
};
......
......@@ -8,19 +8,20 @@
target = <&mxcfb1>;
__overlay__ {
disp_dev = "ldb";
status = "okay";
interface_pix_fmt = "RGB666";
default_bpp = <16>;
status = "okay";
};
};
fragment@1 {
target = <&mxcfb2>;
__overlay__ {
disp_dev = "hdmi";
status = "okay";
mode_str = "1920x1080M@60";
disp_dev = "hdmi";
interface_pix_fmt = "RGB24";
mode_str ="1920x1080M@60";
default_bpp = <24>;
int_clk = <0>;
late_init = <0>;
status = "okay";
};
};
......
......@@ -8,7 +8,9 @@
target = <&mxcfb1>;
__overlay__ {
disp_dev = "ldb";
status = "okay";
interface_pix_fmt = "RGB666";
default_bpp = <16>;
status = "okay";
};
};
......
......@@ -8,7 +8,9 @@
target = <&mxcfb1>;
__overlay__ {
disp_dev = "ldb";
status = "okay";
interface_pix_fmt = "RGB666";
default_bpp = <16>;
status = "okay";
};
};
......
......@@ -8,7 +8,9 @@
target = <&mxcfb1>;
__overlay__ {
disp_dev = "ldb";
status = "okay";
interface_pix_fmt = "RGB666";
default_bpp = <16>;
status = "okay";
};
};
......@@ -16,7 +18,9 @@
target = <&mxcfb2>;
__overlay__ {
disp_dev = "ldb";
status = "okay";
interface_pix_fmt = "RGB666";
default_bpp = <16>;
status = "okay";
};
};
......
......@@ -11,7 +11,6 @@
compatible = "fsl,imx6dl-quadmo747_928", "fsl,imx6dl";
};
&ldb {
status = "disabled";
......@@ -25,4 +24,3 @@
crtc = "ipu1-di1";
};
};
......@@ -16,12 +16,12 @@
lvds_ch0: lvds-channel@0 {
status = "disabled";
crtc = "ipu2-di0";
crtc = "ipu1-di0";
};
lvds_ch1: lvds-channel@1 {
status = "disabled";
crtc = "ipu2-di1";
crtc = "ipu1-di1";
};
};
......
......@@ -132,9 +132,6 @@
mxcfb1: fb@0 {
compatible = "fsl,mxc_sdc_fb";
disp_dev = "ldb";
interface_pix_fmt = "RGB666";
default_bpp = <16>;
int_clk = <0>;
late_init = <0>;
status = "disabled";
......@@ -142,10 +139,6 @@
mxcfb2: fb@1 {
compatible = "fsl,mxc_sdc_fb";
disp_dev = "hdmi";
interface_pix_fmt = "RGB24";
mode_str ="1920x1080M@60";
default_bpp = <24>;
int_clk = <0>;
late_init = <0>;
status = "disabled";
......@@ -551,7 +544,7 @@
&hdmi_core {
ipu_id = <0>;
disp_id = <0>;
disp_id = <1>;
status = "disabled";
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment