Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

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

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index c846fa3..b4d2cc7 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -368,7 +368,7 @@
                };
 
                ccbtimer0: timer@34000 {
-                       compatible = "arm,sp804";
+                       compatible = "arm,sp804", "arm,primecell";
                        reg = <0x34000 0x1000>;
                        interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
@@ -377,7 +377,7 @@
                };
 
                ccbtimer1: timer@35000 {
-                       compatible = "arm,sp804";
+                       compatible = "arm,sp804", "arm,primecell";
                        reg = <0x35000 0x1000>;
                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@@ -385,12 +385,12 @@
                        clock-names = "apb_pclk";
                };
 
-               srab: srab@36000 {
+               srab: ethernet-switch@36000 {
                        compatible = "brcm,nsp-srab";
                        reg = <0x36000 0x1000>,
                              <0x3f308 0x8>,
                              <0x3f410 0xc>;
-                       reg-names = "srab", "mux_config", "sgmii";
+                       reg-names = "srab", "mux_config", "sgmii_config";
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
@@ -420,6 +420,10 @@
                        status = "disabled";
 
                        /* ports are defined in board DTS */
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
                };
 
                i2c0: i2c@38000 {
@@ -438,7 +442,7 @@
                        reg = <0x39000 0x1000>;
                        interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&iprocslow>, <&iprocslow>;
-                       clock-names = "wdogclk", "apb_pclk";
+                       clock-names = "wdog_clk", "apb_pclk";
                };
 
                lcpll0: lcpll0@3f100 {