Merge branch 'fix/misc' into for-linus

[karo-tx-linux.git] / drivers / net / wireless / wl12xx / wl1271_conf.h

diff --git a/drivers/net/wireless/wl12xx/wl1271_conf.h b/drivers/net/wireless/wl12xx/wl1271_conf.h
index 1993d63c214ed3a0a2613c83d5f95a7ccc03fded..6f9e75cc5640b5c772d66fb47a2a2bdd21897b09 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_conf.h
+++ b/drivers/net/wireless/wl12xx/wl1271_conf.h
@@ -735,81 +735,6 @@ enum single_dual_band_enum {
        CONF_DUAL_BAND
 };
 
-
-#define CONF_MAX_SMART_REFLEX_PARAMS 16
-
-struct conf_general_parms {
-       /*
-        * RF Reference Clock type / speed
-        *
-        * Range: CONF_REF_CLK_*
-        */
-       u8 ref_clk;
-
-       /*
-        * Settling time of the reference clock after boot.
-        *
-        * Range: u8
-        */
-       u8 settling_time;
-
-       /*
-        * Flag defining whether clock is valid on wakeup.
-        *
-        * Range: 0 - not valid on wakeup, 1 - valid on wakeup
-        */
-       u8 clk_valid_on_wakeup;
-
-       /*
-        * DC-to-DC mode.
-        *
-        * Range: Unknown
-        */
-       u8 dc2dcmode;
-
-       /*
-        * Flag defining whether used as single or dual-band.
-        *
-        * Range: CONF_SINGLE_BAND, CONF_DUAL_BAND
-        */
-       u8 single_dual_band;
-
-       /*
-        * TX bip fem autodetect flag.
-        *
-        * Range: Unknown
-        */
-       u8 tx_bip_fem_autodetect;
-
-       /*
-        * TX bip gem manufacturer.
-        *
-        * Range: Unknown
-        */
-       u8 tx_bip_fem_manufacturer;
-
-       /*
-        * Settings flags.
-        *
-        * Range: Unknown
-        */
-       u8 settings;
-
-       /* Smart reflex settings */
-       u8 sr_state;
-
-       s8 srf1[CONF_MAX_SMART_REFLEX_PARAMS];
-       s8 srf2[CONF_MAX_SMART_REFLEX_PARAMS];
-       s8 srf3[CONF_MAX_SMART_REFLEX_PARAMS];
-
-       s8 sr_debug_table[CONF_MAX_SMART_REFLEX_PARAMS];
-
-       u8 sr_sen_n_p;
-       u8 sr_sen_n_p_gain;
-       u8 sr_sen_nrn;
-       u8 sr_sen_prn;
-};
-
 #define CONF_RSSI_AND_PROCESS_COMPENSATION_SIZE 15
 #define CONF_NUMBER_OF_SUB_BANDS_5  7
 #define CONF_NUMBER_OF_RATE_GROUPS  6
@@ -818,77 +743,14 @@ struct conf_general_parms {
 
 struct conf_radio_parms {
        /*
-        * Static radio parameters for 2.4GHz
-        *
-        * Range: unknown
-        */
-       u8 rx_trace_loss;
-       u8 tx_trace_loss;
-       s8 rx_rssi_and_proc_compens[CONF_RSSI_AND_PROCESS_COMPENSATION_SIZE];
-
-       /*
-        * Static radio parameters for 5GHz
-        *
-        * Range: unknown
-        */
-       u8 rx_trace_loss_5[CONF_NUMBER_OF_SUB_BANDS_5];
-       u8 tx_trace_loss_5[CONF_NUMBER_OF_SUB_BANDS_5];
-       s8 rx_rssi_and_proc_compens_5[CONF_RSSI_AND_PROCESS_COMPENSATION_SIZE];
-
-       /*
-        * Dynamic radio parameters for 2.4GHz
+        * FEM parameter set to use
         *
-        * Range: unknown
+        * Range: 0 or 1
         */
-       u16 tx_ref_pd_voltage;
-       u8  tx_ref_power;
-       s8  tx_offset_db;
-
-       s8  tx_rate_limits_normal[CONF_NUMBER_OF_RATE_GROUPS];
-       s8  tx_rate_limits_degraded[CONF_NUMBER_OF_RATE_GROUPS];
-       s8  tx_rate_limits_extreme[CONF_NUMBER_OF_RATE_GROUPS];
-
-       s8  tx_channel_limits_11b[CONF_NUMBER_OF_CHANNELS_2_4];
-       s8  tx_channel_limits_ofdm[CONF_NUMBER_OF_CHANNELS_2_4];
-       s8  tx_pdv_rate_offsets[CONF_NUMBER_OF_RATE_GROUPS];
-
-       u8  tx_ibias[CONF_NUMBER_OF_RATE_GROUPS];
-       u8  rx_fem_insertion_loss;
-
-       u8  degraded_low_to_normal_threshold;
-       u8  degraded_normal_to_high_threshold;
-
-
-       /*
-        * Dynamic radio parameters for 5GHz
-        *
-        * Range: unknown
-        */
-       u16 tx_ref_pd_voltage_5[CONF_NUMBER_OF_SUB_BANDS_5];
-       u8  tx_ref_power_5[CONF_NUMBER_OF_SUB_BANDS_5];
-       s8  tx_offset_db_5[CONF_NUMBER_OF_SUB_BANDS_5];
-
-       s8  tx_rate_limits_normal_5[CONF_NUMBER_OF_RATE_GROUPS];
-       s8  tx_rate_limits_degraded_5[CONF_NUMBER_OF_RATE_GROUPS];
-       s8  tx_rate_limits_extreme_5[CONF_NUMBER_OF_RATE_GROUPS];
-
-       s8  tx_channel_limits_ofdm_5[CONF_NUMBER_OF_CHANNELS_5];
-       s8  tx_pdv_rate_offsets_5[CONF_NUMBER_OF_RATE_GROUPS];
-
-       /* FIXME: this is inconsistent with the types for 2.4GHz */
-       s8  tx_ibias_5[CONF_NUMBER_OF_RATE_GROUPS];
-       s8  rx_fem_insertion_loss_5[CONF_NUMBER_OF_SUB_BANDS_5];
-
-       u8  degraded_low_to_normal_threshold_5;
-       u8  degraded_normal_to_high_threshold_5;
+       u8 fem;
 };
 
 struct conf_init_settings {
-       /*
-        * Configure general parameters.
-        */
-       struct conf_general_parms genparam;
-
        /*
         * Configure radio parameters.
         */