Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=af4b7450788426a113057ce2d85c25b4f4e440d1
Commit:     af4b7450788426a113057ce2d85c25b4f4e440d1
Parent:     60168f12b9d3fa1a81c774ecaffe8620a862323d
Author:     Michael Buesch <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 13 21:08:24 2008 +0100
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:09:52 2008 -0800

    ssb: Add boardflags_hi field to the sprom data structure
    
    Add boardflags-high.
    
    Signed-off-by: Michael Buesch <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/ssb/pci.c       |    3 +++
 include/linux/ssb/ssb.h |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index ed2a387..b434df7 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -377,6 +377,8 @@ static void sprom_extract_r123(struct ssb_sprom *out, const 
u16 *in)
             SSB_SPROM1_ITSSI_A_SHIFT);
        SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
        SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
+       if (out->revision >= 2)
+               SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 
        /* Extract the antenna gain values. */
        gain = r123_extract_antgain(out->revision, in,
@@ -418,6 +420,7 @@ static void sprom_extract_r4(struct ssb_sprom *out, const 
u16 *in)
             SSB_SPROM4_ETHPHY_ET1A_SHIFT);
        SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
        SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
+       SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
        SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
             SSB_SPROM4_ANTAVAIL_A_SHIFT);
        SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG,
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 1ab4688..e18f5c2 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -43,6 +43,7 @@ struct ssb_sprom {
        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) */
+       u16 boardflags_hi;      /* Boardflags (high 16 bits) */
 
        /* Antenna gain values for up to 4 antennas
         * on each band. Values in dBm/4 (Q5.2). Negative gain means the
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to