From 3c63dd5302a2f14c292a469b9934a8fc02b627cc Mon Sep 17 00:00:00 2001 From: Tim Harvey Date: Tue, 19 May 2015 10:01:19 -0700 Subject: Revert "e1000: fix sw fw sync on igb i210/i211" This reverts commit 17da7120249bfdef877f46be5bbcb3cc01212eb9. The i210/i211 do have the SW_FW_SYNC (0x5b5c) register and this is what should be used when acquiring the semaphore. I believe the issue that this patch was trying to resolve is now resolved by properly releasing the semaphore once no longer needed. Cc: Marcel Ziswiler Cc: Marek Vasut Cc: Aneesh Bansal Cc: Naveen Burmi Cc: Po Liu Cc: Bin Meng Cc: Alison Wang Cc: Reinhard Arlt Cc: Shengzhou Liu Cc: York Sun Signed-off-by: Tim Harvey Tested-by: Bin Meng Tested-by: Marcel Ziswiler --- drivers/net/e1000.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/net/e1000.h') diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index f3b77b1d97..232c95d2a4 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -2496,7 +2496,6 @@ struct e1000_hw { #define ICH_GFPREG_BASE_MASK 0x1FFF #define ICH_FLASH_LINEAR_ADDR_MASK 0x00FFFFFF -#define E1000_I210_SW_FW_SYNC 0x5B50 /* Software-Firmware Synchronization - RW */ #define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */ /* SPI EEPROM Status Register */ -- cgit v1.2.3