Skip to content
Snippets Groups Projects
Verified Commit 19c064fb authored by minute's avatar minute
Browse files

imx8mp: fix hdmi in 6.8

parent 0b281f0b
No related branches found
No related tags found
1 merge request!38imx8mp: fix hdmi in 6.8
Pipeline #2119 failed
...@@ -21,7 +21,7 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de> ...@@ -21,7 +21,7 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+ +
+ irqsteer_hdmi: interrupt-controller@32fc2000 { + irqsteer_hdmi: interrupt-controller@32fc2000 {
+ compatible = "fsl,imx-irqsteer"; + compatible = "fsl,imx-irqsteer";
+ reg = <0x32fc2000 0x44>; + reg = <0x32fc2000 0x1000>;
+ interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-controller; + interrupt-controller;
+ #interrupt-cells = <1>; + #interrupt-cells = <1>;
...@@ -32,5 +32,5 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de> ...@@ -32,5 +32,5 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+ power-domains = <&hdmi_blk_ctrl IMX8MP_HDMIBLK_PD_IRQSTEER>; + power-domains = <&hdmi_blk_ctrl IMX8MP_HDMIBLK_PD_IRQSTEER>;
+ }; + };
}; };
aips5: bus@30c00000 { aips5: bus@30c00000 {
...@@ -16,8 +16,8 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de> ...@@ -16,8 +16,8 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
@@ -841,6 +841,23 @@ @@ -841,6 +841,23 @@
<&clk IMX8MP_CLK_MEDIA_APB_ROOT>; <&clk IMX8MP_CLK_MEDIA_APB_ROOT>;
}; };
+ pgc_hdmimix: power-domains@14 { + pgc_hdmimix: power-domain@14 {
+ #power-domain-cells = <0>; + #power-domain-cells = <0>;
+ reg = <IMX8MP_POWER_DOMAIN_HDMIMIX>; + reg = <IMX8MP_POWER_DOMAIN_HDMIMIX>;
+ clocks = <&clk IMX8MP_CLK_HDMI_ROOT>, + clocks = <&clk IMX8MP_CLK_HDMI_ROOT>,
...@@ -37,28 +37,31 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de> ...@@ -37,28 +37,31 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
pgc_mipi_phy2: power-domain@16 { pgc_mipi_phy2: power-domain@16 {
#power-domain-cells = <0>; #power-domain-cells = <0>;
reg = <IMX8MP_POWER_DOMAIN_MIPI_PHY2>; reg = <IMX8MP_POWER_DOMAIN_MIPI_PHY2>;
@@ -1370,6 +1387,24 @@ @@ -1370,4 +1387,25 @@
clock-names = "ipg"; clock-names = "ipg";
power-domains = <&hdmi_blk_ctrl IMX8MP_HDMIBLK_PD_IRQSTEER>; power-domains = <&hdmi_blk_ctrl IMX8MP_HDMIBLK_PD_IRQSTEER>;
}; };
+ +
+ hdmi_blk_ctrl: blk-ctrl@32fc0000 { + hdmi_blk_ctrl: blk-ctrl@32fc0000 {
+ compatible = "fsl,imx8mp-hdmi-blk-ctrl", "syscon"; + compatible = "fsl,imx8mp-hdmi-blk-ctrl", "syscon";
+ reg = <0x32fc0000 0x23c>; + reg = <0x32fc0000 0x1000>;
+ clocks = <&clk IMX8MP_CLK_HDMI_APB>, + clocks = <&clk IMX8MP_CLK_HDMI_APB>,
+ <&clk IMX8MP_CLK_HDMI_ROOT>, + <&clk IMX8MP_CLK_HDMI_ROOT>,
+ <&clk IMX8MP_CLK_HDMI_REF_266M>, + <&clk IMX8MP_CLK_HDMI_REF_266M>,
+ <&clk IMX8MP_CLK_HDMI_24M>; + <&clk IMX8MP_CLK_HDMI_24M>,
+ clock-names = "apb", "axi", "ref_266m", "ref_24m"; + <&clk IMX8MP_CLK_HDMI_FDCC_TST>;
+ clock-names = "apb", "axi", "ref_266m", "ref_24m", "fdcc";
+ power-domains = <&pgc_hdmimix>, <&pgc_hdmimix>, + power-domains = <&pgc_hdmimix>, <&pgc_hdmimix>,
+ <&pgc_hdmimix>, <&pgc_hdmimix>, + <&pgc_hdmimix>, <&pgc_hdmimix>,
+ <&pgc_hdmimix>, <&pgc_hdmimix>, + <&pgc_hdmimix>, <&pgc_hdmimix>,
+ <&pgc_hdmimix>, <&pgc_hdmi_phy>; + <&pgc_hdmimix>, <&pgc_hdmi_phy>,
+ <&pgc_hdmimix>, <&pgc_hdmimix>;
+ power-domain-names = "bus", "irqsteer", "lcdif", + power-domain-names = "bus", "irqsteer", "lcdif",
+ "pai", "pvi", "trng", + "pai", "pvi", "trng",
+ "hdmi-tx", "hdmi-tx-phy"; + "hdmi-tx", "hdmi-tx-phy",
+ "hdcp", "hrv";
+ #power-domain-cells = <1>; + #power-domain-cells = <1>;
+ }; + };
}; };
aips5: bus@30c00000 { aips5: bus@30c00000 {
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment