[noupstream] Add gryphon support.

 * arm64: dts: apm: Add serial 1 to shadowcat.dts
 * arm64: dts: Add apm-gryphon.dts
 * drivers: xgene: Allow to run the ethernet controller in MAC-to-MAC mode.

Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>

3 files changed, 94 insertions, 0 deletions

diff --git a/arch/arm64/boot/dts/apm/Makefile b/arch/arm64/boot/dts/apm/Makefile
index 55b5cdca13b8..c8daa642243d 100644
--- a/arch/arm64/boot/dts/apm/Makefile
+++ b/arch/arm64/boot/dts/apm/Makefile
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
 dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb
+dtb-$(CONFIG_ARCH_XGENE) += apm-gryphon.dtb
diff --git a/arch/arm64/boot/dts/apm/apm-gryphon.dts b/arch/arm64/boot/dts/apm/apm-gryphon.dts
new file mode 100644
index 000000000000..2ffee2989d4e
--- /dev/null
+++ b/arch/arm64/boot/dts/apm/apm-gryphon.dts
@@ -0,0 +1,83 @@
+/*
+ * dts file for AppliedMicro (APM) Gryphon Board
+ *
+ * Copyright (C) 2015, Applied Micro Circuits Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+
+/dts-v1/;
+
+/include/ "apm-shadowcat.dtsi"
+
+/ {
+	model = "APM X-Gene Gryphon board";
+	compatible = "apm,gryphon", "apm,xgene-shadowcat";
+
+	chosen { };
+
+	memory {
+		device_type = "memory";
+		reg = < 0x1 0x00000000 0x0 0x80000000 >;
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		button@1 {
+			label = "POWER";
+			linux,code = <116>;
+			linux,input-type = <0x1>;
+			interrupt-parent = <&sbgpio>;
+			interrupts = <0x0 0x1>;
+		};
+	};
+
+	poweroff_mbox: poweroff_mbox@10548000 {
+		compatible = "syscon";
+		reg = <0x0 0x10548000 0x0 0x30>;
+	};
+
+	poweroff: poweroff@10548010 {
+		compatible = "syscon-poweroff";
+		regmap = <&poweroff_mbox>;
+		offset = <0x10>;
+		mask = <0x1>;
+	};
+};
+
+&serial0 {
+	status = "disabled";
+};
+
+&serial1 {
+	status = "ok";
+};
+
+&sata1 {
+	status = "ok";
+};
+
+&sgenet0 {
+	status = "ok";
+	mac-to-mac-speed = <1000>;
+	phy-handle = <>;
+};
+
+&xgenet1 {
+	status = "disabled";
+};
+
+&i2c4 {
+};
+
+&mdio {
+	sgenet0phy: phy@0 {
+		reg = <0x0>;
+	};
+	sgenet1phy: phy@2 {
+		reg = <0x2>;
+	};
+};
diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index d8ecd1661461..2528fb0b8f60 100644
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -601,6 +601,16 @@
 			interrupts = <0x0 0x4c 0x4>;
 		};
 
+		serial1: serial@10601000 {
+			device_type = "serial";
+			compatible = "ns16550";
+			reg = <0 0x10601000 0x0 0x1000>;
+			reg-shift = <2>;
+			clock-frequency = <10000000>;
+			interrupt-parent = <&gic>;
+			interrupts = <0x0 0x4d 0x4>;
+		};
+
 		/* Do not change dwusb name, coded for backward compatibility */
 		usb0: dwusb@19000000 {
 			status = "disabled";