From 55757b8b64e1f3b5e01242aec5f4e6f004d1c3da Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Mon, 7 Oct 2024 19:59:44 -0500 Subject: [PATCH] dts: remove zephyr,panel-timing compat Since the panel timing node comes from linux bindings, let's try to remove the zephyr-specific compatible by using a child binding. This would potentially require some other work if another type of child node is needed to be specified in the future. Signed-off-by: Declan Snyder --- .../dts/da1469x_dk_pro_lcdc.overlay | 1 - .../rk043fn02h_ct/rk043fn02h_ct.overlay | 1 - .../rk043fn66hs_ctg/rk043fn66hs_ctg.overlay | 1 - .../rk055hdmipi4m/rk055hdmipi4m.overlay | 1 - .../rk055hdmipi4ma0/rk055hdmipi4ma0.overlay | 1 - .../st_b_lcd40_dsi1_mb1166.overlay | 1 - .../st_b_lcd40_dsi1_mb1166_a09.overlay | 1 - .../st/stm32f429i_disc1/stm32f429i_disc1.dts | 1 - .../st/stm32f746g_disco/stm32f746g_disco.dts | 1 - boards/st/stm32f7508_dk/stm32f7508_dk.dts | 1 - boards/st/stm32h750b_dk/stm32h750b_dk.dts | 1 - boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts | 1 - boards/witte/linum/linum.dts | 1 - dts/bindings/display/lcd-controller.yaml | 3 ++ dts/bindings/display/panel/panel-timing.yaml | 40 +++++++++---------- 15 files changed, 21 insertions(+), 35 deletions(-) diff --git a/boards/renesas/da1469x_dk_pro/dts/da1469x_dk_pro_lcdc.overlay b/boards/renesas/da1469x_dk_pro/dts/da1469x_dk_pro_lcdc.overlay index 94346ea39e7b..8823d24c80c2 100644 --- a/boards/renesas/da1469x_dk_pro/dts/da1469x_dk_pro_lcdc.overlay +++ b/boards/renesas/da1469x_dk_pro/dts/da1469x_dk_pro_lcdc.overlay @@ -65,7 +65,6 @@ * driver IC. */ display-timings { - compatible = "zephyr,panel-timing"; hsync-len = <2>; hfront-porch = <2>; hback-porch = <3>; diff --git a/boards/shields/rk043fn02h_ct/rk043fn02h_ct.overlay b/boards/shields/rk043fn02h_ct/rk043fn02h_ct.overlay index ab0b10d70af2..b65987270b29 100644 --- a/boards/shields/rk043fn02h_ct/rk043fn02h_ct.overlay +++ b/boards/shields/rk043fn02h_ct/rk043fn02h_ct.overlay @@ -31,7 +31,6 @@ width = <480>; height = <272>; display-timings { - compatible = "zephyr,panel-timing"; hsync-len = <41>; hfront-porch = <4>; hback-porch = <8>; diff --git a/boards/shields/rk043fn66hs_ctg/rk043fn66hs_ctg.overlay b/boards/shields/rk043fn66hs_ctg/rk043fn66hs_ctg.overlay index b992ec932b81..781d5a2c0fe8 100644 --- a/boards/shields/rk043fn66hs_ctg/rk043fn66hs_ctg.overlay +++ b/boards/shields/rk043fn66hs_ctg/rk043fn66hs_ctg.overlay @@ -32,7 +32,6 @@ width = <480>; height = <272>; display-timings { - compatible = "zephyr,panel-timing"; hsync-len = <4>; hfront-porch = <8>; hback-porch = <43>; diff --git a/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay b/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay index 58e610fc59e4..c094949eb21c 100644 --- a/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay +++ b/boards/shields/rk055hdmipi4m/rk055hdmipi4m.overlay @@ -39,7 +39,6 @@ width = <720>; height = <1280>; display-timings { - compatible = "zephyr,panel-timing"; hsync-len = <8>; hfront-porch = <32>; hback-porch = <32>; diff --git a/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay b/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay index 7df9f53b6a32..25c0c5c21374 100644 --- a/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay +++ b/boards/shields/rk055hdmipi4ma0/rk055hdmipi4ma0.overlay @@ -39,7 +39,6 @@ width = <720>; height = <1280>; display-timings { - compatible = "zephyr,panel-timing"; hsync-len = <6>; hfront-porch = <12>; hback-porch = <24>; diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay index 5e577214d274..8f0cd9971d7d 100644 --- a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay +++ b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay @@ -41,7 +41,6 @@ pixel-format = ; /* orisetech, otm8009a */ display-timings { - compatible = "zephyr,panel-timing"; hsync-active = <0>; vsync-active = <0>; de-active = <0>; diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay index ddef9b74e025..ca371ec75dff 100644 --- a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay +++ b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay @@ -41,7 +41,6 @@ pixel-format = ; /* frida, nt35510 */ display-timings { - compatible = "zephyr,panel-timing"; hsync-active = <0>; vsync-active = <0>; de-active = <0>; diff --git a/boards/st/stm32f429i_disc1/stm32f429i_disc1.dts b/boards/st/stm32f429i_disc1/stm32f429i_disc1.dts index cbcc551a7163..b28a09723926 100644 --- a/boards/st/stm32f429i_disc1/stm32f429i_disc1.dts +++ b/boards/st/stm32f429i_disc1/stm32f429i_disc1.dts @@ -242,7 +242,6 @@ height = <320>; pixel-format = ; display-timings { - compatible = "zephyr,panel-timing"; de-active = <0>; pixelclk-active = <0>; hsync-active = <0>; diff --git a/boards/st/stm32f746g_disco/stm32f746g_disco.dts b/boards/st/stm32f746g_disco/stm32f746g_disco.dts index 2c31fef1c92c..547c0d3d8b02 100644 --- a/boards/st/stm32f746g_disco/stm32f746g_disco.dts +++ b/boards/st/stm32f746g_disco/stm32f746g_disco.dts @@ -269,7 +269,6 @@ zephyr_udc0: &usbotg_fs { height = <272>; pixel-format = ; display-timings { - compatible = "zephyr,panel-timing"; de-active = <0>; pixelclk-active = <0>; hsync-active = <0>; diff --git a/boards/st/stm32f7508_dk/stm32f7508_dk.dts b/boards/st/stm32f7508_dk/stm32f7508_dk.dts index 100fd6e661d9..211526c29340 100644 --- a/boards/st/stm32f7508_dk/stm32f7508_dk.dts +++ b/boards/st/stm32f7508_dk/stm32f7508_dk.dts @@ -265,7 +265,6 @@ zephyr_udc0: &usbotg_fs { height = <272>; pixel-format = ; display-timings { - compatible = "zephyr,panel-timing"; de-active = <0>; pixelclk-active = <0>; hsync-active = <0>; diff --git a/boards/st/stm32h750b_dk/stm32h750b_dk.dts b/boards/st/stm32h750b_dk/stm32h750b_dk.dts index 14a6fe1fef1c..f68459ba5c33 100644 --- a/boards/st/stm32h750b_dk/stm32h750b_dk.dts +++ b/boards/st/stm32h750b_dk/stm32h750b_dk.dts @@ -100,7 +100,6 @@ height = <272>; pixel-format = ; display-timings { - compatible = "zephyr,panel-timing"; de-active = <1>; pixelclk-active = <0>; hsync-active = <0>; diff --git a/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts index 95325e254b55..732c5133be97 100644 --- a/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts +++ b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts @@ -229,7 +229,6 @@ height = <272>; pixel-format = ; display-timings { - compatible = "zephyr,panel-timing"; de-active = <0>; pixelclk-active = <0>; hsync-active = <0>; diff --git a/boards/witte/linum/linum.dts b/boards/witte/linum/linum.dts index d4846f3e1c7d..f491041e5db4 100644 --- a/boards/witte/linum/linum.dts +++ b/boards/witte/linum/linum.dts @@ -318,7 +318,6 @@ zephyr_udc0: &usbotg_fs { height = <272>; pixel-format = ; display-timings { - compatible = "zephyr,panel-timing"; de-active = <1>; pixelclk-active = <0>; hsync-active = <0>; diff --git a/dts/bindings/display/lcd-controller.yaml b/dts/bindings/display/lcd-controller.yaml index 02bfb11ca8da..093800f2682d 100644 --- a/dts/bindings/display/lcd-controller.yaml +++ b/dts/bindings/display/lcd-controller.yaml @@ -12,3 +12,6 @@ properties: description: | Initial Pixel format for panel attached to this controller. See dt-bindings/display/panel.h for a list + +child-binding: + include: panel-timing.yaml diff --git a/dts/bindings/display/panel/panel-timing.yaml b/dts/bindings/display/panel/panel-timing.yaml index 48643a452dee..357d3e7f12f5 100644 --- a/dts/bindings/display/panel/panel-timing.yaml +++ b/dts/bindings/display/panel/panel-timing.yaml @@ -4,28 +4,24 @@ # Common fields for panel timings # inherited from Linux panel bindings. -description: | - Common timing settings for display panels. These timings can be added to - a panel under display-timings node. For example: - - &lcdif { - display-timings { - compatible = "zephyr,panel-timing"; - hsync-len = <8>; - hfront-porch = <32>; - hback-porch = <32>; - vsync-len = <2>; - vfront-porch = <16>; - vback-porch = <14>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - clock-frequency = <62346240>; - }; - }; - -compatible: "zephyr,panel-timing" +# Common timing settings for display panels. These timings can be added to +# a panel under display-timings node. For example: +# +# &lcdif { +# display-timings { +# hsync-len = <8>; +# hfront-porch = <32>; +# hback-porch = <32>; +# vsync-len = <2>; +# vfront-porch = <16>; +# vback-porch = <14>; +# hsync-active = <0>; +# vsync-active = <0>; +# de-active = <1>; +# pixelclk-active = <0>; +# clock-frequency = <62346240>; +# }; +# }; properties: clock-frequency: