aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorFancy Fang <chen.fang@freescale.com>2014-05-07 23:33:45 -0400
committerFancy Fang <chen.fang@freescale.com>2014-06-26 21:56:29 -0400
commit28e18731417fd62e44d2f756c9fc9a5cd3e92a15 (patch)
tree259273247bd301623a925db0746fa009e7f6b3aa /arch/arm/boot
parent8bd1eb3574d1b9871f6bca0ee4ed997c848d8a4d (diff)
ENGR00320185-1 IMX6SX/DISPMIX: add dispmix on/off support for 6SX platform
Add the required clocks for the dispmix on/off operation. This include clocks definition and initialization. Signed-off-by: Fancy Fang <chen.fang@freescale.com> (cherry picked from commit 638acb3c30b135901631e59c9938e06422cc4b76)
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 502e4820225a..71f58da72003 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -553,8 +553,12 @@
553 compatible = "fsl,imx6q-gpc"; 553 compatible = "fsl,imx6q-gpc";
554 reg = <0x020dc000 0x4000>; 554 reg = <0x020dc000 0x4000>;
555 interrupts = <0 89 0x04>; 555 interrupts = <0 89 0x04>;
556 clocks = <&clks IMX6SX_CLK_GPU>, <&clks IMX6SX_CLK_IPG>; 556 clocks = <&clks IMX6SX_CLK_GPU>, <&clks IMX6SX_CLK_IPG>,
557 clock-names = "gpu3d_core", "ipg"; 557 <&clks IMX6SX_CLK_PXP_AXI>, <&clks IMX6SX_CLK_DISPLAY_AXI>,
558 <&clks IMX6SX_CLK_LCDIF1_PIX>, <&clks IMX6SX_CLK_LCDIF_APB>,
559 <&clks IMX6SX_CLK_LCDIF2_PIX>, <&clks IMX6SX_CLK_CSI>;
560 clock-names = "gpu3d_core", "ipg", "pxp_axi", "disp_axi", "lcdif1_pix",
561 "lcdif_axi", "lcdif2_pix", "csi_mclk";
558 pu-supply = <&pu_dummy>; 562 pu-supply = <&pu_dummy>;
559 pcie-supply = <&reg_pcie>; 563 pcie-supply = <&reg_pcie>;
560 fsl,mf-mix-wakeup-irq = <0x7c00000 0x3d00 0x0 0x400200>; 564 fsl,mf-mix-wakeup-irq = <0x7c00000 0x3d00 0x0 0x400200>;