aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6qdl.dtsi
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-07-11 01:58:36 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-22 11:29:11 -0400
commitc56009b2f6134e5943a03cf26e4d7fce9745d56b (patch)
treebd792350bb8bea866bf45c36ec18df64e8c9b5d2 /arch/arm/boot/dts/imx6qdl.dtsi
parent51056d9cff64ba1347a20476c840e943576f0283 (diff)
ARM: dts: imx: share pad macro names between imx6q and imx6dl
The imx6q and imx6dl are two pin-to-pin compatible SoCs. The same board design can work with either chip plugged into the socket, e.g. sabresd and sabreauto boards. We currently define pin groups in imx6q.dtsi and imx6dl.dtsi respectively because the pad macro names are different between two chips. This brings a maintenance burden on having the same label point to the same pin group defined in two places. The patch replaces prefix MX6Q_ and MX6DL_ with MX6QDL_ for both SoCs pad macro names. Then the pin groups becomes completely common between imx6q and imx6dl and can just be moved into imx6qdl.dtsi, so that the long term maintenance of imx6q/dt pin settings becomes easier. Unfortunately, the change brings some dramatic diff stat, but it's all about DTS file, and the ultimate net diff stat is good. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi374
1 files changed, 374 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 98ab31ce71fd..15af09e9dc8b 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -565,6 +565,380 @@
565 reg = <0x020e0000 0x38>; 565 reg = <0x020e0000 0x38>;
566 }; 566 };
567 567
568 iomuxc: iomuxc@020e0000 {
569 compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc";
570 reg = <0x020e0000 0x4000>;
571
572 audmux {
573 pinctrl_audmux_1: audmux-1 {
574 fsl,pins = <
575 MX6QDL_PAD_SD2_DAT0__AUD4_RXD 0x80000000
576 MX6QDL_PAD_SD2_DAT3__AUD4_TXC 0x80000000
577 MX6QDL_PAD_SD2_DAT2__AUD4_TXD 0x80000000
578 MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x80000000
579 >;
580 };
581
582 pinctrl_audmux_2: audmux-2 {
583 fsl,pins = <
584 MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000
585 MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000
586 MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000
587 MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
588 >;
589 };
590 };
591
592 ecspi1 {
593 pinctrl_ecspi1_1: ecspi1grp-1 {
594 fsl,pins = <
595 MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
596 MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
597 MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
598 >;
599 };
600
601 pinctrl_ecspi1_2: ecspi1grp-2 {
602 fsl,pins = <
603 MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
604 MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1
605 MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1
606 >;
607 };
608 };
609
610 ecspi3 {
611 pinctrl_ecspi3_1: ecspi3grp-1 {
612 fsl,pins = <
613 MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1
614 MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1
615 MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
616 >;
617 };
618 };
619
620 enet {
621 pinctrl_enet_1: enetgrp-1 {
622 fsl,pins = <
623 MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
624 MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
625 MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
626 MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
627 MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
628 MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
629 MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
630 MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
631 MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
632 MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
633 MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
634 MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
635 MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
636 MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
637 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
638 MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
639 >;
640 };
641
642 pinctrl_enet_2: enetgrp-2 {
643 fsl,pins = <
644 MX6QDL_PAD_KEY_COL1__ENET_MDIO 0x1b0b0
645 MX6QDL_PAD_KEY_COL2__ENET_MDC 0x1b0b0
646 MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
647 MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
648 MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
649 MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
650 MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
651 MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
652 MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
653 MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
654 MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
655 MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
656 MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
657 MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
658 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
659 >;
660 };
661
662 pinctrl_enet_3: enetgrp-3 {
663 fsl,pins = <
664 MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
665 MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
666 MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
667 MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
668 MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
669 MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
670 MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
671 MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
672 MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
673 MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
674 MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
675 MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
676 MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
677 MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
678 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
679 MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
680 >;
681 };
682 };
683
684 gpmi-nand {
685 pinctrl_gpmi_nand_1: gpmi-nand-1 {
686 fsl,pins = <
687 MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
688 MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
689 MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
690 MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
691 MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
692 MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
693 MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
694 MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
695 MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
696 MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
697 MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
698 MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
699 MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
700 MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
701 MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
702 MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
703 MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
704 >;
705 };
706 };
707
708 i2c1 {
709 pinctrl_i2c1_1: i2c1grp-1 {
710 fsl,pins = <
711 MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
712 MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
713 >;
714 };
715
716 pinctrl_i2c1_2: i2c1grp-2 {
717 fsl,pins = <
718 MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
719 MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
720 >;
721 };
722 };
723
724 i2c2 {
725 pinctrl_i2c2_1: i2c2grp-1 {
726 fsl,pins = <
727 MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
728 MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
729 >;
730 };
731
732 pinctrl_i2c2_2: i2c2grp-2 {
733 fsl,pins = <
734 MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
735 MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
736 >;
737 };
738 };
739
740 i2c3 {
741 pinctrl_i2c3_1: i2c3grp-1 {
742 fsl,pins = <
743 MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
744 MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
745 >;
746 };
747 };
748
749 uart1 {
750 pinctrl_uart1_1: uart1grp-1 {
751 fsl,pins = <
752 MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
753 MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
754 >;
755 };
756 };
757
758 uart2 {
759 pinctrl_uart2_1: uart2grp-1 {
760 fsl,pins = <
761 MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
762 MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
763 >;
764 };
765
766 pinctrl_uart2_2: uart2grp-2 { /* DTE mode */
767 fsl,pins = <
768 MX6QDL_PAD_EIM_D26__UART2_RX_DATA 0x1b0b1
769 MX6QDL_PAD_EIM_D27__UART2_TX_DATA 0x1b0b1
770 MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B 0x1b0b1
771 MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B 0x1b0b1
772 >;
773 };
774 };
775
776 uart4 {
777 pinctrl_uart4_1: uart4grp-1 {
778 fsl,pins = <
779 MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
780 MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
781 >;
782 };
783 };
784
785 usbotg {
786 pinctrl_usbotg_1: usbotggrp-1 {
787 fsl,pins = <
788 MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
789 >;
790 };
791
792 pinctrl_usbotg_2: usbotggrp-2 {
793 fsl,pins = <
794 MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
795 >;
796 };
797 };
798
799 usdhc2 {
800 pinctrl_usdhc2_1: usdhc2grp-1 {
801 fsl,pins = <
802 MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
803 MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
804 MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
805 MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
806 MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
807 MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
808 MX6QDL_PAD_NANDF_D4__SD2_DATA4 0x17059
809 MX6QDL_PAD_NANDF_D5__SD2_DATA5 0x17059
810 MX6QDL_PAD_NANDF_D6__SD2_DATA6 0x17059
811 MX6QDL_PAD_NANDF_D7__SD2_DATA7 0x17059
812 >;
813 };
814
815 pinctrl_usdhc2_2: usdhc2grp-2 {
816 fsl,pins = <
817 MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
818 MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
819 MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
820 MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
821 MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
822 MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
823 >;
824 };
825 };
826
827 usdhc3 {
828 pinctrl_usdhc3_1: usdhc3grp-1 {
829 fsl,pins = <
830 MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
831 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
832 MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
833 MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
834 MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
835 MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
836 MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
837 MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
838 MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
839 MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
840 >;
841 };
842
843 pinctrl_usdhc3_2: usdhc3grp-2 {
844 fsl,pins = <
845 MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
846 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
847 MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
848 MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
849 MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
850 MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
851 >;
852 };
853 };
854
855 usdhc4 {
856 pinctrl_usdhc4_1: usdhc4grp-1 {
857 fsl,pins = <
858 MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
859 MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
860 MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
861 MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
862 MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
863 MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
864 MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
865 MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
866 MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
867 MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
868 >;
869 };
870
871 pinctrl_usdhc4_2: usdhc4grp-2 {
872 fsl,pins = <
873 MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
874 MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
875 MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
876 MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
877 MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
878 MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
879 >;
880 };
881 };
882
883 weim {
884 pinctrl_weim_cs0_1: weim_cs0grp-1 {
885 fsl,pins = <
886 MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0b1
887 >;
888 };
889
890 pinctrl_weim_nor_1: weim_norgrp-1 {
891 fsl,pins = <
892 MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0b1
893 MX6QDL_PAD_EIM_RW__EIM_RW 0xb0b1
894 MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb060
895 /* data */
896 MX6QDL_PAD_EIM_D16__EIM_DATA16 0x1b0b0
897 MX6QDL_PAD_EIM_D17__EIM_DATA17 0x1b0b0
898 MX6QDL_PAD_EIM_D18__EIM_DATA18 0x1b0b0
899 MX6QDL_PAD_EIM_D19__EIM_DATA19 0x1b0b0
900 MX6QDL_PAD_EIM_D20__EIM_DATA20 0x1b0b0
901 MX6QDL_PAD_EIM_D21__EIM_DATA21 0x1b0b0
902 MX6QDL_PAD_EIM_D22__EIM_DATA22 0x1b0b0
903 MX6QDL_PAD_EIM_D23__EIM_DATA23 0x1b0b0
904 MX6QDL_PAD_EIM_D24__EIM_DATA24 0x1b0b0
905 MX6QDL_PAD_EIM_D25__EIM_DATA25 0x1b0b0
906 MX6QDL_PAD_EIM_D26__EIM_DATA26 0x1b0b0
907 MX6QDL_PAD_EIM_D27__EIM_DATA27 0x1b0b0
908 MX6QDL_PAD_EIM_D28__EIM_DATA28 0x1b0b0
909 MX6QDL_PAD_EIM_D29__EIM_DATA29 0x1b0b0
910 MX6QDL_PAD_EIM_D30__EIM_DATA30 0x1b0b0
911 MX6QDL_PAD_EIM_D31__EIM_DATA31 0x1b0b0
912 /* address */
913 MX6QDL_PAD_EIM_A23__EIM_ADDR23 0xb0b1
914 MX6QDL_PAD_EIM_A22__EIM_ADDR22 0xb0b1
915 MX6QDL_PAD_EIM_A21__EIM_ADDR21 0xb0b1
916 MX6QDL_PAD_EIM_A20__EIM_ADDR20 0xb0b1
917 MX6QDL_PAD_EIM_A19__EIM_ADDR19 0xb0b1
918 MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0b1
919 MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0b1
920 MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0b1
921 MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0b1
922 MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0b1
923 MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0b1
924 MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0b1
925 MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0b1
926 MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0b1
927 MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0b1
928 MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0b1
929 MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0b1
930 MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0b1
931 MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0b1
932 MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0b1
933 MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0b1
934 MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0b1
935 MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0b1
936 MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0b1
937 >;
938 };
939 };
940 };
941
568 ldb: ldb@020e0008 { 942 ldb: ldb@020e0008 {
569 #address-cells = <1>; 943 #address-cells = <1>;
570 #size-cells = <0>; 944 #size-cells = <0>;