leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: move 3945 SCD registers to iwl-prph.h

Browse Source 
This patch moves 3945 SCD registers to iwl-prph.h. These registers
are assigned from the periphery bus

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Emmanuel Grumbach 2007-10-25 17:15:39 +08:00 committed by David S. Miller
parent 67dc320d47
commit 7088310908
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/iwlwifi/iwl-3945.c
View File

@ -805,18 +805,18 @@ static int iwl3945_tx_reset(struct iwl_priv *priv)
} }
/* bypass mode */ /* bypass mode */
iwl_write_prph(priv, SCD_MODE_REG, 0x2); iwl_write_prph(priv, ALM_SCD_MODE_REG, 0x2);
/* RA 0 is active */ /* RA 0 is active */
iwl_write_prph(priv, SCD_ARASTAT_REG, 0x01); iwl_write_prph(priv, ALM_SCD_ARASTAT_REG, 0x01);
/* all 6 fifo are active */ /* all 6 fifo are active */
iwl_write_prph(priv, SCD_TXFACT_REG, 0x3f); iwl_write_prph(priv, ALM_SCD_TXFACT_REG, 0x3f);
iwl_write_prph(priv, SCD_SBYP_MODE_1_REG, 0x010000); iwl_write_prph(priv, ALM_SCD_SBYP_MODE_1_REG, 0x010000);
iwl_write_prph(priv, SCD_SBYP_MODE_2_REG, 0x030002); iwl_write_prph(priv, ALM_SCD_SBYP_MODE_2_REG, 0x030002);
iwl_write_prph(priv, SCD_TXF4MF_REG, 0x000004); iwl_write_prph(priv, ALM_SCD_TXF4MF_REG, 0x000004);
iwl_write_prph(priv, SCD_TXF5MF_REG, 0x000005); iwl_write_prph(priv, ALM_SCD_TXF5MF_REG, 0x000005);
iwl_write_direct32(priv, FH_TSSR_CBB_BASE, iwl_write_direct32(priv, FH_TSSR_CBB_BASE,
priv->hw_setting.shared_phys); priv->hw_setting.shared_phys);
@ -1044,7 +1044,7 @@ void iwl_hw_txq_ctx_stop(struct iwl_priv *priv)
} }
/* stop SCD */ /* stop SCD */
iwl_write_prph(priv, SCD_MODE_REG, 0); iwl_write_prph(priv, ALM_SCD_MODE_REG, 0);
/* reset TFD queues */ /* reset TFD queues */
for (queue = TFD_QUEUE_MIN; queue < TFD_QUEUE_MAX; queue++) { for (queue = TFD_QUEUE_MIN; queue < TFD_QUEUE_MAX; queue++) {

12
drivers/net/wireless/iwlwifi/iwl-prph.h
View File

@ -225,6 +225,18 @@
#define BSM_SRAM_LOWER_BOUND (PRPH_BASE + 0x3800) #define BSM_SRAM_LOWER_BOUND (PRPH_BASE + 0x3800)
#define BSM_SRAM_SIZE (1024) /* bytes */ #define BSM_SRAM_SIZE (1024) /* bytes */
/* ALM SCD */
/* SCD (Scheduler) */
#define ALM_SCD_BASE (PRPH_BASE + 0x2E00)
#define ALM_SCD_MODE_REG (ALM_SCD_BASE + 0x000)
#define ALM_SCD_ARASTAT_REG (ALM_SCD_BASE + 0x004)
#define ALM_SCD_TXFACT_REG (ALM_SCD_BASE + 0x010)
#define ALM_SCD_TXF4MF_REG (ALM_SCD_BASE + 0x014)
#define ALM_SCD_TXF5MF_REG (ALM_SCD_BASE + 0x020)
#define ALM_SCD_SBYP_MODE_1_REG (ALM_SCD_BASE + 0x02C)
#define ALM_SCD_SBYP_MODE_2_REG (ALM_SCD_BASE + 0x030)
/* 4965 SCD memory mapped registers */ /* 4965 SCD memory mapped registers */
#define KDR_SCD_BASE (PRPH_BASE + 0xa02c00) #define KDR_SCD_BASE (PRPH_BASE + 0xa02c00)