Commit 8101a567 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'via-rhine' 



Alexey Charkov says:

====================
net: via-rhine: add support for on-chip Rhine controllers

This series introduces platform bus (OpenFirmware) binding for
via-rhine, as used in various ARM-based Systems-on-Chip by
VIA/WonderMedia.

This has been tested in OF configuration by myself on a WM8950-based VIA
APC Rock development board and on a WM8850-based netbook, and in PCI
configuration by Roger.

Please note that the initial version of these patches was signed off by
Roger, but some time has passed since then, so I'm not including his
sign-off until explicit notice.

Changes since v1:
 - Fixed indentation of function arguments
 - Switched to 'dev_is_pci' instead of string comparison on bus name
 - Dropped 'rhine,revision' DT attribute, put the revision into OF match
        table instead
 - Included actual device tree nodes where applicable
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e676f197 2d283862

Documentation/devicetree/bindings/net/via-rhine.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* VIA Rhine 10/100 Network Controller



Required properties:

- compatible : Should be "via,vt8500-rhine" for integrated

	Rhine controllers found in VIA VT8500, WonderMedia WM8950

	and similar. These are listed as 1106:3106 rev. 0x84 on the

	virtual PCI bus under vendor-provided kernels

- reg : Address and length of the io space

- interrupts : Should contain the controller interrupt line



Examples:



ethernet@d8004000 {

	compatible = "via,vt8500-rhine";

	reg = <0xd8004000 0x100>;

	interrupts = <10>;

};

arch/arm/boot/dts/vt8500.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -165,5 +165,11 @@ 
			reg = <0xd8100000 0x10000>;

			interrupts = <48>;

		};



		ethernet@d8004000 {

			compatible = "via,vt8500-rhine";

			reg = <0xd8004000 0x100>;

			interrupts = <10>;

		};

	};

};

arch/arm/boot/dts/wm8650.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -218,5 +218,11 @@ 
			reg = <0xd8100000 0x10000>;

			interrupts = <48>;

		};



		ethernet@d8004000 {

			compatible = "via,vt8500-rhine";

			reg = <0xd8004000 0x100>;

			interrupts = <10>;

		};

	};

};

arch/arm/boot/dts/wm8850.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -298,5 +298,11 @@ 
			bus-width = <4>;

			sdon-inverted;

		};



		ethernet@d8004000 {

			compatible = "via,vt8500-rhine";

			reg = <0xd8004000 0x100>;

			interrupts = <10>;

                };

	};

};

drivers/net/ethernet/via/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ if NET_VENDOR_VIA 


config VIA_RHINE

	tristate "VIA Rhine support"

	depends on PCI

	depends on (PCI || USE_OF)

	select CRC32

	select MII

	---help---

CRA Git | Maintained and supported by SUSTech CRA and CCSE