Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dffbe53 authored by Tony Prisk's avatar Tony Prisk Committed by David S. Miller
Browse files

net: velocity: Add platform device support to VIA velocity driver



Add support for the VIA Velocity network driver to be bound to a
OF created platform device.

Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2c41f14
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
* VIA Velocity 10/100/1000 Network Controller

Required properties:
- compatible : Should be "via,velocity-vt6110"
- reg : Address and length of the io space
- interrupts : Should contain the controller interrupt line

Optional properties:
- no-eeprom : PCI network cards use an external EEPROM to store data. Embedded
	devices quite often set this data in uboot and do not provide an eeprom.
	Specify this option if you have no external eeprom.

Examples:

eth0@d8004000 {
	compatible = "via,velocity-vt6110";
	reg = <0xd8004000 0x400>;
	interrupts = <10>;
	no-eeprom;
};
+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@
config NET_VENDOR_VIA
	bool "VIA devices"
	default y
	depends on PCI
	---help---
	  If you have a network (Ethernet) card belonging to this class, say Y
	  and read the Ethernet-HOWTO, available from
@@ -45,7 +44,7 @@ config VIA_RHINE_MMIO

config VIA_VELOCITY
	tristate "VIA Velocity support"
	depends on PCI
	depends on (PCI || USE_OF)
	select CRC32
	select CRC_CCITT
	select NET_CORE
+282 −126

File changed.

Preview size limit exceeded, changes collapsed.

+2 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ struct velocity_context {
#define PHYID_VT3216_64BIT  0x000FC600UL
#define PHYID_MARVELL_1000  0x01410C50UL
#define PHYID_MARVELL_1000S 0x01410C40UL

#define PHYID_ICPLUS_IP101A 0x02430C54UL
#define PHYID_REV_ID_MASK   0x0000000FUL

#define PHYID_GET_PHY_ID(i)         ((i) & ~PHYID_REV_ID_MASK)
@@ -1437,6 +1437,7 @@ struct velocity_info {
	struct device *dev;
	struct pci_dev *pdev;
	struct net_device *netdev;
	int no_eeprom;

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
	u8 ip_addr[4];