diff options
author | Sandor Yu <R01008@freescale.com> | 2014-07-01 03:53:23 -0400 |
---|---|---|
committer | Sandor Yu <R01008@freescale.com> | 2014-07-03 04:17:18 -0400 |
commit | fde566fe793ef0ee2ccc236e975ecd4d26ce1b51 (patch) | |
tree | 69620a36c9c8c1eef26424b0cef66f30e2ce2df4 /arch | |
parent | 6193c09144f928d72b0474be28865489bb550cfe (diff) |
ENGR00317086-4 dts: Enable dcic driver for imx6q/dl
Enable dcic driver for imx6q/dl SabreSD and SabreAI
Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit eec9deb496b20e9dba0de071da9fdfdf779895b3)
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 10 |
3 files changed, 34 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 3bf2b4684cf6..881020601553 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | |||
@@ -628,6 +628,18 @@ | |||
628 | }; | 628 | }; |
629 | }; | 629 | }; |
630 | 630 | ||
631 | &dcic1 { | ||
632 | dcic_id = <0>; | ||
633 | dcic_mux = "dcic-hdmi"; | ||
634 | status = "okay"; | ||
635 | }; | ||
636 | |||
637 | &dcic2 { | ||
638 | dcic_id = <1>; | ||
639 | dcic_mux = "dcic-lvds0"; | ||
640 | status = "okay"; | ||
641 | }; | ||
642 | |||
631 | &mlb { | 643 | &mlb { |
632 | pinctrl-names = "default"; | 644 | pinctrl-names = "default"; |
633 | pinctrl-0 = <&pinctrl_mlb_2>; | 645 | pinctrl-0 = <&pinctrl_mlb_2>; |
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index a96d8302661f..b448a7d38e0a 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi | |||
@@ -567,6 +567,18 @@ | |||
567 | status = "okay"; | 567 | status = "okay"; |
568 | }; | 568 | }; |
569 | 569 | ||
570 | &dcic1 { | ||
571 | dcic_id = <0>; | ||
572 | dcic_mux = "dcic-hdmi"; | ||
573 | status = "okay"; | ||
574 | }; | ||
575 | |||
576 | &dcic2 { | ||
577 | dcic_id = <1>; | ||
578 | dcic_mux = "dcic-lvds1"; | ||
579 | status = "okay"; | ||
580 | }; | ||
581 | |||
570 | &pcie { | 582 | &pcie { |
571 | power-on-gpio = <&gpio3 19 0>; | 583 | power-on-gpio = <&gpio3 19 0>; |
572 | reset-gpio = <&gpio7 12 0>; | 584 | reset-gpio = <&gpio7 12 0>; |
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 2e5793435189..605061ec10b8 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi | |||
@@ -711,13 +711,23 @@ | |||
711 | }; | 711 | }; |
712 | 712 | ||
713 | dcic1: dcic@020e4000 { | 713 | dcic1: dcic@020e4000 { |
714 | compatible = "fsl,imx6q-dcic"; | ||
714 | reg = <0x020e4000 0x4000>; | 715 | reg = <0x020e4000 0x4000>; |
715 | interrupts = <0 124 0x04>; | 716 | interrupts = <0 124 0x04>; |
717 | clocks = <&clks 231>, <&clks 231>; | ||
718 | clock-names = "dcic", "disp-axi"; | ||
719 | gpr = <&gpr>; | ||
720 | status = "disabled"; | ||
716 | }; | 721 | }; |
717 | 722 | ||
718 | dcic2: dcic@020e8000 { | 723 | dcic2: dcic@020e8000 { |
724 | compatible = "fsl,imx6q-dcic"; | ||
719 | reg = <0x020e8000 0x4000>; | 725 | reg = <0x020e8000 0x4000>; |
720 | interrupts = <0 125 0x04>; | 726 | interrupts = <0 125 0x04>; |
727 | clocks = <&clks 232>, <&clks 232>; | ||
728 | clock-names = "dcic", "disp-axi"; | ||
729 | gpr = <&gpr>; | ||
730 | status = "disabled"; | ||
721 | }; | 731 | }; |
722 | 732 | ||
723 | sdma: sdma@020ec000 { | 733 | sdma: sdma@020ec000 { |