Merge tag 'soc-dt-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[platform/kernel/linux-rpi.git] / arch / arm / boot / dts / nxp / imx / imx6sx.dtsi

diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
index a05069d..f6b3592 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
@@ -221,7 +221,7 @@
                        clocks = <&clks IMX6SX_CLK_APBH_DMA>;
                };
 
-               gpmi: nand-controller@1806000{
+               gpmi: nand-controller@1806000 {
                        compatible = "fsl,imx6sx-gpmi-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -1311,6 +1311,10 @@
                                                 <&clks IMX6SX_CLK_LCDIF_APB>,
                                                 <&clks IMX6SX_CLK_DISPLAY_AXI>;
                                        clock-names = "pix", "axi", "disp_axi";
+                                       assigned-clocks = <&clks IMX6SX_CLK_LCDIF1_PRE_SEL>,
+                                                         <&clks IMX6SX_CLK_LCDIF1_SEL>;
+                                       assigned-clock-parents = <&clks IMX6SX_CLK_PLL5_VIDEO_DIV>,
+                                                                <&clks IMX6SX_CLK_LCDIF1_PODF>;
                                        power-domains = <&pd_disp>;
                                        status = "disabled";