Commit 79a313f5 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Olof Johansson

ARM: sti: dt: adapt DT to fix probe/bind issues in DRM driver

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: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent bc13b233
...@@ -103,48 +103,46 @@ sti-tvout@8d08000 { ...@@ -103,48 +103,46 @@ sti-tvout@8d08000 {
<&clk_s_d0_quadfs 0>, <&clk_s_d0_quadfs 0>,
<&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 0>; <&clk_s_d2_quadfs 0>;
ranges; };
sti-hdmi@8d04000 { sti-hdmi@8d04000 {
compatible = "st,stih407-hdmi"; compatible = "st,stih407-hdmi";
reg = <0x8d04000 0x1000>; reg = <0x8d04000 0x1000>;
reg-names = "hdmi-reg"; reg-names = "hdmi-reg";
interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;
interrupt-names = "irq"; interrupt-names = "irq";
clock-names = "pix", clock-names = "pix",
"tmds", "tmds",
"phy", "phy",
"audio", "audio",
"main_parent", "main_parent",
"aux_parent"; "aux_parent";
clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>, clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>,
<&clk_s_d2_flexgen CLK_TMDS_HDMI>, <&clk_s_d2_flexgen CLK_TMDS_HDMI>,
<&clk_s_d2_flexgen CLK_REF_HDMIPHY>, <&clk_s_d2_flexgen CLK_REF_HDMIPHY>,
<&clk_s_d0_flexgen CLK_PCM_0>, <&clk_s_d0_flexgen CLK_PCM_0>,
<&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 1>; <&clk_s_d2_quadfs 1>;
hdmi,hpd-gpio = <&pio5 3>; hdmi,hpd-gpio = <&pio5 3>;
reset-names = "hdmi"; reset-names = "hdmi";
resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>; resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>;
ddc = <&hdmiddc>; ddc = <&hdmiddc>;
};
};
sti-hda@8d02000 {
sti-hda@8d02000 { compatible = "st,stih407-hda";
compatible = "st,stih407-hda"; reg = <0x8d02000 0x400>, <0x92b0120 0x4>;
reg = <0x8d02000 0x400>, <0x92b0120 0x4>; reg-names = "hda-reg", "video-dacs-ctrl";
reg-names = "hda-reg", "video-dacs-ctrl"; clock-names = "pix",
clock-names = "pix", "hddac",
"hddac", "main_parent",
"main_parent", "aux_parent";
"aux_parent"; clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>,
clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>, <&clk_s_d2_flexgen CLK_HDDAC>,
<&clk_s_d2_flexgen CLK_HDDAC>, <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 1>;
<&clk_s_d2_quadfs 1>;
};
}; };
}; };
}; };
......
...@@ -178,48 +178,46 @@ sti-tvout@8d08000 { ...@@ -178,48 +178,46 @@ sti-tvout@8d08000 {
<&clk_s_d0_quadfs 0>, <&clk_s_d0_quadfs 0>,
<&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 0>; <&clk_s_d2_quadfs 0>;
ranges; };
sti-hdmi@8d04000 { sti-hdmi@8d04000 {
compatible = "st,stih407-hdmi"; compatible = "st,stih407-hdmi";
reg = <0x8d04000 0x1000>; reg = <0x8d04000 0x1000>;
reg-names = "hdmi-reg"; reg-names = "hdmi-reg";
interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;
interrupt-names = "irq"; interrupt-names = "irq";
clock-names = "pix", clock-names = "pix",
"tmds", "tmds",
"phy", "phy",
"audio", "audio",
"main_parent", "main_parent",
"aux_parent"; "aux_parent";
clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>, clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>,
<&clk_s_d2_flexgen CLK_TMDS_HDMI>, <&clk_s_d2_flexgen CLK_TMDS_HDMI>,
<&clk_s_d2_flexgen CLK_REF_HDMIPHY>, <&clk_s_d2_flexgen CLK_REF_HDMIPHY>,
<&clk_s_d0_flexgen CLK_PCM_0>, <&clk_s_d0_flexgen CLK_PCM_0>,
<&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 1>; <&clk_s_d2_quadfs 1>;
hdmi,hpd-gpio = <&pio5 3>; hdmi,hpd-gpio = <&pio5 3>;
reset-names = "hdmi"; reset-names = "hdmi";
resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>; resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>;
ddc = <&hdmiddc>; ddc = <&hdmiddc>;
};
};
sti-hda@8d02000 {
sti-hda@8d02000 { compatible = "st,stih407-hda";
compatible = "st,stih407-hda"; reg = <0x8d02000 0x400>, <0x92b0120 0x4>;
reg = <0x8d02000 0x400>, <0x92b0120 0x4>; reg-names = "hda-reg", "video-dacs-ctrl";
reg-names = "hda-reg", "video-dacs-ctrl"; clock-names = "pix",
clock-names = "pix", "hddac",
"hddac", "main_parent",
"main_parent", "aux_parent";
"aux_parent"; clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>,
clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>, <&clk_s_d2_flexgen CLK_HDDAC>,
<&clk_s_d2_flexgen CLK_HDDAC>, <&clk_s_d2_quadfs 0>,
<&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 1>;
<&clk_s_d2_quadfs 1>;
};
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment