MLK-10232-3: dts: Add vadc to generic pm domain

-Add vadc to generic pm domain
-Add vadc clk to dispmix management

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit 9c3199fa95d0b219234b511c364f6a9d4aec75cd)

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 051ed8ad86952bd5cabdd27dcab65e6421d7bad1..91b3227ceeb047548f30a8fb9f2d005564766ce3 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -819,7 +819,8 @@
                                clocks = <&clks IMX6SX_CLK_GPU>, <&clks IMX6SX_CLK_IPG>,
                                        <&clks IMX6SX_CLK_PXP_AXI>, <&clks IMX6SX_CLK_DISPLAY_AXI>,
                                        <&clks IMX6SX_CLK_LCDIF1_PIX>, <&clks IMX6SX_CLK_LCDIF_APB>,
-                                       <&clks IMX6SX_CLK_LCDIF2_PIX>, <&clks IMX6SX_CLK_CSI>;
+                                       <&clks IMX6SX_CLK_LCDIF2_PIX>, <&clks IMX6SX_CLK_CSI>,
+                                       <&clks IMX6SX_CLK_VADC>;
                                clock-names = "gpu3d_core", "ipg", "pxp_axi", "disp_axi", "lcdif1_pix",
                                                "lcdif_axi", "lcdif2_pix", "csi_mclk";
                                pcie-phy-supply = <&reg_pcie_phy>;
@@ -1336,6 +1337,7 @@
                                        clocks = <&clks IMX6SX_CLK_VADC>,
                                                 <&clks IMX6SX_CLK_CSI>;
                                        clock-names = "vadc", "csi";
+                                       power-domains = <&gpc 2>;
                                        gpr = <&gpr>;
                                        status = "disabled";
                                };