drm: sti: adapt DT to fix probe/bind issues in DRM driver
PATCH 1/1 drm: sti: adapt DT to fix probe/bind issues in DRM driver
From: Benjamin Gaignard <[email protected]>
STI drm drivers probe and bind using component framework was incorrect. In addition to drivers fix DT update is needed to make all sub-components become childs of sti-display-subsystem.
---
Hi Arnd, Olof & Kevin,
This patch has its driver counterpart merged in v4.3-rc1.
As missing in v4.3, the display is now broken on STiH07 and STiH410 platforms.
I have only this single patch for v4.3-rc fixes, so can you pick it directly, or I should send a pull-request anyway?
Thanks,
Maxime
--- arch/arm/boot/dts/stih407.dtsi | 82 +++++++++++++++++++++--------------------- arch/arm/boot/dts/stih410.dtsi | 82 +++++++++++++++++++++--------------------- 2 files changed, 80 insertions(+), 84 deletions(-)
arch/arm/boot/dts/stih407.dtsi +40 -42
@@ -103,48 +103,46 @@ <&clk_s_d0_quadfs 0>, <&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 0>; - ranges; - - sti-hdmi at 8d04000 { - compatible = "st,stih407-hdmi"; - reg = <0x8d04000 0x1000>; - reg-names = "hdmi-reg"; - interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>; - interrupt-names = "irq"; - clock-names = "pix", - "tmds", - "phy", - "audio", - "main_parent", - "aux_parent"; - - clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>, - <&clk_s_d2_flexgen CLK_TMDS_HDMI>, - <&clk_s_d2_flexgen CLK_REF_HDMIPHY>, - <&clk_s_d0_flexgen CLK_PCM_0>, - <&clk_s_d2_quadfs 0>, - <&clk_s_d2_quadfs 1>; - - hdmi,hpd-gpio = <&pio5 3>; - reset-names = "hdmi"; - resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>; - ddc = <&hdmiddc>; - - }; - - sti-hda at 8d02000 { - compatible = "st,stih407-hda"; - reg = <0x8d02000 0x400>, <0x92b0120 0x4>; - reg-names = "hda-reg", "video-dacs-ctrl"; - clock-names = "pix", - "hddac", - "main_parent", - "aux_parent"; - clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>, - <&clk_s_d2_flexgen CLK_HDDAC>, - <&clk_s_d2_quadfs 0>, - <&clk_s_d2_quadfs 1>; - }; + }; + + sti-hdmi at 8d04000 { + compatible = "st,stih407-hdmi"; + reg = <0x8d04000 0x1000>; + reg-names = "hdmi-reg"; + interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>; + interrupt-names = "irq"; + clock-names = "pix", + "tmds", + "phy", + "audio", + "main_parent", + "aux_parent"; + + clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>, + <&clk_s_d2_flexgen CLK_TMDS_HDMI>, + <&clk_s_d2_flexgen CLK_REF_HDMIPHY>, + <&clk_s_d0_flexgen CLK_PCM_0>, + <&clk_s_d2_quadfs 0>, + <&clk_s_d2_quadfs 1>; + + hdmi,hpd-gpio = <&pio5 3>; + reset-names = "hdmi"; + resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>; + ddc = <&hdmiddc>; + }; + + sti-hda at 8d02000 { + compatible = "st,stih407-hda"; + reg = <0x8d02000 0x400>, <0x92b0120 0x4>; + reg-names = "hda-reg", "video-dacs-ctrl"; + clock-names = "pix", + "hddac", + "main_parent", + "aux_parent"; + clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>, + <&clk_s_d2_flexgen CLK_HDDAC>, + <&clk_s_d2_quadfs 0>, + <&clk_s_d2_quadfs 1>; }; }; };
arch/arm/boot/dts/stih410.dtsi +40 -42
88 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 1/1 drm: sti: adapt DT to fix probe/bind issues in DRM driver
Quoted 8 lines · Maxime Coquelin
From: Benjamin Gaignard <[email protected]>
STI drm drivers probe and bind using component framework was incorrect. In addition to drivers fix DT update is needed to make all sub-components become childs of sti-display-subsystem.
Signed-off-by Benjamin Gaignard <[email protected]>Signed-off-by Maxime Coquelin <[email protected]>
Quoted 8 lines
---
Hi Arnd, Olof & Kevin,This patch has its driver counterpart merged in v4.3-rc1.
As missing in v4.3, the display is now broken on STiH07 and STiH410 platforms.I have only this single patch for v4.3-rc fixes, so can you pick it directly, or I should send a pull-request anyway?
Applied directly, since I had to fixup the patch subject. Thanks!
-Olof
PATCH 1/1 drm: sti: adapt DT to fix probe/bind issues in DRM driver
Quoted 12 lines · Olof Johansson
Quoted 11 lines · Maxime Coquelin
From: Benjamin Gaignard <[email protected]>
STI drm drivers probe and bind using component framework was incorrect. In addition to drivers fix DT update is needed to make all sub-components become childs of sti-display-subsystem.
Signed-off-by Benjamin Gaignard <[email protected]>Signed-off-by Maxime Coquelin <[email protected]>---
Hi Arnd, Olof & Kevin,
Quoted 6 lines
Quoted 5 lines
This patch has its driver counterpart merged in v4.3-rc1.
As missing in v4.3, the display is now broken on STiH07 and STiH410 platforms.I have only this single patch for v4.3-rc fixes, so can you pick it directly, or I should send a pull-request anyway?
Applied directly, since I had to fixup the patch subject. Thanks!
Thanks Olof for fixing the title, I missed it during the review.
Regards,
Maxime