diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-05-07 17:26:22 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 21:54:20 -0400 |
commit | c1b78d05b3281d6f84284d421fc20eed8b8b78ce (patch) | |
tree | b43b65f028cbec38752ed4357c7067d94e48f59b /include/asm-powerpc | |
parent | 08390db07a012b972189629a30eb695cdcb0ec14 (diff) |
[POWERPC] Generalize tsi108 PHY types
Add a phy_type field to the tsi108 ethernet structures to indicate which PHY
is used on a board. This is derived from the "compatible" property in the
ethernet-phy node of the device tree. The default remains the MV88E PHY.
Also, convert the setup code to use of_get_mac_address instead of hard coding
a lookup for the "address" property in the ethernet node.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/tsi108.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-powerpc/tsi108.h b/include/asm-powerpc/tsi108.h index 4e95d153be84..20cb072d45ae 100644 --- a/include/asm-powerpc/tsi108.h +++ b/include/asm-powerpc/tsi108.h | |||
@@ -70,6 +70,16 @@ | |||
70 | 70 | ||
71 | #define TSI108_PCI_CFG_BASE_PHYS (0xfb000000) | 71 | #define TSI108_PCI_CFG_BASE_PHYS (0xfb000000) |
72 | #define TSI108_PCI_CFG_SIZE (0x01000000) | 72 | #define TSI108_PCI_CFG_SIZE (0x01000000) |
73 | |||
74 | /* | ||
75 | * PHY Configuration Options | ||
76 | * | ||
77 | * Specify "bcm54xx" in the compatible property of your device tree phy | ||
78 | * nodes if your board uses the Broadcom PHYs | ||
79 | */ | ||
80 | #define TSI108_PHY_MV88E 0 /* Marvel 88Exxxx PHY */ | ||
81 | #define TSI108_PHY_BCM54XX 1 /* Broardcom BCM54xx PHY */ | ||
82 | |||
73 | /* Global variables */ | 83 | /* Global variables */ |
74 | 84 | ||
75 | extern u32 tsi108_pci_cfg_base; | 85 | extern u32 tsi108_pci_cfg_base; |
@@ -93,6 +103,7 @@ typedef struct { | |||
93 | u16 phy; /* phy address */ | 103 | u16 phy; /* phy address */ |
94 | u16 irq_num; /* irq number */ | 104 | u16 irq_num; /* irq number */ |
95 | u8 mac_addr[6]; /* phy mac address */ | 105 | u8 mac_addr[6]; /* phy mac address */ |
106 | u16 phy_type; /* type of phy on board */ | ||
96 | } hw_info; | 107 | } hw_info; |
97 | 108 | ||
98 | extern u32 get_vir_csrbase(void); | 109 | extern u32 get_vir_csrbase(void); |