diff options
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts | 3 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mq.dtsi | 7 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi | 9 |
3 files changed, 6 insertions, 13 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts index 4442b49395e2..56faed262c81 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts @@ -21,8 +21,9 @@ }; &hdmi { + compatible = "cdn,imx8mq-hdmi"; + lane-mapping = <0xe4>; status = "okay"; - port@1 { hdmi_in: endpoint { remote-endpoint = <&dcss_out>; diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index d393c3cf84e0..99eceefb2d6c 100755 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -1168,14 +1168,11 @@ ranges = <0x32c00000 0x32c00000 0x400000>; hdmi: hdmi@32c00000 { - compatible = "cdn,imx8mq-hdmi"; - reg = <0x32c00000 0x100000>; - + reg = <0x32c00000 0x100000>, + <0x32e40000 0x40000>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "plug_in", "plug_out"; - - lane-mapping = <0xe4>; }; irqsteer: interrupt-controller@32e2d000 { diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi index 9656e3d6a8f3..46343b623399 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi @@ -30,11 +30,6 @@ power-domains = <&pd IMX_SC_R_HDMI>; }; - hdmi_csr: hdmi_csr@56261000 { - compatible = "syscon"; - reg = <0x56261000 0x1000>; - }; - hdmi_lpcg_i2c0: clock-controller@56263000 { compatible = "fsl,imx8qxp-lpcg"; reg = <0x56263000 0x4>; @@ -166,11 +161,11 @@ hdmi:hdmi@56268000 { #address-cells = <1>; #size-cells = <0>; - reg = <0x56268000 0x1000>; + reg = <0x56268000 0x1000>, + <0x56261000 0x1000>; interrupt-parent = <&irqsteer_hdmi>; interrupts = <10>, <13>; interrupt-names = "plug_in", "plug_out"; - csr = <&hdmi_csr>; status = "disabled"; clocks = <&clk IMX_SC_R_HDMI_PLL_0 IMX_SC_PM_CLK_PLL>, |