summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-stp-xway.c
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2019-07-03 01:32:47 +0300
committerLinus Walleij <linus.walleij@linaro.org>2019-07-04 10:41:02 +0300
commitc0ec7012385939d0c885c976c8849084d7aeb2fb (patch)
treeab7a7dd3be869376b7edfd5655b809f38a6412b5 /drivers/gpio/gpio-stp-xway.c
parentbd791c48808a1f39a768a0096940d71e05bb0889 (diff)
downloadlinux-c0ec7012385939d0c885c976c8849084d7aeb2fb.tar.xz
gpio: stp-xway: get rid of the #include <lantiq_soc.h> dependency
Use the xway_stp_{r,w}32 helpers in xway_stp_w32_mask instead of relying on ltq_{r,w}32 from the architecture specific <lantiq_soc.h>. This will allow the driver to be compile-tested on all architectures that support MMIO. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Link: https://lore.kernel.org/r/20190702223248.31934-4-martin.blumenstingl@googlemail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-stp-xway.c')
-rw-r--r--drivers/gpio/gpio-stp-xway.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
index cbdeba9144c1..d946d0ece14a 100644
--- a/drivers/gpio/gpio-stp-xway.c
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -18,8 +18,6 @@
#include <linux/clk.h>
#include <linux/err.h>
-#include <lantiq_soc.h>
-
/*
* The Serial To Parallel (STP) is found on MIPS based Lantiq socs. It is a
* peripheral controller used to drive external shift register cascades. At most
@@ -74,8 +72,7 @@
#define xway_stp_r32(m, reg) __raw_readl(m + reg)
#define xway_stp_w32(m, val, reg) __raw_writel(val, m + reg)
#define xway_stp_w32_mask(m, clear, set, reg) \
- ltq_w32((ltq_r32(m + reg) & ~(clear)) | (set), \
- m + reg)
+ xway_stp_w32(m, (xway_stp_r32(m, reg) & ~(clear)) | (set), reg)
struct xway_stp {
struct gpio_chip gc;