Merge "qcacmn: Use right macro to enable delayed register writes"

This commit is contained in:
Linux Build Service Account 2020-03-24 15:13:08 -07:00 • committed by Gerrit - the friendly Code Review server
commit 546df98c1c
2 changed files with 2 additions and 7 deletions

View file

@ -417,6 +417,7 @@ void hal_write_address_32_mb(struct hal_soc *hal_soc,
hal_write32_mb(hal_soc, offset, value);
}
#ifdef DP_HAL_MULTIWINDOW_DIRECT_ACCESS
static inline void hal_srng_write_address_32_mb(struct hal_soc *hal_soc,
struct hal_srng *srng,
@ -425,7 +426,7 @@ static inline void hal_srng_write_address_32_mb(struct hal_soc *hal_soc,
{
qdf_iowrite32(addr, value);
}
#elif defined(FEATURE_HAL_DELAYED_WRITE)
#elif defined(FEATURE_HAL_DELAYED_REG_WRITE)
static inline void hal_srng_write_address_32_mb(struct hal_soc *hal_soc,
struct hal_srng *srng,
void __iomem *addr,

View file

@ -228,15 +228,9 @@
#define SRNG_SRC_ADDR(_srng, _reg) \
SRNG_REG_ADDR(_srng, _reg, _reg ## _GROUP, SRC)
#ifdef FEATURE_HAL_DELAYED_WRITE
#define SRNG_REG_WRITE(_srng, _reg, _value, _dir) \
hal_delayed_reg_write(_srng->hal_soc, _srng,\
SRNG_ ## _dir ## _ADDR(_srng, _reg), (_value))
#else
#define SRNG_REG_WRITE(_srng, _reg, _value, _dir) \
hal_write_address_32_mb(_srng->hal_soc,\
SRNG_ ## _dir ## _ADDR(_srng, _reg), (_value), false)
#endif
#define SRNG_REG_WRITE_CONFIRM(_srng, _reg, _value, _dir) \
hal_write_address_32_mb(_srng->hal_soc,\