ARM: dts: NSP: Add and enable amac2

Add and enable the third AMAC ethernet interface in the device trees for
the platforms where it is present.  Also, enable amac1 on some of the
platforms where that was missing.

Signed-off-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 9cd77ab7c3159675f8916f64e3c4aa7c7f180db7..ecffc1629d9393af1b94fb32541574658f3b7a6f 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -227,6 +227,15 @@
                        status = "disabled";
                };
 
+               amac2: ethernet@24000 {
+                       compatible = "brcm,nsp-amac";
+                       reg = <0x024000 0x1000>,
+                             <0x112000 0x1000>;
+                       reg-names = "amac_base", "idm_base";
+                       interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
                nand: nand@26000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x026000 0x600>,

diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts
index 18b8ffb1aa05cc1a3a8e7adaf8c19e1a4446fe7b..477c4860db52236fa12a70aef2235c302f4a2a45 100644 (file)
--- a/arch/arm/boot/dts/bcm958622hr.dts
+++ b/arch/arm/boot/dts/bcm958622hr.dts
@@ -65,6 +65,14 @@
        status = "okay";
 };
 
+&amac1 {
+       status = "okay";
+};
+
+&amac2 {
+       status = "okay";
+};
+
 &nand {
        nandcs@0 {
                compatible = "brcm,nandcs";

diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts
index 61499ae2809eb9bb93fe0637b82297a0098ab60c..c0a499d5ba447d5503d6655541461dddb9f35317 100644 (file)
--- a/arch/arm/boot/dts/bcm958623hr.dts
+++ b/arch/arm/boot/dts/bcm958623hr.dts
@@ -65,6 +65,14 @@
        status = "okay";
 };
 
+&amac1 {
+       status = "okay";
+};
+
+&amac2 {
+       status = "okay";
+};
+
 &nand {
        nandcs@0 {
                compatible = "brcm,nandcs";

diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index 94cce235aedde9bfef8900bfdc93a9b53ee65783..f7eb5854a224486adbe98a33da6a4ae59b17a90a 100644 (file)
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -63,6 +63,14 @@
        status = "okay";
 };
 
+&amac1 {
+       status = "okay";
+};
+
+&amac2 {
+       status = "okay";
+};
+
 &nand {
        nandcs@0 {
                compatible = "brcm,nandcs";

diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index 7aa86c7131d9c8294646ddabb6d8df7c9bb55919..6e994f299cf5d2eab3f6d1688ada96e5b4bcc399 100644 (file)
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -61,6 +61,10 @@
        status = "okay";
 };
 
+&amac2 {
+       status = "okay";
+};
+
 &nand {
        nandcs@0 {
                compatible = "brcm,nandcs";

diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts
index c324c9fbe3fcd90e719a50640560f460de20a463..16666324fda8b5b901af538423ad302d13b9f98d 100644 (file)
--- a/arch/arm/boot/dts/bcm988312hr.dts
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -65,6 +65,14 @@
        status = "okay";
 };
 
+&amac1 {
+       status = "okay";
+};
+
+&amac2 {
+       status = "okay";
+};
+
 &nand {
        nandcs@0 {
                compatible = "brcm,nandcs";