diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:16 -0400 |
| commit | 7b70c4275f28702b76b273c8534c38f8313812e9 (patch) | |
| tree | 1df2229ca02466bd1adda814ac5c37aa0a597db1 /include/linux | |
| parent | ceb0885d3b01bb2e2f18765770e212914f2864be (diff) | |
| parent | a20df564d15bd28e3df24e1c65b885bd74d23f17 (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c
arch/arm/mm/init.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/marvell_phy.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h new file mode 100644 index 000000000000..2ed4fb8bbd51 --- /dev/null +++ b/include/linux/marvell_phy.h | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | #ifndef _MARVELL_PHY_H | ||
| 2 | #define _MARVELL_PHY_H | ||
| 3 | |||
| 4 | /* Mask used for ID comparisons */ | ||
| 5 | #define MARVELL_PHY_ID_MASK 0xfffffff0 | ||
| 6 | |||
| 7 | /* Known PHY IDs */ | ||
| 8 | #define MARVELL_PHY_ID_88E1101 0x01410c60 | ||
| 9 | #define MARVELL_PHY_ID_88E1112 0x01410c90 | ||
| 10 | #define MARVELL_PHY_ID_88E1111 0x01410cc0 | ||
| 11 | #define MARVELL_PHY_ID_88E1118 0x01410e10 | ||
| 12 | #define MARVELL_PHY_ID_88E1121R 0x01410cb0 | ||
| 13 | #define MARVELL_PHY_ID_88E1145 0x01410cd0 | ||
| 14 | #define MARVELL_PHY_ID_88E1240 0x01410e30 | ||
| 15 | |||
| 16 | /* struct phy_device dev_flags definitions */ | ||
| 17 | #define MARVELL_PHY_M1145_FLAGS_RESISTANCE 0x00000001 | ||
| 18 | #define MARVELL_PHY_M1118_DNS323_LEDS 0x00000002 | ||
| 19 | |||
| 20 | #endif /* _MARVELL_PHY_H */ | ||