Commit 2403077d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'xgene' 



Iyappan Subramanian says:

====================
Add 10GbE support to APM X-Gene SoC ethernet driver

Adding 10GbE support to APM X-Gene SoC ethernet driver.

v4: Address comments from v3
* dtb: resolved merge conflict for the net tree

v3: Address comments from v2
* dtb: changed to use all-zeros for the mac address

v2: Address comments from v1
* created preparatory patch to review before adding new functionality
* dtb: updated to use tabs consistently

v1:
* Initial version
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 38b3629a 41aace6e

Documentation/devicetree/bindings/net/apm-xgene-enet.txt

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ APM X-Gene SoC Ethernet nodes 
Ethernet nodes are defined to describe on-chip ethernet interfaces in

APM X-Gene SoC.



Required properties:

Required properties for all the ethernet interfaces:

- compatible: Should be "apm,xgene-enet"

- reg: Address and length of the register set for the device. It contains the

  information of registers in the same order as described by reg-names
@@ -15,6 +15,8 @@ Required properties: 
- clocks: Reference to the clock entry.

- local-mac-address: MAC address assigned to this device

- phy-connection-type: Interface type between ethernet device and PHY device



Required properties for ethernet interfaces that have external PHY:

- phy-handle: Reference to a PHY node connected to this device



- mdio: Device tree subnode with the following required properties:

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ F: net/appletalk/ 
APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

M:	Ravi Patel <rapatel@apm.com>

S:	Supported

F:	drivers/net/ethernet/apm/xgene/

F:	Documentation/devicetree/bindings/net/apm-xgene-enet.txt

arch/arm64/boot/dts/apm-mustang.dts

+4 −0
Original line number Diff line number Diff line
@@ -32,3 +32,7 @@ 
&menet {

	status = "ok";

};



&xgenet {

	status = "ok";

};

arch/arm64/boot/dts/apm-storm.dtsi

+27 −2
Original line number Diff line number Diff line
@@ -176,6 +176,16 @@ 
				clock-output-names = "menetclk";

			};



			xge0clk: xge0clk@1f61c000 {

				compatible = "apm,xgene-device-clock";

				#clock-cells = <1>;

				clocks = <&socplldiv2 0>;

				reg = <0x0 0x1f61c000 0x0 0x1000>;

				reg-names = "csr-reg";

				csr-mask = <0x3>;

				clock-output-names = "xge0clk";

			};



			sataphy1clk: sataphy1clk@1f21c000 {

				compatible = "apm,xgene-device-clock";

				#clock-cells = <1>;
@@ -420,7 +430,8 @@ 
			interrupts = <0x0 0x3c 0x4>;

			dma-coherent;

			clocks = <&menetclk 0>;

			local-mac-address = [00 01 73 00 00 01];

			/* mac address will be overwritten by the bootloader */

			local-mac-address = [00 00 00 00 00 00];

			phy-connection-type = "rgmii";

			phy-handle = <&menetphy>;

			mdio {
@@ -435,12 +446,26 @@ 
			};

		};



		xgenet: ethernet@1f610000 {

			compatible = "apm,xgene-enet";

			status = "disabled";

			reg = <0x0 0x1f610000 0x0 0xd100>,

			      <0x0 0x1f600000 0x0 0X400>,

			      <0x0 0x18000000 0x0 0X200>;

			reg-names = "enet_csr", "ring_csr", "ring_cmd";

			interrupts = <0x0 0x60 0x4>;

			dma-coherent;

			clocks = <&xge0clk 0>;

			/* mac address will be overwritten by the bootloader */

			local-mac-address = [00 00 00 00 00 00];

			phy-connection-type = "xgmii";

		};



		rng: rng@10520000 {

			compatible = "apm,xgene-rng";

			reg = <0x0 0x10520000 0x0 0x100>;

			interrupts = <0x0 0x41 0x4>;

			clocks = <&rngpkaclk 0>;

		};



	};

};

drivers/net/ethernet/apm/xgene/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
# Makefile for APM X-Gene Ethernet Driver.

#



xgene-enet-objs := xgene_enet_hw.o xgene_enet_main.o xgene_enet_ethtool.o

xgene-enet-objs := xgene_enet_hw.o xgene_enet_xgmac.o \

		   xgene_enet_main.o xgene_enet_ethtool.o

obj-$(CONFIG_NET_XGENE) += xgene-enet.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE