aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/imx23.dtsi15
-rw-r--r--arch/arm/boot/dts/imx28.dtsi46
2 files changed, 24 insertions, 37 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 587ceef81e45..1e528dbb7323 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -76,23 +76,21 @@
76 #size-cells = <1>; 76 #size-cells = <1>;
77 reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>; 77 reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
78 reg-names = "gpmi-nand", "bch"; 78 reg-names = "gpmi-nand", "bch";
79 interrupts = <13>, <56>; 79 interrupts = <56>;
80 interrupt-names = "gpmi-dma", "bch"; 80 interrupt-names = "bch";
81 clocks = <&clks 34>; 81 clocks = <&clks 34>;
82 clock-names = "gpmi_io"; 82 clock-names = "gpmi_io";
83 dmas = <&dma_apbh 4>; 83 dmas = <&dma_apbh 4>;
84 dma-names = "rx-tx"; 84 dma-names = "rx-tx";
85 fsl,gpmi-dma-channel = <4>;
86 status = "disabled"; 85 status = "disabled";
87 }; 86 };
88 87
89 ssp0: ssp@80010000 { 88 ssp0: ssp@80010000 {
90 reg = <0x80010000 0x2000>; 89 reg = <0x80010000 0x2000>;
91 interrupts = <15 14>; 90 interrupts = <15>;
92 clocks = <&clks 33>; 91 clocks = <&clks 33>;
93 dmas = <&dma_apbh 1>; 92 dmas = <&dma_apbh 1>;
94 dma-names = "rx-tx"; 93 dma-names = "rx-tx";
95 fsl,ssp-dma-channel = <1>;
96 status = "disabled"; 94 status = "disabled";
97 }; 95 };
98 96
@@ -366,11 +364,10 @@
366 364
367 ssp1: ssp@80034000 { 365 ssp1: ssp@80034000 {
368 reg = <0x80034000 0x2000>; 366 reg = <0x80034000 0x2000>;
369 interrupts = <2 20>; 367 interrupts = <2>;
370 clocks = <&clks 33>; 368 clocks = <&clks 33>;
371 dmas = <&dma_apbh 2>; 369 dmas = <&dma_apbh 2>;
372 dma-names = "rx-tx"; 370 dma-names = "rx-tx";
373 fsl,ssp-dma-channel = <2>;
374 status = "disabled"; 371 status = "disabled";
375 }; 372 };
376 373
@@ -472,7 +469,7 @@
472 auart0: serial@8006c000 { 469 auart0: serial@8006c000 {
473 compatible = "fsl,imx23-auart"; 470 compatible = "fsl,imx23-auart";
474 reg = <0x8006c000 0x2000>; 471 reg = <0x8006c000 0x2000>;
475 interrupts = <24 25 23>; 472 interrupts = <24>;
476 clocks = <&clks 32>; 473 clocks = <&clks 32>;
477 dmas = <&dma_apbx 6>, <&dma_apbx 7>; 474 dmas = <&dma_apbx 6>, <&dma_apbx 7>;
478 dma-names = "rx", "tx"; 475 dma-names = "rx", "tx";
@@ -482,7 +479,7 @@
482 auart1: serial@8006e000 { 479 auart1: serial@8006e000 {
483 compatible = "fsl,imx23-auart"; 480 compatible = "fsl,imx23-auart";
484 reg = <0x8006e000 0x2000>; 481 reg = <0x8006e000 0x2000>;
485 interrupts = <59 60 58>; 482 interrupts = <59>;
486 clocks = <&clks 32>; 483 clocks = <&clks 32>;
487 dmas = <&dma_apbx 8>, <&dma_apbx 9>; 484 dmas = <&dma_apbx 8>, <&dma_apbx 9>;
488 dma-names = "rx", "tx"; 485 dma-names = "rx", "tx";
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 9524a0571281..db67eb683614 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -64,7 +64,7 @@
64 64
65 hsadc@80002000 { 65 hsadc@80002000 {
66 reg = <0x80002000 0x2000>; 66 reg = <0x80002000 0x2000>;
67 interrupts = <13 87>; 67 interrupts = <13>;
68 dmas = <&dma_apbh 12>; 68 dmas = <&dma_apbh 12>;
69 dma-names = "rx"; 69 dma-names = "rx";
70 status = "disabled"; 70 status = "disabled";
@@ -98,13 +98,12 @@
98 #size-cells = <1>; 98 #size-cells = <1>;
99 reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>; 99 reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
100 reg-names = "gpmi-nand", "bch"; 100 reg-names = "gpmi-nand", "bch";
101 interrupts = <88>, <41>; 101 interrupts = <41>;
102 interrupt-names = "gpmi-dma", "bch"; 102 interrupt-names = "bch";
103 clocks = <&clks 50>; 103 clocks = <&clks 50>;
104 clock-names = "gpmi_io"; 104 clock-names = "gpmi_io";
105 dmas = <&dma_apbh 4>; 105 dmas = <&dma_apbh 4>;
106 dma-names = "rx-tx"; 106 dma-names = "rx-tx";
107 fsl,gpmi-dma-channel = <4>;
108 status = "disabled"; 107 status = "disabled";
109 }; 108 };
110 109
@@ -112,11 +111,10 @@
112 #address-cells = <1>; 111 #address-cells = <1>;
113 #size-cells = <0>; 112 #size-cells = <0>;
114 reg = <0x80010000 0x2000>; 113 reg = <0x80010000 0x2000>;
115 interrupts = <96 82>; 114 interrupts = <96>;
116 clocks = <&clks 46>; 115 clocks = <&clks 46>;
117 dmas = <&dma_apbh 0>; 116 dmas = <&dma_apbh 0>;
118 dma-names = "rx-tx"; 117 dma-names = "rx-tx";
119 fsl,ssp-dma-channel = <0>;
120 status = "disabled"; 118 status = "disabled";
121 }; 119 };
122 120
@@ -124,11 +122,10 @@
124 #address-cells = <1>; 122 #address-cells = <1>;
125 #size-cells = <0>; 123 #size-cells = <0>;
126 reg = <0x80012000 0x2000>; 124 reg = <0x80012000 0x2000>;
127 interrupts = <97 83>; 125 interrupts = <97>;
128 clocks = <&clks 47>; 126 clocks = <&clks 47>;
129 dmas = <&dma_apbh 1>; 127 dmas = <&dma_apbh 1>;
130 dma-names = "rx-tx"; 128 dma-names = "rx-tx";
131 fsl,ssp-dma-channel = <1>;
132 status = "disabled"; 129 status = "disabled";
133 }; 130 };
134 131
@@ -136,11 +133,10 @@
136 #address-cells = <1>; 133 #address-cells = <1>;
137 #size-cells = <0>; 134 #size-cells = <0>;
138 reg = <0x80014000 0x2000>; 135 reg = <0x80014000 0x2000>;
139 interrupts = <98 84>; 136 interrupts = <98>;
140 clocks = <&clks 48>; 137 clocks = <&clks 48>;
141 dmas = <&dma_apbh 2>; 138 dmas = <&dma_apbh 2>;
142 dma-names = "rx-tx"; 139 dma-names = "rx-tx";
143 fsl,ssp-dma-channel = <2>;
144 status = "disabled"; 140 status = "disabled";
145 }; 141 };
146 142
@@ -148,11 +144,10 @@
148 #address-cells = <1>; 144 #address-cells = <1>;
149 #size-cells = <0>; 145 #size-cells = <0>;
150 reg = <0x80016000 0x2000>; 146 reg = <0x80016000 0x2000>;
151 interrupts = <99 85>; 147 interrupts = <99>;
152 clocks = <&clks 49>; 148 clocks = <&clks 49>;
153 dmas = <&dma_apbh 3>; 149 dmas = <&dma_apbh 3>;
154 dma-names = "rx-tx"; 150 dma-names = "rx-tx";
155 fsl,ssp-dma-channel = <3>;
156 status = "disabled"; 151 status = "disabled";
157 }; 152 };
158 153
@@ -759,7 +754,7 @@
759 lcdif@80030000 { 754 lcdif@80030000 {
760 compatible = "fsl,imx28-lcdif"; 755 compatible = "fsl,imx28-lcdif";
761 reg = <0x80030000 0x2000>; 756 reg = <0x80030000 0x2000>;
762 interrupts = <38 86>; 757 interrupts = <38>;
763 clocks = <&clks 55>; 758 clocks = <&clks 55>;
764 dmas = <&dma_apbh 13>; 759 dmas = <&dma_apbh 13>;
765 dma-names = "rx"; 760 dma-names = "rx";
@@ -836,12 +831,11 @@
836 saif0: saif@80042000 { 831 saif0: saif@80042000 {
837 compatible = "fsl,imx28-saif"; 832 compatible = "fsl,imx28-saif";
838 reg = <0x80042000 0x2000>; 833 reg = <0x80042000 0x2000>;
839 interrupts = <59 80>; 834 interrupts = <59>;
840 #clock-cells = <0>; 835 #clock-cells = <0>;
841 clocks = <&clks 53>; 836 clocks = <&clks 53>;
842 dmas = <&dma_apbx 4>; 837 dmas = <&dma_apbx 4>;
843 dma-names = "rx-tx"; 838 dma-names = "rx-tx";
844 fsl,saif-dma-channel = <4>;
845 status = "disabled"; 839 status = "disabled";
846 }; 840 };
847 841
@@ -853,11 +847,10 @@
853 saif1: saif@80046000 { 847 saif1: saif@80046000 {
854 compatible = "fsl,imx28-saif"; 848 compatible = "fsl,imx28-saif";
855 reg = <0x80046000 0x2000>; 849 reg = <0x80046000 0x2000>;
856 interrupts = <58 81>; 850 interrupts = <58>;
857 clocks = <&clks 54>; 851 clocks = <&clks 54>;
858 dmas = <&dma_apbx 5>; 852 dmas = <&dma_apbx 5>;
859 dma-names = "rx-tx"; 853 dma-names = "rx-tx";
860 fsl,saif-dma-channel = <5>;
861 status = "disabled"; 854 status = "disabled";
862 }; 855 };
863 856
@@ -871,7 +864,7 @@
871 864
872 spdif@80054000 { 865 spdif@80054000 {
873 reg = <0x80054000 0x2000>; 866 reg = <0x80054000 0x2000>;
874 interrupts = <45 66>; 867 interrupts = <45>;
875 dmas = <&dma_apbx 2>; 868 dmas = <&dma_apbx 2>;
876 dma-names = "tx"; 869 dma-names = "tx";
877 status = "disabled"; 870 status = "disabled";
@@ -888,11 +881,10 @@
888 #size-cells = <0>; 881 #size-cells = <0>;
889 compatible = "fsl,imx28-i2c"; 882 compatible = "fsl,imx28-i2c";
890 reg = <0x80058000 0x2000>; 883 reg = <0x80058000 0x2000>;
891 interrupts = <111 68>; 884 interrupts = <111>;
892 clock-frequency = <100000>; 885 clock-frequency = <100000>;
893 dmas = <&dma_apbx 6>; 886 dmas = <&dma_apbx 6>;
894 dma-names = "rx-tx"; 887 dma-names = "rx-tx";
895 fsl,i2c-dma-channel = <6>;
896 status = "disabled"; 888 status = "disabled";
897 }; 889 };
898 890
@@ -901,11 +893,10 @@
901 #size-cells = <0>; 893 #size-cells = <0>;
902 compatible = "fsl,imx28-i2c"; 894 compatible = "fsl,imx28-i2c";
903 reg = <0x8005a000 0x2000>; 895 reg = <0x8005a000 0x2000>;
904 interrupts = <110 69>; 896 interrupts = <110>;
905 clock-frequency = <100000>; 897 clock-frequency = <100000>;
906 dmas = <&dma_apbx 7>; 898 dmas = <&dma_apbx 7>;
907 dma-names = "rx-tx"; 899 dma-names = "rx-tx";
908 fsl,i2c-dma-channel = <7>;
909 status = "disabled"; 900 status = "disabled";
910 }; 901 };
911 902
@@ -928,10 +919,9 @@
928 auart0: serial@8006a000 { 919 auart0: serial@8006a000 {
929 compatible = "fsl,imx28-auart", "fsl,imx23-auart"; 920 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
930 reg = <0x8006a000 0x2000>; 921 reg = <0x8006a000 0x2000>;
931 interrupts = <112 70 71>; 922 interrupts = <112>;
932 dmas = <&dma_apbx 8>, <&dma_apbx 9>; 923 dmas = <&dma_apbx 8>, <&dma_apbx 9>;
933 dma-names = "rx", "tx"; 924 dma-names = "rx", "tx";
934 fsl,auart-dma-channel = <8 9>;
935 clocks = <&clks 45>; 925 clocks = <&clks 45>;
936 status = "disabled"; 926 status = "disabled";
937 }; 927 };
@@ -939,7 +929,7 @@
939 auart1: serial@8006c000 { 929 auart1: serial@8006c000 {
940 compatible = "fsl,imx28-auart", "fsl,imx23-auart"; 930 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
941 reg = <0x8006c000 0x2000>; 931 reg = <0x8006c000 0x2000>;
942 interrupts = <113 72 73>; 932 interrupts = <113>;
943 dmas = <&dma_apbx 10>, <&dma_apbx 11>; 933 dmas = <&dma_apbx 10>, <&dma_apbx 11>;
944 dma-names = "rx", "tx"; 934 dma-names = "rx", "tx";
945 clocks = <&clks 45>; 935 clocks = <&clks 45>;
@@ -949,7 +939,7 @@
949 auart2: serial@8006e000 { 939 auart2: serial@8006e000 {
950 compatible = "fsl,imx28-auart", "fsl,imx23-auart"; 940 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
951 reg = <0x8006e000 0x2000>; 941 reg = <0x8006e000 0x2000>;
952 interrupts = <114 74 75>; 942 interrupts = <114>;
953 dmas = <&dma_apbx 12>, <&dma_apbx 13>; 943 dmas = <&dma_apbx 12>, <&dma_apbx 13>;
954 dma-names = "rx", "tx"; 944 dma-names = "rx", "tx";
955 clocks = <&clks 45>; 945 clocks = <&clks 45>;
@@ -959,7 +949,7 @@
959 auart3: serial@80070000 { 949 auart3: serial@80070000 {
960 compatible = "fsl,imx28-auart", "fsl,imx23-auart"; 950 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
961 reg = <0x80070000 0x2000>; 951 reg = <0x80070000 0x2000>;
962 interrupts = <115 76 77>; 952 interrupts = <115>;
963 dmas = <&dma_apbx 14>, <&dma_apbx 15>; 953 dmas = <&dma_apbx 14>, <&dma_apbx 15>;
964 dma-names = "rx", "tx"; 954 dma-names = "rx", "tx";
965 clocks = <&clks 45>; 955 clocks = <&clks 45>;
@@ -969,7 +959,7 @@
969 auart4: serial@80072000 { 959 auart4: serial@80072000 {
970 compatible = "fsl,imx28-auart", "fsl,imx23-auart"; 960 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
971 reg = <0x80072000 0x2000>; 961 reg = <0x80072000 0x2000>;
972 interrupts = <116 78 79>; 962 interrupts = <116>;
973 dmas = <&dma_apbx 0>, <&dma_apbx 1>; 963 dmas = <&dma_apbx 0>, <&dma_apbx 1>;
974 dma-names = "rx", "tx"; 964 dma-names = "rx", "tx";
975 clocks = <&clks 45>; 965 clocks = <&clks 45>;