Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / at91sam9263.dtsi

diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index fce301c..111889b 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -762,7 +762,7 @@
                        };
 
                        dbgu: serial@ffffee00 {
-                               compatible = "atmel,at91sam9260-usart";
+                               compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
                                reg = <0xffffee00 0x200>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
@@ -845,7 +845,7 @@
                        };
 
                        macb0: ethernet@fffbc000 {
-                               compatible = "cdns,at32ap7000-macb", "cdns,macb";
+                               compatible = "cdns,at91sam9260-macb", "cdns,macb";
                                reg = <0xfffbc000 0x100>;
                                interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";