aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/omap3-beagle-xm.dts4
-rw-r--r--arch/arm/boot/dts/omap3-beagle.dts4
-rw-r--r--arch/arm/boot/dts/omap3-devkit8000.dts16
-rw-r--r--arch/arm/boot/dts/omap3-igep.dtsi1
-rw-r--r--arch/arm/boot/dts/omap3-overo.dtsi4
-rw-r--r--arch/arm/boot/dts/omap3.dtsi5
6 files changed, 20 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 447e714d435b..cba357023878 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -234,3 +234,7 @@
234 regulator-max-microvolt = <1800000>; 234 regulator-max-microvolt = <1800000>;
235 regulator-always-on; 235 regulator-always-on;
236}; 236};
237
238&mcbsp2 {
239 status = "okay";
240};
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 5053766d369b..d01e9a76c5da 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -211,3 +211,7 @@
211 regulator-max-microvolt = <1800000>; 211 regulator-max-microvolt = <1800000>;
212 regulator-always-on; 212 regulator-always-on;
213}; 213};
214
215&mcbsp2 {
216 status = "okay";
217};
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index 4665421bb7bc..bf5a515a3247 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -101,20 +101,8 @@
101 status = "disabled"; 101 status = "disabled";
102}; 102};
103 103
104&mcbsp1 { 104&mcbsp2 {
105 status = "disabled"; 105 status = "okay";
106};
107
108&mcbsp3 {
109 status = "disabled";
110};
111
112&mcbsp4 {
113 status = "disabled";
114};
115
116&mcbsp5 {
117 status = "disabled";
118}; 106};
119 107
120&gpmc { 108&gpmc {
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index c17009323520..b97736d98a64 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -170,6 +170,7 @@
170&mcbsp2 { 170&mcbsp2 {
171 pinctrl-names = "default"; 171 pinctrl-names = "default";
172 pinctrl-0 = <&mcbsp2_pins>; 172 pinctrl-0 = <&mcbsp2_pins>;
173 status = "okay";
173}; 174};
174 175
175&mmc1 { 176&mmc1 {
diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi
index a461d2fd1fb0..b08142f755fd 100644
--- a/arch/arm/boot/dts/omap3-overo.dtsi
+++ b/arch/arm/boot/dts/omap3-overo.dtsi
@@ -95,3 +95,7 @@
95 pinctrl-names = "default"; 95 pinctrl-names = "default";
96 pinctrl-0 = <&uart3_pins>; 96 pinctrl-0 = <&uart3_pins>;
97}; 97};
98
99&mcbsp2 {
100 status = "okay";
101};
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index a5fc83b9c835..1019b628f080 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -436,6 +436,7 @@
436 dmas = <&sdma 31>, 436 dmas = <&sdma 31>,
437 <&sdma 32>; 437 <&sdma 32>;
438 dma-names = "tx", "rx"; 438 dma-names = "tx", "rx";
439 status = "disabled";
439 }; 440 };
440 441
441 mcbsp2: mcbsp@49022000 { 442 mcbsp2: mcbsp@49022000 {
@@ -453,6 +454,7 @@
453 dmas = <&sdma 33>, 454 dmas = <&sdma 33>,
454 <&sdma 34>; 455 <&sdma 34>;
455 dma-names = "tx", "rx"; 456 dma-names = "tx", "rx";
457 status = "disabled";
456 }; 458 };
457 459
458 mcbsp3: mcbsp@49024000 { 460 mcbsp3: mcbsp@49024000 {
@@ -470,6 +472,7 @@
470 dmas = <&sdma 17>, 472 dmas = <&sdma 17>,
471 <&sdma 18>; 473 <&sdma 18>;
472 dma-names = "tx", "rx"; 474 dma-names = "tx", "rx";
475 status = "disabled";
473 }; 476 };
474 477
475 mcbsp4: mcbsp@49026000 { 478 mcbsp4: mcbsp@49026000 {
@@ -485,6 +488,7 @@
485 dmas = <&sdma 19>, 488 dmas = <&sdma 19>,
486 <&sdma 20>; 489 <&sdma 20>;
487 dma-names = "tx", "rx"; 490 dma-names = "tx", "rx";
491 status = "disabled";
488 }; 492 };
489 493
490 mcbsp5: mcbsp@48096000 { 494 mcbsp5: mcbsp@48096000 {
@@ -500,6 +504,7 @@
500 dmas = <&sdma 21>, 504 dmas = <&sdma 21>,
501 <&sdma 22>; 505 <&sdma 22>;
502 dma-names = "tx", "rx"; 506 dma-names = "tx", "rx";
507 status = "disabled";
503 }; 508 };
504 509
505 sham: sham@480c3000 { 510 sham: sham@480c3000 {