Skip to contentSkip to conversation

board: nitrogen6x: migrate to CONFIG_DM_VIDEO

PATCH New Troy Kisky 2 participants 4 messages Feb 20, 2020

Subsystems (2)
lore
Share & tools
lore

Troy Kisky

author
#0 lore raw

PATCH 1/1 board: nitrogen6x: migrate to CONFIG_DM_VIDEO

Enable driver model for Video to remove compiler warning. To enable display, issue

setenv stdout serial,vidconsole;

Add CONFIG_DM_VIDEO to all defconfigs whose board is nitrogen6x.
mx6qsabrelite_defconfig nitrogen6dl2g_defconfig nitrogen6dl_defconfig nitrogen6q2g_defconfig nitrogen6q_defconfig nitrogen6s1g_defconfig nitrogen6s_defconfig

arch/arm/dts/imx6qdl-sabrelite.dtsi +41 -0
index 673a19c3df..86375156b9 100644
@@ -195,6 +195,15 @@
 		pwm_lvds = &pwm4;
 	};
 
+	backlight_lvds: backlight-lvds {
+		brightness-levels = <0 1 2 3 4 5 6 7 8 9 10>;
+		compatible = "pwm-backlight";
+		default-brightness-level = <8>;
+		power-supply = <&reg_3p3v>;
+		pwms = <&pwm4 0 5000000>;
+		status = "okay";
+	};
+
 	chosen {
 		stdout-path = &uart2;
 	};
@@ -219,6 +228,17 @@
 		gpio = GP_REG_USBOTG;
 		enable-active-high;
 	};
+
+	panel-lvds0 {
+		backlight = <&backlight_lvds>;
+		compatible = "hannstar,hsd100pxn1";
+
+		port {
+			panel_in: endpoint {
+				remote-endpoint = <&lvds0_out>;
+			};
+		};
+	};
 };
 
 &ecspi1 {
@@ -281,6 +301,11 @@
 	};
 };
 
+&hdmi {
+	ddc-i2c-bus = <&i2c2>;
+	status = "okay";
+};
+
 &i2c1 {
 	clock-frequency = <100000>;
 	pinctrl-names = "default", "gpio";
@@ -316,6 +341,22 @@
 	status = "okay";
 };
 
+&ldb {
+	status = "okay";
+
+	lvds-channel at 0 {
+		status = "okay";
+
+		port at 4 {
+			reg = <4>;
+
+			lvds0_out: endpoint {
+				remote-endpoint = <&panel_in>;
+			};
+		};
+	};
+};
+
 &pcie {
 	status = "okay";
 };
configs/mx6qsabrelite_defconfig +3 -3
index a85bfe0769..1171192c33 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x60000
@@ -9,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
@@ -68,6 +68,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
configs/nitrogen6dl2g_defconfig +3 -3
index d10162578a..07814f3ef4 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x2000
@@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
@@ -72,6 +72,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
configs/nitrogen6dl_defconfig +3 -3
index dd07ce0d58..7a0de9d0e0 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x2000
@@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
@@ -72,6 +72,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
configs/nitrogen6q2g_defconfig +3 -3
index 91b85ea708..69698d94a0 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x2000
@@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
@@ -74,6 +74,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
configs/nitrogen6q_defconfig +3 -3
index 009382fec0..6d11b90f0a 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x2000
@@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
@@ -74,6 +74,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
configs/nitrogen6s1g_defconfig +3 -3
index c0f4261930..f7fcae4f0a 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x2000
@@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
@@ -72,6 +72,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
configs/nitrogen6s_defconfig +3 -3
index 1dc9d5377a..db557633b7 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x2000
@@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
@@ -72,6 +72,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
Signature · 1 line
2.18.0
reviewer
#1 lore raw

PATCH 1/1 board: nitrogen6x: migrate to CONFIG_DM_VIDEO

Hi Troy,

Quoted 39 lines · Troy Kisky

Enable driver model for Video to remove compiler warning. To enable display, issue

setenv stdout serial,vidconsole;

Add CONFIG_DM_VIDEO to all defconfigs whose board is nitrogen6x.
mx6qsabrelite_defconfig nitrogen6dl2g_defconfig nitrogen6dl_defconfig nitrogen6q2g_defconfig nitrogen6q_defconfig nitrogen6s1g_defconfig nitrogen6s_defconfig

arch/arm/dts/imx6qdl-sabrelite.dtsi +9 -0
index 673a19c3df..86375156b9 100644
@@ -195,6 +195,15 @@
                pwm_lvds = &pwm4;
        };
 
+       backlight_lvds: backlight-lvds {
+               brightness-levels = <0 1 2 3 4 5 6 7 8 9 10>;
+               compatible = "pwm-backlight";
+               default-brightness-level = <8>;
+               power-supply = <&reg_3p3v>;
+               pwms = <&pwm4 0 5000000>;
+               status = "okay";
+       };
+
        chosen {
                stdout-path = &uart2;
        };

arch/arm/dts/imx6qdl-sabrelite.dtsi line 234

Quoted 7 lines
arch/arm/dts/imx6qdl-sabrelite.dtsi +4 -0
@@ -219,6 +228,17 @@
                gpio = GP_REG_USBOTG;
                enable-active-high;
        };
+
+       panel-lvds0 {
+               backlight = <&backlight_lvds>;
+               compatible = "hannstar,hsd100pxn1";

Instead of adding only the LVDS pieces here, what about resyncing the whole dts with the upstream kernel on a separate patch ?

author
#2 lore raw

PATCH 1/1 board: nitrogen6x: migrate to CONFIG_DM_VIDEO

Quoted 45 lines · Fabio Estevam

Hi Troy,

Quoted 41 lines · Troy Kisky

Enable driver model for Video to remove compiler warning. To enable display, issue

setenv stdout serial,vidconsole;

Add CONFIG_DM_VIDEO to all defconfigs whose board is nitrogen6x.
mx6qsabrelite_defconfig nitrogen6dl2g_defconfig nitrogen6dl_defconfig nitrogen6q2g_defconfig nitrogen6q_defconfig nitrogen6s1g_defconfig nitrogen6s_defconfig

arch/arm/dts/imx6qdl-sabrelite.dtsi +9 -0
index 673a19c3df..86375156b9 100644
@@ -195,6 +195,15 @@
                pwm_lvds = &pwm4;
        };
 
+       backlight_lvds: backlight-lvds {
+               brightness-levels = <0 1 2 3 4 5 6 7 8 9 10>;
+               compatible = "pwm-backlight";
+               default-brightness-level = <8>;
+               power-supply = <&reg_3p3v>;
+               pwms = <&pwm4 0 5000000>;
+               status = "okay";
+       };
+
        chosen {
                stdout-path = &uart2;
        };
@@ -219,6 +228,17 @@
                gpio = GP_REG_USBOTG;
                enable-active-high;
Quoted 9 lines

arch/arm/dts/imx6qdl-sabrelite.dtsi line 234

Quoted 5 lines
arch/arm/dts/imx6qdl-sabrelite.dtsi +4 -0
        };
+
+       panel-lvds0 {
+               backlight = <&backlight_lvds>;
+               compatible = "hannstar,hsd100pxn1";

Instead of adding only the LVDS pieces here, what about resyncing the whole dts with the upstream kernel on a separate patch ?

Or I can just skip the dts changes. I don't think they are needed.

Do we have a policy for dead dts code ?

Thanks
Troy

reviewer
#3 lore raw

PATCH 1/1 board: nitrogen6x: migrate to CONFIG_DM_VIDEO

Quoted 1 line · Troy Kisky

Or I can just skip the dts changes. I don't think they are needed.

Yes, that's what I thought as well. Skipping the dts changes is fine.

Quoted 1 line

Do we have a policy for dead dts code ?

Not really. We try to keep the U-Boot dts in sync with upstream whenever possible.