Merge branch 'pm-cpufreq'

[cascardo/linux.git] / arch / arm / boot / dts / bcm958625hr.dts

diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index 03b8bbe..4420025 100644 (file)
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -33,6 +33,7 @@
 /dts-v1/;
 
 #include "bcm-nsp.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "NorthStar Plus SVK (BCM958625HR)";
@@ -47,7 +48,14 @@
        };
 
        memory {
-               reg = <0x60000000 0x20000000>;
+               device_type = "memory";
+               reg = <0x60000000 0x80000000>;
+       };
+
+       gpio-restart {
+               compatible = "gpio-restart";
+               gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;
+               priority = <200>;
        };
 };
 
@@ -109,3 +117,64 @@
                groups = "nand_grp";
        };
 };
+
+&amac0 {
+       status = "okay";
+};
+
+&srab {
+       compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";
+       status = "okay";
+
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       label = "port0";
+                       reg = <0>;
+               };
+
+               port@1 {
+                       label = "port1";
+                       reg = <1>;
+               };
+
+               port@2 {
+                       label = "port2";
+                       reg = <2>;
+               };
+
+               port@3 {
+                       label = "port3";
+                       reg = <3>;
+               };
+
+               port@4 {
+                       label = "port4";
+                       reg = <4>;
+               };
+
+               port@5 {
+                       ethernet = <&amac0>;
+                       label = "cpu";
+                       reg = <5>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+       };
+};
+
+&sata_phy0 {
+       status = "okay";
+};
+
+&sata_phy1 {
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
+};