diff options
| author | Sowjanya Komatineni <skomatineni@nvidia.com> | 2019-08-16 12:41:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-07 18:59:11 +0200 |
| commit | 0b54040780ce2abd84879d15ae3ae8ff69c0eed2 (patch) | |
| tree | 198429e6fef4cc66da2c2f235be07610951277dd | |
| parent | a16c6638d7609e9d58ad7219eb0bf5028b4d38e2 (diff) | |
| download | linux-stable-0b54040780ce2abd84879d15ae3ae8ff69c0eed2.tar.gz linux-stable-0b54040780ce2abd84879d15ae3ae8ff69c0eed2.tar.bz2 linux-stable-0b54040780ce2abd84879d15ae3ae8ff69c0eed2.zip | |
pinctrl: tegra: Fix write barrier placement in pmx_writel
[ Upstream commit c2cf351eba2ff6002ce8eb178452219d2521e38e ]
pmx_writel uses writel which inserts write barrier before the
register write.
This patch has fix to replace writel with writel_relaxed followed
by a readback and memory barrier to ensure write operation is
completed for successful pinctrl change.
Acked-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Link: https://lore.kernel.org/r/1565984527-5272-2-git-send-email-skomatineni@nvidia.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/pinctrl/tegra/pinctrl-tegra.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c index abcfbad94f00..849c3b34e887 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra.c +++ b/drivers/pinctrl/tegra/pinctrl-tegra.c @@ -32,7 +32,9 @@ static inline u32 pmx_readl(struct tegra_pmx *pmx, u32 bank, u32 reg) static inline void pmx_writel(struct tegra_pmx *pmx, u32 val, u32 bank, u32 reg) { - writel(val, pmx->regs[bank] + reg); + writel_relaxed(val, pmx->regs[bank] + reg); + /* make sure pinmux register write completed */ + pmx_readl(pmx, bank, reg); } static int tegra_pinctrl_get_groups_count(struct pinctrl_dev *pctldev) |