iwlwifi: mvm: fix bug with OTP memory size

OTP size changed in family 7000 and in family 8000.

Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --cc drivers/net/wireless/iwlwifi/iwl-7000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-8000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-hw.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-config.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/nvm.c
Simple merge