qcacmn: Change due to R102 hardware headers for QCA6290

Changes needed to support the new definitions introduced
in the R102 hardware header files for QCA6290.

Change-Id: I4e3c27dfdc48b4d6a44f0f50f3e4a907be20e53d
CRs-Fixed: 1105853
This commit is contained in:
Dhanashri Atre
2017-01-03 14:37:27 -08:00
committed by qcabuildsw
parent a0f09eae1d
commit a98e024f86
7 changed files with 47 additions and 33 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -28,9 +28,7 @@
*/
#include "hal_api.h"
#ifdef CONFIG_WIN
#include "wcss_version.h"
#endif
/**
* Common SRNG register access macros:
@@ -615,7 +613,9 @@ static inline void hal_srng_src_hw_init(struct hal_soc *hal,
srng->entry_size * srng->num_entries);
SRNG_SRC_REG_WRITE(srng, BASE_MSB, reg_val);
#if defined(WCSS_VERSION) && (WCSS_VERSION > 81)
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION > 81)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
reg_val = SRNG_SM(SRNG_SRC_FLD(ID, ENTRY_SIZE), srng->entry_size);
#else
reg_val = SRNG_SM(SRNG_SRC_FLD(ID, RING_ID), srng->ring_id) |