diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2010-10-25 18:41:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2010-10-25 18:41:32 -0700 |
| commit | 4833c16dea61cb30d6f77dfec3067a08ba79b361 (patch) | |
| tree | fdf6cd3a851bca2c8c9db2e751abd5eddfcb2f66 /include | |
| parent | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | Blackfin: fix inverted anomaly 05000481 logic (diff) | |
| download | linux-4833c16dea61cb30d6f77dfec3067a08ba79b361.tar.gz linux-4833c16dea61cb30d6f77dfec3067a08ba79b361.tar.bz2 linux-4833c16dea61cb30d6f77dfec3067a08ba79b361.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: fix inverted anomaly 05000481 logic
Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
Blackfin: ppi/spi/twi headers: add missing __BFP undef
Blackfin: update defconfigs
Blackfin: bfin_twi.h: start a common TWI header
netdev: bfin_mac: push settings to platform resources
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bfin_mac.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/include/linux/bfin_mac.h b/include/linux/bfin_mac.h new file mode 100644 index 000000000000..904dec7d03a1 --- /dev/null +++ b/include/linux/bfin_mac.h @@ -0,0 +1,29 @@ +/* + * Blackfin On-Chip MAC Driver + * + * Copyright 2004-2010 Analog Devices Inc. + * + * Enter bugs at http://blackfin.uclinux.org/ + * + * Licensed under the GPL-2 or later. + */ + +#ifndef _LINUX_BFIN_MAC_H_ +#define _LINUX_BFIN_MAC_H_ + +#include <linux/phy.h> + +struct bfin_phydev_platform_data { + unsigned short addr; + int irq; +}; + +struct bfin_mii_bus_platform_data { + int phydev_number; + struct bfin_phydev_platform_data *phydev_data; + const unsigned short *mac_peripherals; + int phy_mode; + unsigned int phy_mask; +}; + +#endif |