From b45ec8412cbf3c31c76905ca12ac0be0435c92c0 Mon Sep 17 00:00:00 2001 From: Abel Vesa Date: Thu, 28 May 2020 10:51:36 +0300 Subject: [PATCH] arm64: dts: imx8mp: Make media_blk_ctrl single node for combo driver Remove the clocks property since the clock is taken care of by the mediamix_pd. Signed-off-by: Abel Vesa Reviewed-by: Dong Aisheng Tested-by: Daniel Baluta --- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index bc35be876d14..3f15032c5637 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -1140,7 +1140,7 @@ <&clk IMX8MP_SYS_PLL1_800M>; assigned-clock-rates = <0>, <500000000>, <200000000>; interrupts = ; - blk-ctl = <&mediamix_blk_ctl>; + blk-ctl = <&media_blk_ctrl>; power-domains = <&mediamix_pd>; status = "disabled"; @@ -1190,11 +1190,13 @@ }; }; - mediamix_blk_ctl: blk-ctl@32ec0000 { - compatible = "fsl,imx8mp-mediamix-blk-ctl", - "syscon"; + media_blk_ctrl: media-blk-ctrl@32ec0000 { + compatible = "fsl,imx8mp-media-blk-ctrl", "syscon"; reg = <0x32ec0000 0x10000>; - clocks = <&clk IMX8MP_CLK_MEDIA_APB_ROOT>; + power-domains = <&mediamix_pd>; + + #clock-cells = <1>; + #reset-cells = <1>; }; ldb: ldb@32ec005c { @@ -1205,7 +1207,7 @@ clock-names = "ldb"; assigned-clocks = <&clk IMX8MP_CLK_MEDIA_LDB>; assigned-clock-parents = <&clk IMX8MP_VIDEO_PLL1_OUT>; - gpr = <&mediamix_blk_ctl>; + gpr = <&media_blk_ctrl>; power-domains = <&mediamix_pd>; status = "disabled"; @@ -1248,7 +1250,7 @@ compatible = "fsl,imx8mp-lvds-phy"; #address-cells = <1>; #size-cells = <0>; - gpr = <&mediamix_blk_ctl>; + gpr = <&media_blk_ctrl>; clocks = <&clk IMX8MP_CLK_MEDIA_APB_ROOT>; clock-names = "apb"; status = "disabled"; -- 2.17.1