diff options
| author |   Cyril Chemparathy <cyril@ti.com> | 2010-10-29 13:50:25 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-10-29 13:50:25 -0700 |
| commit | 337ac9d5218cc19f40fca13fa4deb3c658c4241b (patch) | |
| tree | 0a63c0bb554c7cceec778d22f11ca5e1efb39c7a /include/linux/marvell_phy.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | linux-dev-337ac9d5218cc19f40fca13fa4deb3c658c4241b.tar.xz linux-dev-337ac9d5218cc19f40fca13fa4deb3c658c4241b.zip | |
phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr
The marvell 88ec048's official part number is 88e1318s. This patch renames
definitions in the driver to reflect this.
In addition, a minor bug fix has been added to write back the MSCR1 register
value properly.
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/marvell_phy.h')
| -rw-r--r-- | include/linux/marvell_phy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h index d0f08018335d..1ff81b51b656 100644 --- a/include/linux/marvell_phy.h +++ b/include/linux/marvell_phy.h @@ -12,7 +12,7 @@ #define MARVELL_PHY_ID_88E1121R 0x01410cb0 #define MARVELL_PHY_ID_88E1145 0x01410cd0 #define MARVELL_PHY_ID_88E1240 0x01410e30 -#define MARVELL_PHY_ID_88EC048 0x01410e90 +#define MARVELL_PHY_ID_88E1318S 0x01410e90 /* struct phy_device dev_flags definitions */ #define MARVELL_PHY_M1145_FLAGS_RESISTANCE 0x00000001 |