aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2014-03-20 08:35:25 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:58:06 -0400
commit2b7f6d73d8d4684ed02a10bbfc2a82c0e6f0fa7e (patch)
tree2fa8864c59d0156d4317faa97bc99e0098a6c14f /arch/arm/boot
parentc561c9c0d1b4e103853a2e685c01a8611d96b873 (diff)
ENGR00300658-5 ARM: dts: imx6sx: Add clock device node
on imx6sx need to enable display_axi, dcic and csi clock. display_axi, dcic is not needed on imx6sl. Signed-off-by: Robby Cai <R63905@freescale.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6sl.dtsi4
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi8
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 6309af99342d..cbabd8cc3c53 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -642,6 +642,10 @@
642 compatible = "fsl,imx6sl-csi"; 642 compatible = "fsl,imx6sl-csi";
643 reg = <0x020e4000 0x4000>; 643 reg = <0x020e4000 0x4000>;
644 interrupts = <0 7 0x04>; 644 interrupts = <0 7 0x04>;
645 clocks = <&clks IMX6SL_CLK_DUMMY>,
646 <&clks IMX6SL_CLK_DUMMY>,
647 <&clks IMX6SL_CLK_DUMMY>;
648 clock-names = "disp-axi", "csi_mclk", "dcic";
645 status = "disabled"; 649 status = "disabled";
646 }; 650 };
647 651
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 7d4b734914a3..bb6b48eacaf4 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -876,6 +876,10 @@
876 compatible = "fsl,imx6sx-csi", "fsl,imx6sl-csi"; 876 compatible = "fsl,imx6sx-csi", "fsl,imx6sl-csi";
877 reg = <0x02214000 0x4000>; 877 reg = <0x02214000 0x4000>;
878 interrupts = <0 7 0x04>; 878 interrupts = <0 7 0x04>;
879 clocks = <&clks IMX6SX_CLK_DISPLAY_AXI>,
880 <&clks IMX6SX_CLK_CSI>,
881 <&clks IMX6SX_CLK_DCIC1>;
882 clock-names = "disp-axi", "csi_mclk", "dcic";
879 status = "disabled"; 883 status = "disabled";
880 }; 884 };
881 885
@@ -883,6 +887,10 @@
883 compatible = "fsl,imx6sx-csi", "fsl,imx6sl-csi"; 887 compatible = "fsl,imx6sx-csi", "fsl,imx6sl-csi";
884 reg = <0x0221c000 0x4000>; 888 reg = <0x0221c000 0x4000>;
885 interrupts = <0 41 0x04>; 889 interrupts = <0 41 0x04>;
890 clocks = <&clks IMX6SX_CLK_DISPLAY_AXI>,
891 <&clks IMX6SX_CLK_CSI>,
892 <&clks IMX6SX_CLK_DCIC2>;
893 clock-names = "disp-axi", "csi_mclk", "dcic";
886 status = "disabled"; 894 status = "disabled";
887 }; 895 };
888 896