[U-Boot] [PATCH 0/6] Enabled DM_VIDEO for Colibri iMX7 NAND/iMX6ULL
From: Igor Opaniuk igor.opaniuk@toradex.com
This patch-series fixes some issues in mxsfb fbdev bindings (incorrect structure). Currently there is a support only for old format, new one wil be introduced soon [1].
Also it enables support of DM_VIDEO for Colibri iMX7 NAND version and for Colibri iMX6ULL.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/display/mxsfb.t...
Igor Opaniuk (6): video: mxsfb: fix mxsfb fbdev binding issues ARM: dts: colibri_imx7: Fix lcdif node definition configs: colibri_imx7: enable DM_VIDEO colibri-imx6ull: support building with DM_VIDEO=y ARM: dts: colibri-imx6ull: extend lcdif node configs: colibri-imx6ull: switch to DM_VIDEO
arch/arm/dts/imx6ull-colibri.dts | 32 +++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++--------- arch/arm/mach-imx/mx6/soc.c | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++----- include/configs/colibri-imx6ull.h | 2 +- 7 files changed, 124 insertions(+), 37 deletions(-)
From: Igor Opaniuk igor.opaniuk@toradex.com
Add support for display and bits-per-pixel properties.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com --- drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 12 deletions(-)
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index f02ba20138..6c9a7c05e8 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -271,6 +271,42 @@ dealloc_fb: } #else /* ifndef CONFIG_DM_VIDEO */
+static int mxs_of_get_timings(struct udevice *dev, + struct display_timing *timings, + u32 *bpp) +{ + int ret = 0; + u32 display_phandle; + ofnode display_node; + + ret = ofnode_read_u32(dev_ofnode(dev), "display", &display_phandle); + if (ret) { + dev_err(dev, "required display property isn't provided\n"); + return -EINVAL; + } + + display_node = ofnode_get_by_phandle(display_phandle); + if (!ofnode_valid(display_node)) { + dev_err(dev, "failed to find display subnode\n"); + return -EINVAL; + } + + ret = ofnode_read_u32(display_node, "bits-per-pixel", bpp); + if (ret) { + dev_err(dev, + "required bits-per-pixel property isn't provided\n"); + return -EINVAL; + } + + ret = ofnode_decode_display_timing(display_node, 0, timings); + if (ret) { + dev_err(dev, "failed to get any display timings\n"); + return -EINVAL; + } + + return ret; +} + static int mxs_video_probe(struct udevice *dev) { struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); @@ -278,18 +314,16 @@ static int mxs_video_probe(struct udevice *dev)
struct ctfb_res_modes mode; struct display_timing timings; - int bpp = -1; + u32 bpp = 0; u32 fb_start, fb_end; int ret;
debug("%s() plat: base 0x%lx, size 0x%x\n", __func__, plat->base, plat->size);
- ret = ofnode_decode_display_timing(dev_ofnode(dev), 0, &timings); - if (ret) { - dev_err(dev, "failed to get any display timings\n"); - return -EINVAL; - } + ret = mxs_of_get_timings(dev, &timings, &bpp); + if (ret) + return ret;
mode.xres = timings.hactive.typ; mode.yres = timings.vactive.typ; @@ -301,13 +335,12 @@ static int mxs_video_probe(struct udevice *dev) mode.vsync_len = timings.vsync_len.typ; mode.pixclock = HZ2PS(timings.pixelclock.typ);
- bpp = BITS_PP; - ret = mxs_probe_common(&mode, bpp, plat->base); if (ret) return ret;
switch (bpp) { + case 32: case 24: case 18: uc_priv->bpix = VIDEO_BPP32; @@ -341,15 +374,32 @@ static int mxs_video_bind(struct udevice *dev) { struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); struct display_timing timings; + u32 bpp = 0; + u32 bytes_pp = 0; int ret;
- ret = ofnode_decode_display_timing(dev_ofnode(dev), 0, &timings); - if (ret) { - dev_err(dev, "failed to get any display timings\n"); + ret = mxs_of_get_timings(dev, &timings, &bpp); + if (ret) + return ret; + + switch (bpp) { + case 32: + case 24: + case 18: + bytes_pp = 4; + break; + case 16: + bytes_pp = 2; + break; + case 8: + bytes_pp = 1; + break; + default: + dev_err(dev, "invalid bpp specified (bpp = %i)\n", bpp); return -EINVAL; }
- plat->size = timings.hactive.typ * timings.vactive.typ * BYTES_PP; + plat->size = timings.hactive.typ * timings.vactive.typ * bytes_pp;
return 0; }
+ Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Add support for display and bits-per-pixel properties.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 12 deletions(-)
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index f02ba20138..6c9a7c05e8 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -271,6 +271,42 @@ dealloc_fb: } #else /* ifndef CONFIG_DM_VIDEO */
+static int mxs_of_get_timings(struct udevice *dev,
struct display_timing *timings,u32 *bpp)+{
int ret = 0;u32 display_phandle;ofnode display_node;ret = ofnode_read_u32(dev_ofnode(dev), "display", &display_phandle);if (ret) {dev_err(dev, "required display property isn't provided\n");return -EINVAL;}display_node = ofnode_get_by_phandle(display_phandle);if (!ofnode_valid(display_node)) {dev_err(dev, "failed to find display subnode\n");return -EINVAL;}ret = ofnode_read_u32(display_node, "bits-per-pixel", bpp);if (ret) {dev_err(dev,"required bits-per-pixel property isn't provided\n");return -EINVAL;}ret = ofnode_decode_display_timing(display_node, 0, timings);if (ret) {dev_err(dev, "failed to get any display timings\n");return -EINVAL;}return ret;+}
static int mxs_video_probe(struct udevice *dev) { struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); @@ -278,18 +314,16 @@ static int mxs_video_probe(struct udevice *dev)
struct ctfb_res_modes mode; struct display_timing timings;
int bpp = -1;
u32 bpp = 0; u32 fb_start, fb_end; int ret; debug("%s() plat: base 0x%lx, size 0x%x\n", __func__, plat->base, plat->size);
ret = ofnode_decode_display_timing(dev_ofnode(dev), 0, &timings);if (ret) {dev_err(dev, "failed to get any display timings\n");return -EINVAL;}
ret = mxs_of_get_timings(dev, &timings, &bpp);if (ret)return ret; mode.xres = timings.hactive.typ; mode.yres = timings.vactive.typ;@@ -301,13 +335,12 @@ static int mxs_video_probe(struct udevice *dev) mode.vsync_len = timings.vsync_len.typ; mode.pixclock = HZ2PS(timings.pixelclock.typ);
bpp = BITS_PP;ret = mxs_probe_common(&mode, bpp, plat->base); if (ret) return ret; switch (bpp) {
case 32: case 24: case 18: uc_priv->bpix = VIDEO_BPP32;@@ -341,15 +374,32 @@ static int mxs_video_bind(struct udevice *dev) { struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); struct display_timing timings;
u32 bpp = 0;u32 bytes_pp = 0; int ret;
ret = ofnode_decode_display_timing(dev_ofnode(dev), 0, &timings);if (ret) {dev_err(dev, "failed to get any display timings\n");
ret = mxs_of_get_timings(dev, &timings, &bpp);if (ret)return ret;switch (bpp) {case 32:case 24:case 18:bytes_pp = 4;break;case 16:bytes_pp = 2;break;case 8:bytes_pp = 1;break;default:dev_err(dev, "invalid bpp specified (bpp = %i)\n", bpp); return -EINVAL; }
plat->size = timings.hactive.typ * timings.vactive.typ * BYTES_PP;
plat->size = timings.hactive.typ * timings.vactive.typ * bytes_pp; return 0;}
2.17.1
On Thu, 11 Jul 2019 at 11:57, Igor Opaniuk igor.opaniuk@gmail.com wrote:
- Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Add support for display and bits-per-pixel properties.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 12 deletions(-)
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index f02ba20138..6c9a7c05e8 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -271,6 +271,42 @@ dealloc_fb: } #else /* ifndef CONFIG_DM_VIDEO */
+static int mxs_of_get_timings(struct udevice *dev,
struct display_timing *timings,u32 *bpp)+{
int ret = 0;u32 display_phandle;ofnode display_node;ret = ofnode_read_u32(dev_ofnode(dev), "display", &display_phandle);if (ret) {dev_err(dev, "required display property isn't provided\n");return -EINVAL;}display_node = ofnode_get_by_phandle(display_phandle);if (!ofnode_valid(display_node)) {dev_err(dev, "failed to find display subnode\n");return -EINVAL;}ret = ofnode_read_u32(display_node, "bits-per-pixel", bpp);if (ret) {dev_err(dev,"required bits-per-pixel property isn't provided\n");return -EINVAL;}ret = ofnode_decode_display_timing(display_node, 0, timings);if (ret) {dev_err(dev, "failed to get any display timings\n");return -EINVAL;}return ret;+}
static int mxs_video_probe(struct udevice *dev) { struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); @@ -278,18 +314,16 @@ static int mxs_video_probe(struct udevice *dev)
struct ctfb_res_modes mode; struct display_timing timings;
int bpp = -1;
u32 bpp = 0; u32 fb_start, fb_end; int ret; debug("%s() plat: base 0x%lx, size 0x%x\n", __func__, plat->base, plat->size);
ret = ofnode_decode_display_timing(dev_ofnode(dev), 0, &timings);if (ret) {dev_err(dev, "failed to get any display timings\n");return -EINVAL;}
ret = mxs_of_get_timings(dev, &timings, &bpp);if (ret)return ret; mode.xres = timings.hactive.typ; mode.yres = timings.vactive.typ;@@ -301,13 +335,12 @@ static int mxs_video_probe(struct udevice *dev) mode.vsync_len = timings.vsync_len.typ; mode.pixclock = HZ2PS(timings.pixelclock.typ);
bpp = BITS_PP;ret = mxs_probe_common(&mode, bpp, plat->base); if (ret) return ret; switch (bpp) {
case 32: case 24: case 18: uc_priv->bpix = VIDEO_BPP32;@@ -341,15 +374,32 @@ static int mxs_video_bind(struct udevice *dev) { struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); struct display_timing timings;
u32 bpp = 0;u32 bytes_pp = 0; int ret;
ret = ofnode_decode_display_timing(dev_ofnode(dev), 0, &timings);if (ret) {dev_err(dev, "failed to get any display timings\n");
ret = mxs_of_get_timings(dev, &timings, &bpp);if (ret)return ret;switch (bpp) {case 32:case 24:case 18:bytes_pp = 4;break;case 16:bytes_pp = 2;break;case 8:bytes_pp = 1;break;default:dev_err(dev, "invalid bpp specified (bpp = %i)\n", bpp); return -EINVAL; }
plat->size = timings.hactive.typ * timings.vactive.typ * BYTES_PP;
plat->size = timings.hactive.typ * timings.vactive.typ * bytes_pp; return 0;}
2.17.1
-- Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk@gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Reviewed-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
From: Igor Opaniuk igor.opaniuk@toradex.com
Fix lcdif DT node and make it conform to the structure defined in the Linux devicetree bindings [1]. Currently there is support only for old style lcdif node definitions.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/display/mxsfb.t...
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com --- arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/arch/arm/dts/imx7-colibri.dtsi b/arch/arm/dts/imx7-colibri.dtsi index 81717c233d..308e0b2a63 100644 --- a/arch/arm/dts/imx7-colibri.dtsi +++ b/arch/arm/dts/imx7-colibri.dtsi @@ -113,29 +113,34 @@ };
&lcdif { - u-boot,dm-pre-reloc; status = "okay"; + display = <&display0>; + u-boot,dm-pre-reloc;
- display-timings { - native-mode = <&timing_vga>; - - /* Standard VGA timing */ - timing_vga: 640x480 { - u-boot,dm-pre-reloc; - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <48>; - hfront-porch = <16>; - vback-porch = <33>; - vfront-porch = <10>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; + display0: display0 { + bits-per-pixel = <18>; + bus-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing_vga>; + timing_vga: 640x480 { + u-boot,dm-pre-reloc; + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <33>; + vfront-porch = <10>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; }; }; };
+ Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Fix lcdif DT node and make it conform to the structure defined in the Linux devicetree bindings [1]. Currently there is support only for old style lcdif node definitions.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/display/mxsfb.t...
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/arch/arm/dts/imx7-colibri.dtsi b/arch/arm/dts/imx7-colibri.dtsi index 81717c233d..308e0b2a63 100644 --- a/arch/arm/dts/imx7-colibri.dtsi +++ b/arch/arm/dts/imx7-colibri.dtsi @@ -113,29 +113,34 @@ };
&lcdif {
u-boot,dm-pre-reloc; status = "okay";
display = <&display0>;u-boot,dm-pre-reloc;
display-timings {native-mode = <&timing_vga>;/* Standard VGA timing */timing_vga: 640x480 {u-boot,dm-pre-reloc;clock-frequency = <25175000>;hactive = <640>;vactive = <480>;hback-porch = <48>;hfront-porch = <16>;vback-porch = <33>;vfront-porch = <10>;hsync-len = <96>;vsync-len = <2>;de-active = <1>;hsync-active = <0>;vsync-active = <0>;pixelclk-active = <0>;
display0: display0 {bits-per-pixel = <18>;bus-width = <24>;status = "okay";display-timings {native-mode = <&timing_vga>;timing_vga: 640x480 {u-boot,dm-pre-reloc;clock-frequency = <25175000>;hactive = <640>;vactive = <480>;hback-porch = <48>;hfront-porch = <16>;vback-porch = <33>;vfront-porch = <10>;hsync-len = <96>;vsync-len = <2>;de-active = <1>;hsync-active = <0>;vsync-active = <0>;pixelclk-active = <0>;}; }; };};
2.17.1
On Thu, 11 Jul 2019 at 11:58, Igor Opaniuk igor.opaniuk@gmail.com wrote:
- Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Fix lcdif DT node and make it conform to the structure defined in the Linux devicetree bindings [1]. Currently there is support only for old style lcdif node definitions.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/display/mxsfb.t...
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/arch/arm/dts/imx7-colibri.dtsi b/arch/arm/dts/imx7-colibri.dtsi index 81717c233d..308e0b2a63 100644 --- a/arch/arm/dts/imx7-colibri.dtsi +++ b/arch/arm/dts/imx7-colibri.dtsi @@ -113,29 +113,34 @@ };
&lcdif {
u-boot,dm-pre-reloc; status = "okay";
display = <&display0>;u-boot,dm-pre-reloc;
display-timings {native-mode = <&timing_vga>;/* Standard VGA timing */timing_vga: 640x480 {u-boot,dm-pre-reloc;clock-frequency = <25175000>;hactive = <640>;vactive = <480>;hback-porch = <48>;hfront-porch = <16>;vback-porch = <33>;vfront-porch = <10>;hsync-len = <96>;vsync-len = <2>;de-active = <1>;hsync-active = <0>;vsync-active = <0>;pixelclk-active = <0>;
display0: display0 {bits-per-pixel = <18>;bus-width = <24>;status = "okay";display-timings {native-mode = <&timing_vga>;timing_vga: 640x480 {u-boot,dm-pre-reloc;clock-frequency = <25175000>;hactive = <640>;vactive = <480>;hback-porch = <48>;hfront-porch = <16>;vback-porch = <33>;vfront-porch = <10>;hsync-len = <96>;vsync-len = <2>;de-active = <1>;hsync-active = <0>;vsync-active = <0>;pixelclk-active = <0>;}; }; };};
2.17.1
-- Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk@gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Reviewed-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
From: Igor Opaniuk igor.opaniuk@toradex.com
Enable DM_VIDEO support for Colibri iMX7 NAND version.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com --- configs/colibri_imx7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index efbf5f55a3..6d1a1afc56 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -75,6 +75,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y
+ Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Enable DM_VIDEO support for Colibri iMX7 NAND version.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
configs/colibri_imx7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index efbf5f55a3..6d1a1afc56 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -75,6 +75,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y -- 2.17.1
On Thu, 11 Jul 2019 at 11:58, Igor Opaniuk igor.opaniuk@gmail.com wrote:
- Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Enable DM_VIDEO support for Colibri iMX7 NAND version.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
configs/colibri_imx7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index efbf5f55a3..6d1a1afc56 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -75,6 +75,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y -- 2.17.1
-- Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk@gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Reviewed-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
From: Igor Opaniuk igor.opaniuk@toradex.com
1. This fixes linking issues when building with DM_VIDEO enabled mxsfb driver. 2. Provide proper defines for both VIDEO=y and DM_VIDEO=y.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com --- arch/arm/mach-imx/mx6/soc.c | 2 +- include/configs/colibri-imx6ull.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index e80f1d484b..86a9eeba0c 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -549,7 +549,7 @@ const struct boot_mode soc_boot_modes[] = { void reset_misc(void) { #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_VIDEO_MXS +#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO) lcdif_power_down(); #endif #endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 21d9a3da01..1c6acf0081 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -170,7 +170,7 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300
-#ifdef CONFIG_VIDEO +#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define CONFIG_VIDEO_LOGO
+ Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
- This fixes linking issues when building with DM_VIDEO enabled mxsfb
driver. 2. Provide proper defines for both VIDEO=y and DM_VIDEO=y.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
arch/arm/mach-imx/mx6/soc.c | 2 +- include/configs/colibri-imx6ull.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index e80f1d484b..86a9eeba0c 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -549,7 +549,7 @@ const struct boot_mode soc_boot_modes[] = { void reset_misc(void) { #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_VIDEO_MXS +#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO) lcdif_power_down(); #endif #endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 21d9a3da01..1c6acf0081 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -170,7 +170,7 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300
-#ifdef CONFIG_VIDEO +#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#define CONFIG_VIDEO_LOGO
2.17.1
On Thu, 11 Jul 2019 at 11:59, Igor Opaniuk igor.opaniuk@gmail.com wrote:
- Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
- This fixes linking issues when building with DM_VIDEO enabled mxsfb
driver. 2. Provide proper defines for both VIDEO=y and DM_VIDEO=y.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
arch/arm/mach-imx/mx6/soc.c | 2 +- include/configs/colibri-imx6ull.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index e80f1d484b..86a9eeba0c 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -549,7 +549,7 @@ const struct boot_mode soc_boot_modes[] = { void reset_misc(void) { #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_VIDEO_MXS +#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO) lcdif_power_down(); #endif #endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 21d9a3da01..1c6acf0081 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -170,7 +170,7 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300
-#ifdef CONFIG_VIDEO +#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#define CONFIG_VIDEO_LOGO
2.17.1
-- Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk@gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Reviewed-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
From: Igor Opaniuk igor.opaniuk@toradex.com
Provide proper display timings for lcdif node, used by mxsfb DM_VIDEO enabled framebuffer driver.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com --- arch/arm/dts/imx6ull-colibri.dts | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 6c847ab792..262205ac5e 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -12,8 +12,10 @@ compatible = "toradex,colibri-imx6ull", "fsl,imx6ull";
aliases { + u-boot,dm-pre-reloc; mmc0 = &usdhc1; usb0 = &usbotg1; /* required for ums */ + display0 = &lcdif; };
chosen { @@ -156,6 +158,36 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; + status = "okay"; + display = <&display0>; + u-boot,dm-pre-reloc; + + display0: display0 { + bits-per-pixel = <18>; + bus-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing_vga>; + timing_vga: 640x480 { + u-boot,dm-pre-reloc; + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <33>; + vfront-porch = <10>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + }; + }; };
/* PWM <A> */
+ Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Provide proper display timings for lcdif node, used by mxsfb DM_VIDEO enabled framebuffer driver.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
arch/arm/dts/imx6ull-colibri.dts | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 6c847ab792..262205ac5e 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -12,8 +12,10 @@ compatible = "toradex,colibri-imx6ull", "fsl,imx6ull";
aliases {
u-boot,dm-pre-reloc; mmc0 = &usdhc1; usb0 = &usbotg1; /* required for ums */display0 = &lcdif; }; chosen {@@ -156,6 +158,36 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
status = "okay";display = <&display0>;u-boot,dm-pre-reloc;display0: display0 {bits-per-pixel = <18>;bus-width = <24>;status = "okay";display-timings {native-mode = <&timing_vga>;timing_vga: 640x480 {u-boot,dm-pre-reloc;clock-frequency = <25175000>;hactive = <640>;vactive = <480>;hback-porch = <48>;hfront-porch = <16>;vback-porch = <33>;vfront-porch = <10>;hsync-len = <96>;vsync-len = <2>;de-active = <1>;hsync-active = <0>;vsync-active = <0>;pixelclk-active = <0>;};};};};
/* PWM <A> */
2.17.1
On Thu, 11 Jul 2019 at 11:59, Igor Opaniuk igor.opaniuk@gmail.com wrote:
- Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Provide proper display timings for lcdif node, used by mxsfb DM_VIDEO enabled framebuffer driver.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
arch/arm/dts/imx6ull-colibri.dts | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts index 6c847ab792..262205ac5e 100644 --- a/arch/arm/dts/imx6ull-colibri.dts +++ b/arch/arm/dts/imx6ull-colibri.dts @@ -12,8 +12,10 @@ compatible = "toradex,colibri-imx6ull", "fsl,imx6ull";
aliases {
u-boot,dm-pre-reloc; mmc0 = &usdhc1; usb0 = &usbotg1; /* required for ums */display0 = &lcdif; }; chosen {@@ -156,6 +158,36 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
status = "okay";display = <&display0>;u-boot,dm-pre-reloc;display0: display0 {bits-per-pixel = <18>;bus-width = <24>;status = "okay";display-timings {native-mode = <&timing_vga>;timing_vga: 640x480 {u-boot,dm-pre-reloc;clock-frequency = <25175000>;hactive = <640>;vactive = <480>;hback-porch = <48>;hfront-porch = <16>;vback-porch = <33>;vfront-porch = <10>;hsync-len = <96>;vsync-len = <2>;de-active = <1>;hsync-active = <0>;vsync-active = <0>;pixelclk-active = <0>;};};};};
/* PWM <A> */
2.17.1
-- Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk@gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Reviewed-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
-- Best regards Oleksandr Suvorov
Toradex AG Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500 4800 (main line)
From: Igor Opaniuk igor.opaniuk@toradex.com
Use CONFIG_DM_VIDEO=y by default for Colibri iMX6ULL.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com --- configs/colibri-imx6ull_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 5c89439f7b..ac5c519346 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -80,6 +80,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y
+Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Use CONFIG_DM_VIDEO=y by default for Colibri iMX6ULL.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
configs/colibri-imx6ull_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 5c89439f7b..ac5c519346 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -80,6 +80,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y -- 2.17.1
On Thu, 11 Jul 2019 at 11:59, Igor Opaniuk igor.opaniuk@gmail.com wrote:
+Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
Use CONFIG_DM_VIDEO=y by default for Colibri iMX6ULL.
Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com
configs/colibri-imx6ull_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 5c89439f7b..ac5c519346 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -80,6 +80,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y -- 2.17.1
-- Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk@gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Reviewed-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
+ Oleksandr
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
This patch-series fixes some issues in mxsfb fbdev bindings (incorrect structure). Currently there is a support only for old format, new one wil be introduced soon [1].
Also it enables support of DM_VIDEO for Colibri iMX7 NAND version and for Colibri iMX6ULL.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/display/mxsfb.t...
Igor Opaniuk (6): video: mxsfb: fix mxsfb fbdev binding issues ARM: dts: colibri_imx7: Fix lcdif node definition configs: colibri_imx7: enable DM_VIDEO colibri-imx6ull: support building with DM_VIDEO=y ARM: dts: colibri-imx6ull: extend lcdif node configs: colibri-imx6ull: switch to DM_VIDEO
arch/arm/dts/imx6ull-colibri.dts | 32 +++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++--------- arch/arm/mach-imx/mx6/soc.c | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++----- include/configs/colibri-imx6ull.h | 2 +- 7 files changed, 124 insertions(+), 37 deletions(-)
-- 2.17.1
Hi Anatolij,
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
This patch-series fixes some issues in mxsfb fbdev bindings (incorrect structure). Currently there is a support only for old format, new one wil be introduced soon [1].
Also it enables support of DM_VIDEO for Colibri iMX7 NAND version and for Colibri iMX6ULL.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/display/mxsfb.t...
Igor Opaniuk (6): video: mxsfb: fix mxsfb fbdev binding issues ARM: dts: colibri_imx7: Fix lcdif node definition configs: colibri_imx7: enable DM_VIDEO colibri-imx6ull: support building with DM_VIDEO=y ARM: dts: colibri-imx6ull: extend lcdif node configs: colibri-imx6ull: switch to DM_VIDEO
arch/arm/dts/imx6ull-colibri.dts | 32 +++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++--------- arch/arm/mach-imx/mx6/soc.c | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++----- include/configs/colibri-imx6ull.h | 2 +- 7 files changed, 124 insertions(+), 37 deletions(-)
-- 2.17.1
Are there any objections from your side to get this patch-series applied? Please let me know if you have any comments/suggestions.
Thanks!
Hi,
On Thu, Jul 11, 2019 at 1:59 PM Igor Opaniuk igor.opaniuk@gmail.com wrote:
Hi Anatolij,
On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:
From: Igor Opaniuk igor.opaniuk@toradex.com
This patch-series fixes some issues in mxsfb fbdev bindings (incorrect structure). Currently there is a support only for old format, new one wil be introduced soon [1].
Also it enables support of DM_VIDEO for Colibri iMX7 NAND version and for Colibri iMX6ULL.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/display/mxsfb.t...
Igor Opaniuk (6): video: mxsfb: fix mxsfb fbdev binding issues ARM: dts: colibri_imx7: Fix lcdif node definition configs: colibri_imx7: enable DM_VIDEO colibri-imx6ull: support building with DM_VIDEO=y ARM: dts: colibri-imx6ull: extend lcdif node configs: colibri-imx6ull: switch to DM_VIDEO
arch/arm/dts/imx6ull-colibri.dts | 32 +++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++--------- arch/arm/mach-imx/mx6/soc.c | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++----- include/configs/colibri-imx6ull.h | 2 +- 7 files changed, 124 insertions(+), 37 deletions(-)
-- 2.17.1
Are there any objections from your side to get this patch-series applied? Please let me know if you have any comments/suggestions.
Thanks!
-- Best regards - Freundliche Grüsse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk@gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk
Just a gentle reminder - patches have been sitting in ML for almost 1 month. If anyone has any objections/suggestions, please let me know ( taking into account that MW closes soon, I would like to address all issues/comments ASAP and get it applied, if there are any)
Thanks
Hi Igor,
On Thu, 11 Jul 2019 13:59:35 +0300 Igor Opaniuk igor.opaniuk@gmail.com wrote: ...
Are there any objections from your side to get this patch-series applied? Please let me know if you have any comments/suggestions.
Sorry for delay, my build tests passed now. I've queued the series for v2019.10. Thanks!
-- Anatolij
Hi Anatlolij,
On Mon, Jul 29, 2019 at 12:27 PM Anatolij Gustschin agust@denx.de wrote:
Hi Igor,
On Thu, 11 Jul 2019 13:59:35 +0300 Igor Opaniuk igor.opaniuk@gmail.com wrote: ...
Are there any objections from your side to get this patch-series applied? Please let me know if you have any comments/suggestions.
Sorry for delay, my build tests passed now. I've queued the series for v2019.10. Thanks!
-- Anatolij
No problem :), thanks a lot for looking into this and applying the series!
On Wed, 19 Jun 2019 11:47:04 +0300 Igor Opaniuk igor.opaniuk@gmail.com wrote: ...
Igor Opaniuk (6): video: mxsfb: fix mxsfb fbdev binding issues ARM: dts: colibri_imx7: Fix lcdif node definition configs: colibri_imx7: enable DM_VIDEO colibri-imx6ull: support building with DM_VIDEO=y ARM: dts: colibri-imx6ull: extend lcdif node configs: colibri-imx6ull: switch to DM_VIDEO
arch/arm/dts/imx6ull-colibri.dts | 32 +++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 47 +++++++++++--------- arch/arm/mach-imx/mx6/soc.c | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- drivers/video/mxsfb.c | 74 ++++++++++++++++++++++++++----- include/configs/colibri-imx6ull.h | 2 +- 7 files changed, 124 insertions(+), 37 deletions(-)
Applied to u-boot-video/master, thanks!
-- Anatolij
participants (3)
-
Anatolij Gustschin -
Igor Opaniuk -
Oleksandr Suvorov