diff options
| author | Olof Johansson <olof@lixom.net> | 2020-10-03 12:59:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-10-03 12:59:49 -0700 |
| commit | f8e87554b1763d50fd19620504a9b166c5f74311 (patch) | |
| tree | e3cb15542545e3bafedeec6da5b91bbb26d91941 /include | |
| parent | c78c6e18ab266261c9967f8616fa2294b3d81d11 (diff) | |
| parent | 2899347249fe7567cb04bb810a85f848fc0ce475 (diff) | |
| download | linux-stable-f8e87554b1763d50fd19620504a9b166c5f74311.tar.gz linux-stable-f8e87554b1763d50fd19620504a9b166c5f74311.tar.bz2 linux-stable-f8e87554b1763d50fd19620504a9b166c5f74311.zip | |
Merge tag 'qcom-drivers-for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/drivers
Qualcomm driver updates for v5.10
Replace the busy wait for free tcs slots in the RPMh driver with a
sleeping wait and use memory barriers when writing the command registers.
Add a bunch of SoC ids to the socinfo driver, fix an erro printin the
apr driver and migrate llcc to devm_platform_ioremap_resource_byname().
* tag 'qcom-drivers-for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
soc: qcom: llcc: use devm_platform_ioremap_resource_byname()
soc: qcom: apr: Fixup the error displayed on lookup failure
soc: qcom: socinfo: Add msm8992/4 and apq8094 SoC IDs
soc: qcom: rpmh-rsc: Sleep waiting for tcs slots to be free
soc: qcom-geni-se: Don't use relaxed writes when writing commands
soc: qcom: socinfo: add SC7180 entry to soc_id array
soc: qcom: socinfo: add soc id for IPQ6018
Link: https://lore.kernel.org/r/20200924040504.179708-1-bjorn.andersson@linaro.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/qcom-geni-se.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h index 8f385fbe5a0e..ae4a8a766b69 100644 --- a/include/linux/qcom-geni-se.h +++ b/include/linux/qcom-geni-se.h @@ -296,7 +296,7 @@ static inline void geni_se_setup_m_cmd(struct geni_se *se, u32 cmd, u32 params) u32 m_cmd; m_cmd = (cmd << M_OPCODE_SHFT) | (params & M_PARAMS_MSK); - writel_relaxed(m_cmd, se->base + SE_GENI_M_CMD0); + writel(m_cmd, se->base + SE_GENI_M_CMD0); } /** @@ -316,7 +316,7 @@ static inline void geni_se_setup_s_cmd(struct geni_se *se, u32 cmd, u32 params) s_cmd &= ~(S_OPCODE_MSK | S_PARAMS_MSK); s_cmd |= (cmd << S_OPCODE_SHFT); s_cmd |= (params & S_PARAMS_MSK); - writel_relaxed(s_cmd, se->base + SE_GENI_S_CMD0); + writel(s_cmd, se->base + SE_GENI_S_CMD0); } /** |