Skip to content

Commit fc67d66

Browse files
aford173storulf
authored andcommitted
dt-bindings: soc: imx: add missing clock and power-domains to imx8mp-hdmi-blk-ctrl
Per guidance from the NXP downstream kernel, if the clock is disabled before HDMI/LCDIF probe, LCDIF will not get pixel clock from HDMI PHY and throw an error: [CRTC:39:crtc-2] vblank wait timed out WARNING: CPU: 2 PID: 9 at drivers/gpu/drm/drm_atomic_helper.c: 1634 drm_atomic_helper_wait_for_vblanks.part.0+0x23c/0x260 Fix this by adding the fdcc clock to the hdmi_blk_ctrl. This should be safe, since neither this power domain nor the dependent HDMI and LCDIF drivers been enabled or added to the SoC device tree yet. According to Sandor Yu from NXP, "the FDCC clock is not for HDMITX in desgin, but it is part of HDMI domain that needed by HDMITX. So I think it is reasonable added it to the power domain driver." The driver also supports two power domains which are missing from the binding that also fix an issue with resuming from suspend. Signed-off-by: Adam Ford <[email protected]> Reviewed-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent 8923149 commit fc67d66

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ properties:
2727
const: 1
2828

2929
power-domains:
30-
minItems: 8
31-
maxItems: 8
30+
minItems: 10
31+
maxItems: 10
3232

3333
power-domain-names:
3434
items:
@@ -40,17 +40,20 @@ properties:
4040
- const: trng
4141
- const: hdmi-tx
4242
- const: hdmi-tx-phy
43+
- const: hdcp
44+
- const: hrv
4345

4446
clocks:
45-
minItems: 4
46-
maxItems: 4
47+
minItems: 5
48+
maxItems: 5
4749

4850
clock-names:
4951
items:
5052
- const: apb
5153
- const: axi
5254
- const: ref_266m
5355
- const: ref_24m
56+
- const: fdcc
5457

5558
interconnects:
5659
maxItems: 3
@@ -82,12 +85,15 @@ examples:
8285
clocks = <&clk IMX8MP_CLK_HDMI_APB>,
8386
<&clk IMX8MP_CLK_HDMI_ROOT>,
8487
<&clk IMX8MP_CLK_HDMI_REF_266M>,
85-
<&clk IMX8MP_CLK_HDMI_24M>;
86-
clock-names = "apb", "axi", "ref_266m", "ref_24m";
88+
<&clk IMX8MP_CLK_HDMI_24M>,
89+
<&clk IMX8MP_CLK_HDMI_FDCC_TST>;
90+
clock-names = "apb", "axi", "ref_266m", "ref_24m", "fdcc";
8791
power-domains = <&pgc_hdmimix>, <&pgc_hdmimix>, <&pgc_hdmimix>,
8892
<&pgc_hdmimix>, <&pgc_hdmimix>, <&pgc_hdmimix>,
89-
<&pgc_hdmimix>, <&pgc_hdmi_phy>;
93+
<&pgc_hdmimix>, <&pgc_hdmi_phy>,
94+
<&pgc_hdmimix>, <&pgc_hdmimix>;
9095
power-domain-names = "bus", "irqsteer", "lcdif", "pai", "pvi", "trng",
91-
"hdmi-tx", "hdmi-tx-phy";
96+
"hdmi-tx", "hdmi-tx-phy",
97+
"hdcp", "hrv";
9298
#power-domain-cells = <1>;
9399
};

0 commit comments

Comments
 (0)