Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / arch / arm / boot / dts / am33xx.dtsi

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index f1eea4af40eda05916dfa73ad8ffc48627d490a2..4a4e02d0ce9e408b16b3c1bb57222fad963a2766 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -147,9 +147,6 @@
                                <0x44e10f90 0x40>;
                        interrupts = <12 13 14>;
                        #dma-cells = <1>;
-                       dma-channels = <64>;
-                       ti,edma-regions = <4>;
-                       ti,edma-slots = <256>;
                };
 
                gpio0: gpio@44e07000 {
@@ -690,6 +687,7 @@
                         */
                        interrupts = <40 41 42 43>;
                        ranges;
+                       status = "disabled";
 
                        davinci_mdio: mdio@4a101000 {
                                compatible = "ti,davinci_mdio";
@@ -698,6 +696,7 @@
                                ti,hwmods = "davinci_mdio";
                                bus_freq = <1000000>;
                                reg = <0x4a101000 0x100>;
+                               status = "disabled";
                        };
 
                        cpsw_emac0: slave@4a100200 {