b43: N-PHY: define channel table struct for rev3+ devices

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/radio_2056.c b/drivers/net/wireless/b43/radio_2056.c
index d8563192ce56cc538086e3171fd68fed6472c24f..f710c01f2cc4b9d46fe3c763eaf31a2b92eff636 100644 (file)
--- a/drivers/net/wireless/b43/radio_2056.c
+++ b/drivers/net/wireless/b43/radio_2056.c
@@ -24,9 +24,60 @@
 #include "radio_2056.h"
 #include "phy_common.h"
 
+#define RADIOREGS3(r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \
+                  r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, \
+                  r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, \
+                  r30, r31, r32, r33, r34, r35, r36) \
+       .radio_syn_pll_vcocal1          = r00,  \
+       .radio_syn_pll_vcocal2          = r01,  \
+       .radio_syn_pll_refdiv           = r02,  \
+       .radio_syn_pll_mmd2             = r03,  \
+       .radio_syn_pll_mmd1             = r04,  \
+       .radio_syn_pll_loopfilter1      = r05,  \
+       .radio_syn_pll_loopfilter2      = r06,  \
+       .radio_syn_pll_loopfilter3      = r07,  \
+       .radio_syn_pll_loopfilter4      = r08,  \
+       .radio_syn_pll_loopfilter5      = r09,  \
+       .radio_syn_reserved_addr27      = r10,  \
+       .radio_syn_reserved_addr28      = r11,  \
+       .radio_syn_reserved_addr29      = r12,  \
+       .radio_syn_logen_vcobuf1        = r13,  \
+       .radio_syn_logen_mixer2         = r14,  \
+       .radio_syn_logen_buf3           = r15,  \
+       .radio_syn_logen_buf4           = r16,  \
+       .radio_rx0_lnaa_tune            = r17,  \
+       .radio_rx0_lnag_tune            = r18,  \
+       .radio_tx0_intpaa_boost_tune    = r19,  \
+       .radio_tx0_intpag_boost_tune    = r20,  \
+       .radio_tx0_pada_boost_tune      = r21,  \
+       .radio_tx0_padg_boost_tune      = r22,  \
+       .radio_tx0_pgaa_boost_tune      = r23,  \
+       .radio_tx0_pgag_boost_tune      = r24,  \
+       .radio_tx0_mixa_boost_tune      = r25,  \
+       .radio_tx0_mixg_boost_tune      = r26,  \
+       .radio_rx1_lnaa_tune            = r27,  \
+       .radio_rx1_lnag_tune            = r28,  \
+       .radio_tx1_intpaa_boost_tune    = r29,  \
+       .radio_tx1_intpag_boost_tune    = r30,  \
+       .radio_tx1_pada_boost_tune      = r31,  \
+       .radio_tx1_padg_boost_tune      = r32,  \
+       .radio_tx1_pgaa_boost_tune      = r33,  \
+       .radio_tx1_pgag_boost_tune      = r34,  \
+       .radio_tx1_mixa_boost_tune      = r35,  \
+       .radio_tx1_mixg_boost_tune      = r36
+
+#define PHYREGS(r0, r1, r2, r3, r4, r5)        \
+       .phy_regs.phy_bw1a      = r0,   \
+       .phy_regs.phy_bw2       = r1,   \
+       .phy_regs.phy_bw3       = r2,   \
+       .phy_regs.phy_bw4       = r3,   \
+       .phy_regs.phy_bw5       = r4,   \
+       .phy_regs.phy_bw6       = r5
+
 static const struct b43_nphy_channeltab_entry_rev3 b43_nphy_channeltab_rev3[] = {
 };
 
+/* TODO: add support for rev4+ devices by searching in rev4+ tables */
 const struct b43_nphy_channeltab_entry_rev3 *
 b43_nphy_get_chantabent_rev3(struct b43_wldev *dev, u16 freq)
 {

diff --git a/drivers/net/wireless/b43/radio_2056.h b/drivers/net/wireless/b43/radio_2056.h
index fda6dafecb8cb683faef59118a38661e04e340c9..60341d7ae6730d49ba17c27e338b3ae8699782f1 100644 (file)
--- a/drivers/net/wireless/b43/radio_2056.h
+++ b/drivers/net/wireless/b43/radio_2056.h
@@ -29,12 +29,46 @@
 #include "tables_nphy.h"
 
 struct b43_nphy_channeltab_entry_rev3 {
-       /* The channel number */
-       u8 channel;
        /* The channel frequency in MHz */
        u16 freq;
        /* Radio register values on channelswitch */
-       /* TODO */
+       u8 radio_syn_pll_vcocal1;
+       u8 radio_syn_pll_vcocal2;
+       u8 radio_syn_pll_refdiv;
+       u8 radio_syn_pll_mmd2;
+       u8 radio_syn_pll_mmd1;
+       u8 radio_syn_pll_loopfilter1;
+       u8 radio_syn_pll_loopfilter2;
+       u8 radio_syn_pll_loopfilter3;
+       u8 radio_syn_pll_loopfilter4;
+       u8 radio_syn_pll_loopfilter5;
+       u8 radio_syn_reserved_addr27;
+       u8 radio_syn_reserved_addr28;
+       u8 radio_syn_reserved_addr29;
+       u8 radio_syn_logen_vcobuf1;
+       u8 radio_syn_logen_mixer2;
+       u8 radio_syn_logen_buf3;
+       u8 radio_syn_logen_buf4;
+       u8 radio_rx0_lnaa_tune;
+       u8 radio_rx0_lnag_tune;
+       u8 radio_tx0_intpaa_boost_tune;
+       u8 radio_tx0_intpag_boost_tune;
+       u8 radio_tx0_pada_boost_tune;
+       u8 radio_tx0_padg_boost_tune;
+       u8 radio_tx0_pgaa_boost_tune;
+       u8 radio_tx0_pgag_boost_tune;
+       u8 radio_tx0_mixa_boost_tune;
+       u8 radio_tx0_mixg_boost_tune;
+       u8 radio_rx1_lnaa_tune;
+       u8 radio_rx1_lnag_tune;
+       u8 radio_tx1_intpaa_boost_tune;
+       u8 radio_tx1_intpag_boost_tune;
+       u8 radio_tx1_pada_boost_tune;
+       u8 radio_tx1_padg_boost_tune;
+       u8 radio_tx1_pgaa_boost_tune;
+       u8 radio_tx1_pgag_boost_tune;
+       u8 radio_tx1_mixa_boost_tune;
+       u8 radio_tx1_mixg_boost_tune;
        /* PHY register values on channelswitch */
        struct b43_phy_n_sfo_cfg phy_regs;
 };