From 0ef18385ee6fed88a907f3a111c735f09e483cd3 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Wed, 4 May 2011 14:23:53 +0530 Subject: [PATCH] ath6kl: Remove dead code with CONFIG_AR6002_REV1_FORCE_HOST This is not defined anywhere, also delete vmc_reg.h which is used only in the dead code. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Greg Kroah-Hartman --- .../include/common/AR6002/hw2.0/hw/vmc_reg.h | 36 ---------- drivers/staging/ath6kl/miscdrv/common_drv.c | 80 ---------------------- 2 files changed, 116 deletions(-) delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h diff --git a/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h b/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h deleted file mode 100644 index c24c710..0000000 --- a/drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _VMC_REG_REG_H_ -#define _VMC_REG_REG_H_ - -#define MC_TCAM_VALID_ADDRESS 0x00000000 -#define MC_TCAM_VALID_OFFSET 0x00000000 -#define MC_TCAM_VALID_BIT_MSB 0 -#define MC_TCAM_VALID_BIT_LSB 0 -#define MC_TCAM_VALID_BIT_MASK 0x00000001 -#define MC_TCAM_VALID_BIT_GET(x) (((x) & MC_TCAM_VALID_BIT_MASK) >> MC_TCAM_VALID_BIT_LSB) -#define MC_TCAM_VALID_BIT_SET(x) (((x) << MC_TCAM_VALID_BIT_LSB) & MC_TCAM_VALID_BIT_MASK) - -#define MC_TCAM_MASK_ADDRESS 0x00000080 -#define MC_TCAM_MASK_OFFSET 0x00000080 -#define MC_TCAM_MASK_SIZE_MSB 2 -#define MC_TCAM_MASK_SIZE_LSB 0 -#define MC_TCAM_MASK_SIZE_MASK 0x00000007 -#define MC_TCAM_MASK_SIZE_GET(x) (((x) & MC_TCAM_MASK_SIZE_MASK) >> MC_TCAM_MASK_SIZE_LSB) -#define MC_TCAM_MASK_SIZE_SET(x) (((x) << MC_TCAM_MASK_SIZE_LSB) & MC_TCAM_MASK_SIZE_MASK) - -#define MC_TCAM_COMPARE_ADDRESS 0x00000100 -#define MC_TCAM_COMPARE_OFFSET 0x00000100 -#define MC_TCAM_COMPARE_KEY_MSB 21 -#define MC_TCAM_COMPARE_KEY_LSB 5 -#define MC_TCAM_COMPARE_KEY_MASK 0x003fffe0 -#define MC_TCAM_COMPARE_KEY_GET(x) (((x) & MC_TCAM_COMPARE_KEY_MASK) >> MC_TCAM_COMPARE_KEY_LSB) -#define MC_TCAM_COMPARE_KEY_SET(x) (((x) << MC_TCAM_COMPARE_KEY_LSB) & MC_TCAM_COMPARE_KEY_MASK) - -#define MC_TCAM_TARGET_ADDRESS 0x00000180 -#define MC_TCAM_TARGET_OFFSET 0x00000180 -#define MC_TCAM_TARGET_ADDR_MSB 21 -#define MC_TCAM_TARGET_ADDR_LSB 5 -#define MC_TCAM_TARGET_ADDR_MASK 0x003fffe0 -#define MC_TCAM_TARGET_ADDR_GET(x) (((x) & MC_TCAM_TARGET_ADDR_MASK) >> MC_TCAM_TARGET_ADDR_LSB) -#define MC_TCAM_TARGET_ADDR_SET(x) (((x) << MC_TCAM_TARGET_ADDR_LSB) & MC_TCAM_TARGET_ADDR_MASK) - -#endif /* _VMC_REG_H_ */ diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c index 43b8693..abd1e9c 100644 --- a/drivers/staging/ath6kl/miscdrv/common_drv.c +++ b/drivers/staging/ath6kl/miscdrv/common_drv.c @@ -27,7 +27,6 @@ #include "hw/mbox_host_reg.h" #include "hw/si_reg.h" #include "AR6002/hw2.0/hw/gpio_reg.h" -#include "AR6002/hw2.0/hw/vmc_reg.h" #include "hw/rtc_reg.h" #include "hw/mbox_reg.h" #include "hw/apb_map.h" @@ -682,85 +681,6 @@ int ar6000_set_htc_params(struct hif_device *hifDevice, return status; } -#if defined(CONFIG_AR6002_REV1_FORCE_HOST) -/* - * Call this function just before the call to BMIInit - * in order to force* AR6002 rev 1.x firmware to detect a Host. - * THIS IS FOR USE ONLY WITH AR6002 REV 1.x. - * TBDXXX: Remove this function when REV 1.x is desupported. - */ -int -ar6002_REV1_reset_force_host (struct hif_device *hifDevice) -{ - s32 i; - struct forceROM_s { - u32 addr; - u32 data; - }; - struct forceROM_s *ForceROM; - s32 szForceROM; - int status = 0; - u32 address; - u32 data; - - /* Force AR6002 REV1.x to recognize Host presence. - * - * Note: Use RAM at 0x52df80..0x52dfa0 with ROM Remap entry 0 - * so that this workaround functions with AR6002.war1.sh. We - * could fold that entire workaround into this one, but it's not - * worth the effort at this point. This workaround cannot be - * merged into the other workaround because this must be done - * before BMI. - */ - - static struct forceROM_s ForceROM_NEW[] = { - {0x52df80, 0x20f31c07}, - {0x52df84, 0x92374420}, - {0x52df88, 0x1d120c03}, - {0x52df8c, 0xff8216f0}, - {0x52df90, 0xf01d120c}, - {0x52df94, 0x81004136}, - {0x52df98, 0xbc9100bd}, - {0x52df9c, 0x00bba100}, - - {0x00008000|MC_TCAM_TARGET_ADDRESS, 0x0012dfe0}, /* Use remap entry 0 */ - {0x00008000|MC_TCAM_COMPARE_ADDRESS, 0x000e2380}, - {0x00008000|MC_TCAM_MASK_ADDRESS, 0x00000000}, - {0x00008000|MC_TCAM_VALID_ADDRESS, 0x00000001}, - - {0x00018000|(LOCAL_COUNT_ADDRESS+0x10), 0}, /* clear BMI credit counter */ - - {0x00004000|AR6002_RESET_CONTROL_ADDRESS, RESET_CONTROL_WARM_RST_MASK}, - }; - - address = 0x004ed4b0; /* REV1 target software ID is stored here */ - status = ar6000_ReadRegDiag(hifDevice, &address, &data); - if (status || (data != AR6002_VERSION_REV1)) { - return A_ERROR; /* Not AR6002 REV1 */ - } - - ForceROM = ForceROM_NEW; - szForceROM = sizeof(ForceROM_NEW)/sizeof(*ForceROM); - - ATH_DEBUG_PRINTF (DBG_MISC_DRV, ATH_DEBUG_TRC, ("Force Target to recognize Host....\n")); - for (i = 0; i < szForceROM; i++) - { - if (ar6000_WriteRegDiag(hifDevice, - &ForceROM[i].addr, - &ForceROM[i].data) != 0) - { - ATH_DEBUG_PRINTF (DBG_MISC_DRV, ATH_DEBUG_TRC, ("Cannot force Target to recognize Host!\n")); - return A_ERROR; - } - } - - A_MDELAY(1000); - - return 0; -} - -#endif /* CONFIG_AR6002_REV1_FORCE_HOST */ - void DebugDumpBytes(u8 *buffer, u16 length, char *pDescription) { char stream[60]; -- 2.7.4