diff options
| -rw-r--r-- | drivers/ssb/pci.c | 2 | ||||
| -rw-r--r-- | include/linux/ssb/ssb.h | 32 | ||||
| -rw-r--r-- | include/linux/ssb/ssb_regs.h | 32 |
3 files changed, 58 insertions, 8 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index 0ab095c6581a..7226a716acdf 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c @@ -423,8 +423,6 @@ static int sprom_extract(struct ssb_bus *bus, memset(out, 0, sizeof(*out)); SPEX(revision, SSB_SPROM_REVISION, SSB_SPROM_REVISION_REV, 0); - SPEX(crc, SSB_SPROM_REVISION, SSB_SPROM_REVISION_CRC, - SSB_SPROM_REVISION_CRC_SHIFT); if ((bus->chip_id & 0xFF00) == 0x4400) { /* Workaround: The BCM44XX chip has a stupid revision diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index 2b5c312c4960..cdd8a2fd4a69 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h @@ -78,13 +78,34 @@ struct ssb_sprom_r3 { u32 ofdmgpo; /* G-PHY OFDM Power Offset */ }; -struct ssb_sprom_r4 { - /* TODO */ -}; - struct ssb_sprom { u8 revision; - u8 crc; + u8 temp_fill[2 * sizeof(struct ssb_sprom_r1)]; + u8 il0mac[6]; /* MAC address for 802.11b/g */ + u8 et0mac[6]; /* MAC address for Ethernet */ + u8 et1mac[6]; /* MAC address for 802.11a */ + u8 et0phyaddr; /* MII address for enet0 */ + u8 et1phyaddr; /* MII address for enet1 */ + u8 country_code; /* Country Code */ + u16 pa0b0; + u16 pa0b1; + u16 pa0b2; + u16 pa1b0; + u16 pa1b1; + u16 pa1b2; + u8 gpio0; /* GPIO pin 0 */ + u8 gpio1; /* GPIO pin 1 */ + u8 gpio2; /* GPIO pin 2 */ + u8 gpio3; /* GPIO pin 3 */ + u16 maxpwr_a; /* A-PHY Amplifier Max Power (in dBm Q5.2) */ + u16 maxpwr_bg; /* B/G-PHY Amplifier Max Power (in dBm Q5.2) */ + u8 itssi_a; /* Idle TSSI Target for A-PHY */ + u8 itssi_bg; /* Idle TSSI Target for B/G-PHY */ + u16 boardflags_lo; /* Boardflags (low 16 bits) */ + u8 antenna_gain_a; /* A-PHY Antenna gain (in dBm Q5.2) */ + u8 antenna_gain_bg; /* B/G-PHY Antenna gain (in dBm Q5.2) */ + + /* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */ /* The valid r# fields are selected by the "revision". * Revision 3 and lower inherit from lower revisions. */ @@ -94,7 +115,6 @@ struct ssb_sprom { struct ssb_sprom_r2 r2; struct ssb_sprom_r3 r3; }; - struct ssb_sprom_r4 r4; }; }; diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h index 47c7c71a5acf..bcebcffd448b 100644 --- a/include/linux/ssb/ssb_regs.h +++ b/include/linux/ssb/ssb_regs.h @@ -250,6 +250,38 @@ #define SSB_SPROM3_CCKPO_11M 0xF000 /* 11M Rate PO */ #define SSB_SPROM3_CCKPO_11M_SHIFT 12 #define SSB_SPROM3_OFDMGPO 0x107A /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */ +/* SPROM Revision 4 */ +#define SSB_SPROM4_IL0MAC 0x104C /* 6 byte MAC address for b/g */ +#define SSB_SPROM4_ETHPHY 0x105A /* Ethernet PHY settings */ +#define SSB_SPROM4_ETHPHY_ET0A 0x001F /* MII Address for enet0 */ +#define SSB_SPROM4_ETHPHY_ET1A 0x03E0 /* MII Address for enet1 */ +#define SSB_SPROM4_ETHPHY_ET1A_SHIFT 5 +#define SSB_SPROM4_ETHPHY_ET0M (1<<14) /* MDIO for enet0 */ +#define SSB_SPROM4_ETHPHY_ET1M (1<<15) /* MDIO for enet1 */ +#define SSB_SPROM4_CCODE 0x1052 /* Country Code (2 bytes) */ +#define SSB_SPROM4_ANT_A 0x105D /* A Antennas */ +#define SSB_SPROM4_ANT_BG 0x105C /* B/G Antennas */ +#define SSB_SPROM4_BFLLO 0x1044 /* Boardflags (low 16 bits) */ +#define SSB_SPROM4_AGAIN 0x105E /* Antenna Gain (in dBm Q5.2) */ +#define SSB_SPROM4_BFLHI 0x1046 /* Board Flags Hi */ +#define SSB_SPROM4_MAXP_A 0x1000 /* Max Power A */ +#define SSB_SPROM4_MAXP_A_HI 0x00FF /* Mask for Hi */ +#define SSB_SPROM4_MAXP_A_LO 0xFF00 /* Mask for Lo */ +#define SSB_SPROM4_MAXP_A_LO_SHIFT 16 /* Shift for Lo */ +#define SSB_SPROM4_PA1LOB0 0x1000 +#define SSB_SPROM4_PA1LOB1 0x1000 +#define SSB_SPROM4_PA1LOB2 0x1000 +#define SSB_SPROM4_PA1HIB0 0x1000 +#define SSB_SPROM4_PA1HIB1 0x1000 +#define SSB_SPROM4_PA1HIB2 0x1000 +#define SSB_SPROM4_OPO 0x1000 +#define SSB_SPROM4_OPO_VALUE 0x0000 +#define SSB_SPROM4_GPIOLDC 0x105A /* LED Powersave Duty Cycle */ +#define SSB_SPROM4_GPIOLDC_OFF 0x0000FF00 /* Off Count */ +#define SSB_SPROM4_GPIOLDC_OFF_SHIFT 8 +#define SSB_SPROM4_GPIOLDC_ON 0x00FF0000 /* On Count */ +#define SSB_SPROM4_GPIOLDC_ON_SHIFT 16 + /* Values for SSB_SPROM1_BINF_CCODE */ enum { |